From f2b5581776d45c4912421db66fdd9437c27b2c24 Mon Sep 17 00:00:00 2001 From: bocharsky-bw Date: Tue, 21 Feb 2017 18:41:28 +0200 Subject: [PATCH 1/7] Upgrade Symfony to dev-master --- composer.json | 2 +- composer.lock | 128 +++++++++++++++++++++++++++++++++++++++++++++----- 2 files changed, 118 insertions(+), 12 deletions(-) diff --git a/composer.json b/composer.json index bb022f08f..bae8b44ca 100644 --- a/composer.json +++ b/composer.json @@ -25,7 +25,7 @@ "symfony/monolog-bundle" : "^3.0", "symfony/polyfill-apcu" : "^1.0", "symfony/swiftmailer-bundle" : "^2.3", - "symfony/symfony" : "^3.2", + "symfony/symfony" : "dev-master", "twig/extensions" : "^1.3", "twig/twig" : "^1.28 || ^2.0", "white-october/pagerfanta-bundle" : "^1.0" diff --git a/composer.lock b/composer.lock index 77f3be08e..6f0060bf7 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "content-hash": "a201a8d92585c751f757f88752195add", + "content-hash": "56ab5a55a8029330e0ccf10f9eb3acfb", "packages": [ { "name": "doctrine/annotations", @@ -1314,6 +1314,55 @@ ], "time": "2016-08-06T20:24:11+00:00" }, + { + "name": "psr/container", + "version": "1.0.0", + "source": { + "type": "git", + "url": "https://github.com/php-fig/container.git", + "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-fig/container/zipball/b7ce3b176482dbbc1245ebf52b181af44c2cf55f", + "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f", + "shasum": "" + }, + "require": { + "php": ">=5.3.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Psr\\Container\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "PHP-FIG", + "homepage": "http://www.php-fig.org/" + } + ], + "description": "Common Container Interface (PHP FIG PSR-11)", + "homepage": "https://github.com/php-fig/container", + "keywords": [ + "PSR-11", + "container", + "container-interface", + "container-interop", + "psr" + ], + "time": "2017-02-14T16:28:37+00:00" + }, { "name": "psr/log", "version": "1.0.2", @@ -1361,6 +1410,54 @@ ], "time": "2016-10-10T12:19:37+00:00" }, + { + "name": "psr/simple-cache", + "version": "1.0.0", + "source": { + "type": "git", + "url": "https://github.com/php-fig/simple-cache.git", + "reference": "753fa598e8f3b9966c886fe13f370baa45ef0e24" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-fig/simple-cache/zipball/753fa598e8f3b9966c886fe13f370baa45ef0e24", + "reference": "753fa598e8f3b9966c886fe13f370baa45ef0e24", + "shasum": "" + }, + "require": { + "php": ">=5.3.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Psr\\SimpleCache\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "PHP-FIG", + "homepage": "http://www.php-fig.org/" + } + ], + "description": "Common interfaces for simple caching", + "keywords": [ + "cache", + "caching", + "psr", + "psr-16", + "simple-cache" + ], + "time": "2017-01-02T13:31:39+00:00" + }, { "name": "sensio/distribution-bundle", "version": "v5.0.18", @@ -2039,23 +2136,25 @@ }, { "name": "symfony/symfony", - "version": "v3.2.4", + "version": "dev-master", "source": { "type": "git", "url": "https://github.com/symfony/symfony.git", - "reference": "141569be5b33a7cf0d141fb88422649fe11b0c47" + "reference": "6a8f9e84e6e3862cfa17e94c3f7aa84eca2c5a56" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/symfony/zipball/141569be5b33a7cf0d141fb88422649fe11b0c47", - "reference": "141569be5b33a7cf0d141fb88422649fe11b0c47", + "url": "https://api.github.com/repos/symfony/symfony/zipball/6a8f9e84e6e3862cfa17e94c3f7aa84eca2c5a56", + "reference": "6a8f9e84e6e3862cfa17e94c3f7aa84eca2c5a56", "shasum": "" }, "require": { "doctrine/common": "~2.4", "php": ">=5.5.9", "psr/cache": "~1.0", + "psr/container": "^1.0", "psr/log": "~1.0", + "psr/simple-cache": "^1.0", "symfony/polyfill-intl-icu": "~1.0", "symfony/polyfill-mbstring": "~1.0", "symfony/polyfill-php56": "~1.0", @@ -2065,10 +2164,13 @@ }, "conflict": { "phpdocumentor/reflection-docblock": "<3.0", - "phpdocumentor/type-resolver": "<0.2.0" + "phpdocumentor/type-resolver": "<0.2.0", + "phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0" }, "provide": { - "psr/cache-implementation": "1.0" + "psr/cache-implementation": "1.0", + "psr/container-implementation": "1.0", + "psr/simple-cache-implementation": "1.0" }, "replace": { "symfony/asset": "self.version", @@ -2083,6 +2185,7 @@ "symfony/dependency-injection": "self.version", "symfony/doctrine-bridge": "self.version", "symfony/dom-crawler": "self.version", + "symfony/dotenv": "self.version", "symfony/event-dispatcher": "self.version", "symfony/expression-language": "self.version", "symfony/filesystem": "self.version", @@ -2116,11 +2219,12 @@ "symfony/validator": "self.version", "symfony/var-dumper": "self.version", "symfony/web-profiler-bundle": "self.version", + "symfony/web-server-bundle": "self.version", "symfony/workflow": "self.version", "symfony/yaml": "self.version" }, "require-dev": { - "cache/integration-tests": "dev-master", + "cache/integration-tests": "^0.15.0", "doctrine/cache": "~1.6", "doctrine/data-fixtures": "1.0.*", "doctrine/dbal": "~2.4", @@ -2139,7 +2243,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.2-dev" + "dev-master": "3.3-dev" } }, "autoload": { @@ -2178,7 +2282,7 @@ "keywords": [ "framework" ], - "time": "2017-02-17T00:00:43+00:00" + "time": "2017-02-21 16:23:07" }, { "name": "twig/extensions", @@ -3734,7 +3838,9 @@ ], "aliases": [], "minimum-stability": "stable", - "stability-flags": [], + "stability-flags": { + "symfony/symfony": 20 + }, "prefer-stable": false, "prefer-lowest": false, "platform": { From 0fa6847b6484a58e3ec326f9191ccdeefab4bd3d Mon Sep 17 00:00:00 2001 From: bocharsky-bw Date: Tue, 21 Feb 2017 18:42:00 +0200 Subject: [PATCH 2/7] Run lint commands on TravisCI --- .travis.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.travis.yml b/.travis.yml index 166f6799e..e64e81dc8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,3 +25,6 @@ install: script: - ./vendor/bin/phpunit - ./vendor/bin/php-cs-fixer fix --diff --dry-run -v + - ./bin/console lint:yaml app/config + - ./bin/console lint:twig app/Resources/views + - ./bin/console lint:xliff app/Resources/translations From a267189d1ec98b13698543962de2d0132cee3f4d Mon Sep 17 00:00:00 2001 From: bocharsky-bw Date: Tue, 21 Feb 2017 20:04:53 +0200 Subject: [PATCH 3/7] Revert "Upgrade Symfony to dev-master" This reverts commit f2b5581776d45c4912421db66fdd9437c27b2c24. --- composer.json | 2 +- composer.lock | 128 +++++--------------------------------------------- 2 files changed, 12 insertions(+), 118 deletions(-) diff --git a/composer.json b/composer.json index bae8b44ca..bb022f08f 100644 --- a/composer.json +++ b/composer.json @@ -25,7 +25,7 @@ "symfony/monolog-bundle" : "^3.0", "symfony/polyfill-apcu" : "^1.0", "symfony/swiftmailer-bundle" : "^2.3", - "symfony/symfony" : "dev-master", + "symfony/symfony" : "^3.2", "twig/extensions" : "^1.3", "twig/twig" : "^1.28 || ^2.0", "white-october/pagerfanta-bundle" : "^1.0" diff --git a/composer.lock b/composer.lock index 6f0060bf7..77f3be08e 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "content-hash": "56ab5a55a8029330e0ccf10f9eb3acfb", + "content-hash": "a201a8d92585c751f757f88752195add", "packages": [ { "name": "doctrine/annotations", @@ -1314,55 +1314,6 @@ ], "time": "2016-08-06T20:24:11+00:00" }, - { - "name": "psr/container", - "version": "1.0.0", - "source": { - "type": "git", - "url": "https://github.com/php-fig/container.git", - "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/php-fig/container/zipball/b7ce3b176482dbbc1245ebf52b181af44c2cf55f", - "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f", - "shasum": "" - }, - "require": { - "php": ">=5.3.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.0.x-dev" - } - }, - "autoload": { - "psr-4": { - "Psr\\Container\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "PHP-FIG", - "homepage": "http://www.php-fig.org/" - } - ], - "description": "Common Container Interface (PHP FIG PSR-11)", - "homepage": "https://github.com/php-fig/container", - "keywords": [ - "PSR-11", - "container", - "container-interface", - "container-interop", - "psr" - ], - "time": "2017-02-14T16:28:37+00:00" - }, { "name": "psr/log", "version": "1.0.2", @@ -1410,54 +1361,6 @@ ], "time": "2016-10-10T12:19:37+00:00" }, - { - "name": "psr/simple-cache", - "version": "1.0.0", - "source": { - "type": "git", - "url": "https://github.com/php-fig/simple-cache.git", - "reference": "753fa598e8f3b9966c886fe13f370baa45ef0e24" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/php-fig/simple-cache/zipball/753fa598e8f3b9966c886fe13f370baa45ef0e24", - "reference": "753fa598e8f3b9966c886fe13f370baa45ef0e24", - "shasum": "" - }, - "require": { - "php": ">=5.3.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.0.x-dev" - } - }, - "autoload": { - "psr-4": { - "Psr\\SimpleCache\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "PHP-FIG", - "homepage": "http://www.php-fig.org/" - } - ], - "description": "Common interfaces for simple caching", - "keywords": [ - "cache", - "caching", - "psr", - "psr-16", - "simple-cache" - ], - "time": "2017-01-02T13:31:39+00:00" - }, { "name": "sensio/distribution-bundle", "version": "v5.0.18", @@ -2136,25 +2039,23 @@ }, { "name": "symfony/symfony", - "version": "dev-master", + "version": "v3.2.4", "source": { "type": "git", "url": "https://github.com/symfony/symfony.git", - "reference": "6a8f9e84e6e3862cfa17e94c3f7aa84eca2c5a56" + "reference": "141569be5b33a7cf0d141fb88422649fe11b0c47" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/symfony/zipball/6a8f9e84e6e3862cfa17e94c3f7aa84eca2c5a56", - "reference": "6a8f9e84e6e3862cfa17e94c3f7aa84eca2c5a56", + "url": "https://api.github.com/repos/symfony/symfony/zipball/141569be5b33a7cf0d141fb88422649fe11b0c47", + "reference": "141569be5b33a7cf0d141fb88422649fe11b0c47", "shasum": "" }, "require": { "doctrine/common": "~2.4", "php": ">=5.5.9", "psr/cache": "~1.0", - "psr/container": "^1.0", "psr/log": "~1.0", - "psr/simple-cache": "^1.0", "symfony/polyfill-intl-icu": "~1.0", "symfony/polyfill-mbstring": "~1.0", "symfony/polyfill-php56": "~1.0", @@ -2164,13 +2065,10 @@ }, "conflict": { "phpdocumentor/reflection-docblock": "<3.0", - "phpdocumentor/type-resolver": "<0.2.0", - "phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0" + "phpdocumentor/type-resolver": "<0.2.0" }, "provide": { - "psr/cache-implementation": "1.0", - "psr/container-implementation": "1.0", - "psr/simple-cache-implementation": "1.0" + "psr/cache-implementation": "1.0" }, "replace": { "symfony/asset": "self.version", @@ -2185,7 +2083,6 @@ "symfony/dependency-injection": "self.version", "symfony/doctrine-bridge": "self.version", "symfony/dom-crawler": "self.version", - "symfony/dotenv": "self.version", "symfony/event-dispatcher": "self.version", "symfony/expression-language": "self.version", "symfony/filesystem": "self.version", @@ -2219,12 +2116,11 @@ "symfony/validator": "self.version", "symfony/var-dumper": "self.version", "symfony/web-profiler-bundle": "self.version", - "symfony/web-server-bundle": "self.version", "symfony/workflow": "self.version", "symfony/yaml": "self.version" }, "require-dev": { - "cache/integration-tests": "^0.15.0", + "cache/integration-tests": "dev-master", "doctrine/cache": "~1.6", "doctrine/data-fixtures": "1.0.*", "doctrine/dbal": "~2.4", @@ -2243,7 +2139,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.3-dev" + "dev-master": "3.2-dev" } }, "autoload": { @@ -2282,7 +2178,7 @@ "keywords": [ "framework" ], - "time": "2017-02-21 16:23:07" + "time": "2017-02-17T00:00:43+00:00" }, { "name": "twig/extensions", @@ -3838,9 +3734,7 @@ ], "aliases": [], "minimum-stability": "stable", - "stability-flags": { - "symfony/symfony": 20 - }, + "stability-flags": [], "prefer-stable": false, "prefer-lowest": false, "platform": { From 10d44f97e419221d1d486468c22f193a8546e21c Mon Sep 17 00:00:00 2001 From: bocharsky-bw Date: Tue, 21 Feb 2017 20:07:13 +0200 Subject: [PATCH 4/7] Remove lint:xliff command from TravisCI --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index e64e81dc8..440464030 100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,4 +27,3 @@ script: - ./vendor/bin/php-cs-fixer fix --diff --dry-run -v - ./bin/console lint:yaml app/config - ./bin/console lint:twig app/Resources/views - - ./bin/console lint:xliff app/Resources/translations From 6a08a124a6d2787b610b05812ac6ec0d2bca6814 Mon Sep 17 00:00:00 2001 From: bocharsky-bw Date: Tue, 21 Feb 2017 20:10:24 +0200 Subject: [PATCH 5/7] Also lint Yaml and Twig files in CodeExplorerBundle --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 440464030..0375ff357 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,4 +26,5 @@ script: - ./vendor/bin/phpunit - ./vendor/bin/php-cs-fixer fix --diff --dry-run -v - ./bin/console lint:yaml app/config - - ./bin/console lint:twig app/Resources/views + - ./bin/console lint:yaml src/CodeExplorerBundle/Resources/config + - ./bin/console lint:twig app/Resources/views src/CodeExplorerBundle/Resources/views From c010b76ffbd04df28215f901cedbabb6625be912 Mon Sep 17 00:00:00 2001 From: Javier Eguiluz Date: Wed, 22 Feb 2017 10:32:07 +0100 Subject: [PATCH 6/7] Used the bundle notation --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0375ff357..eafa5929a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,5 +26,5 @@ script: - ./vendor/bin/phpunit - ./vendor/bin/php-cs-fixer fix --diff --dry-run -v - ./bin/console lint:yaml app/config - - ./bin/console lint:yaml src/CodeExplorerBundle/Resources/config - - ./bin/console lint:twig app/Resources/views src/CodeExplorerBundle/Resources/views + - ./bin/console lint:yaml @CodeExplorerBundle + - ./bin/console lint:twig app/Resources/views @CodeExplorerBundle From cb6c5c8da575d161f79f9fa95dc915d8a31cf3de Mon Sep 17 00:00:00 2001 From: Javier Eguiluz Date: Wed, 22 Feb 2017 10:33:04 +0100 Subject: [PATCH 7/7] Make the linted resources less restrictive (to lint TwigBundle templates too) --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index eafa5929a..053436c36 100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,4 +27,4 @@ script: - ./vendor/bin/php-cs-fixer fix --diff --dry-run -v - ./bin/console lint:yaml app/config - ./bin/console lint:yaml @CodeExplorerBundle - - ./bin/console lint:twig app/Resources/views @CodeExplorerBundle + - ./bin/console lint:twig app/Resources @CodeExplorerBundle