From 111cb0cb14aedb6837d4f6173e655c8218742f6e Mon Sep 17 00:00:00 2001 From: Daniel Bachhuber Date: Mon, 10 Oct 2016 16:37:42 -0700 Subject: [PATCH 1/2] Update Composer dependencies to latest ``` Loading composer repositories with package information Updating dependencies (including require-dev) - Removing symfony/finder (v2.8.11) - Installing symfony/finder (v2.8.12) Downloading: 100% - Removing symfony/yaml (v2.8.11) - Installing symfony/yaml (v2.8.12) Loading from cache - Removing symfony/filesystem (v2.8.11) - Installing symfony/filesystem (v2.8.12) Loading from cache - Removing symfony/config (v2.8.11) - Installing symfony/config (v2.8.12) Downloading: 100% - Removing psr/log (1.0.1) - Installing psr/log (1.0.2) Downloading: 100% - Installing symfony/debug (v3.0.9) Downloading: 100% - Removing symfony/console (v2.8.11) - Installing symfony/console (v2.8.12) Downloading: 100% - Removing symfony/dependency-injection (v2.8.11) - Installing symfony/dependency-injection (v2.8.12) Downloading: 100% - Removing symfony/event-dispatcher (v2.8.11) - Installing symfony/event-dispatcher (v2.8.12) Loading from cache - Removing symfony/process (v2.8.11) - Installing symfony/process (v2.8.12) Downloading: 100% - Removing symfony/translation (v2.8.11) - Installing symfony/translation (v2.8.12) Loading from cache - Removing composer/spdx-licenses (1.1.4) - Installing composer/spdx-licenses (1.1.5) Downloading: 100% - Updating rmccue/requests dev-master (fb5b517 => 0048f3c) Checking out 0048f3c0b33add0f924cf857961a2f02f4a802b6 Writing lock file Generating autoload files ``` --- composer.json | 2 +- composer.lock | 148 +++++++++++++++++++++++++++++++++++--------------- 2 files changed, 104 insertions(+), 46 deletions(-) diff --git a/composer.json b/composer.json index a917e9ffd4..1aea359cd2 100644 --- a/composer.json +++ b/composer.json @@ -14,7 +14,7 @@ "mustangostang/spyc": "~0.5", "composer/semver": "~1.0", "ramsey/array_column": "~1.1", - "rmccue/requests" : "dev-master#fb5b51797ff881dd67f630cf9fd9e14b757a9e29 as 1.6.1", + "rmccue/requests" : "dev-master#0048f3c0b33add0f924cf857961a2f02f4a802b6 as 1.6.1", "symfony/finder": "~2.7", "symfony/yaml": "~2.7", "symfony/filesystem": "~2.7", diff --git a/composer.lock b/composer.lock index 51a476f451..e8a9d8c689 100644 --- a/composer.lock +++ b/composer.lock @@ -4,8 +4,8 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "6b2d9b856fd8d57162cccfed52b37977", - "content-hash": "48b37e62541cbdceec19bf202c77a9d1", + "hash": "d427b50385a540391ad0777d8e6748e8", + "content-hash": "58faa612d1d0340db0b65acd5aaa6183", "packages": [ { "name": "composer/ca-bundle", @@ -206,16 +206,16 @@ }, { "name": "composer/spdx-licenses", - "version": "1.1.4", + "version": "1.1.5", "source": { "type": "git", "url": "https://github.com/composer/spdx-licenses.git", - "reference": "88c26372b1afac36d8db601cdf04ad8716f53d88" + "reference": "96c6a07b05b716e89a44529d060bc7f5c263cb13" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/spdx-licenses/zipball/88c26372b1afac36d8db601cdf04ad8716f53d88", - "reference": "88c26372b1afac36d8db601cdf04ad8716f53d88", + "url": "https://api.github.com/repos/composer/spdx-licenses/zipball/96c6a07b05b716e89a44529d060bc7f5c263cb13", + "reference": "96c6a07b05b716e89a44529d060bc7f5c263cb13", "shasum": "" }, "require": { @@ -263,7 +263,7 @@ "spdx", "validator" ], - "time": "2016-05-04 12:27:30" + "time": "2016-09-28 07:17:45" }, { "name": "justinrainbow/json-schema", @@ -467,16 +467,16 @@ }, { "name": "psr/log", - "version": "1.0.1", + "version": "1.0.2", "source": { "type": "git", "url": "https://github.com/php-fig/log.git", - "reference": "5277094ed527a1c4477177d102fe4c53551953e0" + "reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/log/zipball/5277094ed527a1c4477177d102fe4c53551953e0", - "reference": "5277094ed527a1c4477177d102fe4c53551953e0", + "url": "https://api.github.com/repos/php-fig/log/zipball/4ebe3a8bf773a19edfe0a84b6585ba3d401b724d", + "reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d", "shasum": "" }, "require": { @@ -510,7 +510,7 @@ "psr", "psr-3" ], - "time": "2016-09-19 16:02:08" + "time": "2016-10-10 12:19:37" }, { "name": "ramsey/array_column", @@ -563,12 +563,12 @@ "source": { "type": "git", "url": "https://github.com/rmccue/Requests.git", - "reference": "fb5b51797ff881dd67f630cf9fd9e14b757a9e29" + "reference": "0048f3c0b33add0f924cf857961a2f02f4a802b6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/rmccue/Requests/zipball/fb5b51797ff881dd67f630cf9fd9e14b757a9e29", - "reference": "fb5b51797ff881dd67f630cf9fd9e14b757a9e29", + "url": "https://api.github.com/repos/rmccue/Requests/zipball/0048f3c0b33add0f924cf857961a2f02f4a802b6", + "reference": "0048f3c0b33add0f924cf857961a2f02f4a802b6", "shasum": "" }, "require": { @@ -604,7 +604,7 @@ "iri", "sockets" ], - "time": "2016-08-18 01:24:21" + "time": "2016-09-22 16:46:57" }, { "name": "seld/cli-prompt", @@ -746,16 +746,16 @@ }, { "name": "symfony/config", - "version": "v2.8.11", + "version": "v2.8.12", "source": { "type": "git", "url": "https://github.com/symfony/config.git", - "reference": "005bf10c156335ede2e89fb9a9ee10a0b742bc84" + "reference": "f8b1922bbda9d2ac86aecd649399040bce849fde" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/config/zipball/005bf10c156335ede2e89fb9a9ee10a0b742bc84", - "reference": "005bf10c156335ede2e89fb9a9ee10a0b742bc84", + "url": "https://api.github.com/repos/symfony/config/zipball/f8b1922bbda9d2ac86aecd649399040bce849fde", + "reference": "f8b1922bbda9d2ac86aecd649399040bce849fde", "shasum": "" }, "require": { @@ -795,24 +795,25 @@ ], "description": "Symfony Config Component", "homepage": "https://symfony.com", - "time": "2016-08-16 14:56:08" + "time": "2016-09-14 20:31:12" }, { "name": "symfony/console", - "version": "v2.8.11", + "version": "v2.8.12", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "3d3e4fa5f0614c8e45220e5de80332322e33bd90" + "reference": "d7a5a88178f94dcc29531ea4028ea614e35452d4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/3d3e4fa5f0614c8e45220e5de80332322e33bd90", - "reference": "3d3e4fa5f0614c8e45220e5de80332322e33bd90", + "url": "https://api.github.com/repos/symfony/console/zipball/d7a5a88178f94dcc29531ea4028ea614e35452d4", + "reference": "d7a5a88178f94dcc29531ea4028ea614e35452d4", "shasum": "" }, "require": { "php": ">=5.3.9", + "symfony/debug": "~2.7,>=2.7.2|~3.0.0", "symfony/polyfill-mbstring": "~1.0" }, "require-dev": { @@ -855,20 +856,77 @@ ], "description": "Symfony Console Component", "homepage": "https://symfony.com", - "time": "2016-09-06 10:55:00" + "time": "2016-09-28 00:10:16" + }, + { + "name": "symfony/debug", + "version": "v3.0.9", + "source": { + "type": "git", + "url": "https://github.com/symfony/debug.git", + "reference": "697c527acd9ea1b2d3efac34d9806bf255278b0a" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/debug/zipball/697c527acd9ea1b2d3efac34d9806bf255278b0a", + "reference": "697c527acd9ea1b2d3efac34d9806bf255278b0a", + "shasum": "" + }, + "require": { + "php": ">=5.5.9", + "psr/log": "~1.0" + }, + "conflict": { + "symfony/http-kernel": ">=2.3,<2.3.24|~2.4.0|>=2.5,<2.5.9|>=2.6,<2.6.2" + }, + "require-dev": { + "symfony/class-loader": "~2.8|~3.0", + "symfony/http-kernel": "~2.8|~3.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.0-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Component\\Debug\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony Debug Component", + "homepage": "https://symfony.com", + "time": "2016-07-30 07:22:48" }, { "name": "symfony/dependency-injection", - "version": "v2.8.11", + "version": "v2.8.12", "source": { "type": "git", "url": "https://github.com/symfony/dependency-injection.git", - "reference": "0a732a9cafc30e54077967da4d019e1d618a8cb9" + "reference": "ee9ec9ac2b046462d341e9de7c4346142d335e75" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/0a732a9cafc30e54077967da4d019e1d618a8cb9", - "reference": "0a732a9cafc30e54077967da4d019e1d618a8cb9", + "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/ee9ec9ac2b046462d341e9de7c4346142d335e75", + "reference": "ee9ec9ac2b046462d341e9de7c4346142d335e75", "shasum": "" }, "require": { @@ -918,11 +976,11 @@ ], "description": "Symfony DependencyInjection Component", "homepage": "https://symfony.com", - "time": "2016-09-06 23:19:39" + "time": "2016-09-24 09:47:20" }, { "name": "symfony/event-dispatcher", - "version": "v2.8.11", + "version": "v2.8.12", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", @@ -982,7 +1040,7 @@ }, { "name": "symfony/filesystem", - "version": "v2.8.11", + "version": "v2.8.12", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", @@ -1031,16 +1089,16 @@ }, { "name": "symfony/finder", - "version": "v2.8.11", + "version": "v2.8.12", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "bec5533e6ed650547d6ec8de4b541dc9929066f7" + "reference": "bc24c8f5674c6f6841f2856b70e5d60784be5691" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/bec5533e6ed650547d6ec8de4b541dc9929066f7", - "reference": "bec5533e6ed650547d6ec8de4b541dc9929066f7", + "url": "https://api.github.com/repos/symfony/finder/zipball/bc24c8f5674c6f6841f2856b70e5d60784be5691", + "reference": "bc24c8f5674c6f6841f2856b70e5d60784be5691", "shasum": "" }, "require": { @@ -1076,7 +1134,7 @@ ], "description": "Symfony Finder Component", "homepage": "https://symfony.com", - "time": "2016-08-26 11:57:43" + "time": "2016-09-28 00:10:16" }, { "name": "symfony/polyfill-mbstring", @@ -1139,16 +1197,16 @@ }, { "name": "symfony/process", - "version": "v2.8.11", + "version": "v2.8.12", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "05a03ed27073638658cab9405d99a67dd1014987" + "reference": "024de37f8a6b9e5e8244d9eb3fcf3e467dd2a93f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/05a03ed27073638658cab9405d99a67dd1014987", - "reference": "05a03ed27073638658cab9405d99a67dd1014987", + "url": "https://api.github.com/repos/symfony/process/zipball/024de37f8a6b9e5e8244d9eb3fcf3e467dd2a93f", + "reference": "024de37f8a6b9e5e8244d9eb3fcf3e467dd2a93f", "shasum": "" }, "require": { @@ -1184,11 +1242,11 @@ ], "description": "Symfony Process Component", "homepage": "https://symfony.com", - "time": "2016-09-06 10:55:00" + "time": "2016-09-29 14:03:54" }, { "name": "symfony/translation", - "version": "v2.8.11", + "version": "v2.8.12", "source": { "type": "git", "url": "https://github.com/symfony/translation.git", @@ -1252,7 +1310,7 @@ }, { "name": "symfony/yaml", - "version": "v2.8.11", + "version": "v2.8.12", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", From 800f87d4e387fa707da9c6c499a8a86574e8e932 Mon Sep 17 00:00:00 2001 From: Daniel Bachhuber Date: Tue, 11 Oct 2016 06:25:38 -0700 Subject: [PATCH 2/2] Lock to symfony/debug that supports PHP 5.3 --- composer.json | 1 + composer.lock | 22 +++++++++++----------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/composer.json b/composer.json index 1aea359cd2..e659e3b817 100644 --- a/composer.json +++ b/composer.json @@ -20,6 +20,7 @@ "symfony/filesystem": "~2.7", "symfony/config": "~2.7", "symfony/console": "~2.7", + "symfony/debug": "~2.7", "symfony/dependency-injection": "~2.7", "symfony/event-dispatcher": "~2.7", "symfony/process": "~2.1", diff --git a/composer.lock b/composer.lock index e8a9d8c689..996c39d13d 100644 --- a/composer.lock +++ b/composer.lock @@ -4,8 +4,8 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "d427b50385a540391ad0777d8e6748e8", - "content-hash": "58faa612d1d0340db0b65acd5aaa6183", + "hash": "4218a2e198b39594cc1f9500ebfdac42", + "content-hash": "ef98f5250ac1a487cdea910258300473", "packages": [ { "name": "composer/ca-bundle", @@ -860,33 +860,33 @@ }, { "name": "symfony/debug", - "version": "v3.0.9", + "version": "v2.8.12", "source": { "type": "git", "url": "https://github.com/symfony/debug.git", - "reference": "697c527acd9ea1b2d3efac34d9806bf255278b0a" + "reference": "8c29235936a47473af16fb91c7c4b7b193c5693c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/debug/zipball/697c527acd9ea1b2d3efac34d9806bf255278b0a", - "reference": "697c527acd9ea1b2d3efac34d9806bf255278b0a", + "url": "https://api.github.com/repos/symfony/debug/zipball/8c29235936a47473af16fb91c7c4b7b193c5693c", + "reference": "8c29235936a47473af16fb91c7c4b7b193c5693c", "shasum": "" }, "require": { - "php": ">=5.5.9", + "php": ">=5.3.9", "psr/log": "~1.0" }, "conflict": { "symfony/http-kernel": ">=2.3,<2.3.24|~2.4.0|>=2.5,<2.5.9|>=2.6,<2.6.2" }, "require-dev": { - "symfony/class-loader": "~2.8|~3.0", - "symfony/http-kernel": "~2.8|~3.0" + "symfony/class-loader": "~2.2|~3.0.0", + "symfony/http-kernel": "~2.3.24|~2.5.9|~2.6,>=2.6.2|~3.0.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.0-dev" + "dev-master": "2.8-dev" } }, "autoload": { @@ -913,7 +913,7 @@ ], "description": "Symfony Debug Component", "homepage": "https://symfony.com", - "time": "2016-07-30 07:22:48" + "time": "2016-09-06 10:55:00" }, { "name": "symfony/dependency-injection",