From 4e457561b1e4f40c843f2f08eea5047e86aa73ae Mon Sep 17 00:00:00 2001 From: bocharsky-bw Date: Wed, 19 Jun 2019 23:45:48 +0300 Subject: [PATCH 01/16] Downgrade Sf Translation component to avoid BC --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 4ce9509a..533d18d0 100644 --- a/composer.json +++ b/composer.json @@ -13,7 +13,7 @@ "php": "^5.5 || ^7.0", "symfony/framework-bundle": "^2.7 || ^3.0 || ^4.0", "symfony/validator": "^2.7 || ^3.0 || ^4.0", - "symfony/translation": "^2.7 || ^3.0 || ^4.0", + "symfony/translation": "^2.7 || ^3.0 || ^4.0,<4.2", "symfony/twig-bundle": "^2.7 || ^3.0 || ^4.0", "symfony/finder": "^2.7 || ^3.0 || ^4.0", "symfony/intl": "^2.7 || ^3.0 || ^4.0", From 6a5eecdf4d8c16ff797a415316b1f59664d8f0a7 Mon Sep 17 00:00:00 2001 From: bocharsky-bw Date: Wed, 19 Jun 2019 23:47:38 +0300 Subject: [PATCH 02/16] Allow new major versions of matthiasnoback's libs --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 533d18d0..30c4e9a3 100644 --- a/composer.json +++ b/composer.json @@ -35,8 +35,8 @@ "symfony/templating": "^2.7 || ^3.0 || ^4.0", "symfony/dependency-injection": "^2.7 || ^3.0 || ^4.0", "symfony/web-profiler-bundle": "^2.7 || ^3.0 || ^4.0", - "matthiasnoback/symfony-dependency-injection-test": "^1.2 || ^2.3", - "matthiasnoback/symfony-config-test": "^2.2 || ^3.1", + "matthiasnoback/symfony-dependency-injection-test": "^1.2 || ^2.3 || ^3.0", + "matthiasnoback/symfony-config-test": "^2.2 || ^3.1 || ^4.0", "guzzlehttp/psr7": "^1.4", "nyholm/symfony-bundle-test": "^1.2.3" }, From fd12b5565f76e0441f3f131bd4807cd2f99d02b5 Mon Sep 17 00:00:00 2001 From: bocharsky-bw Date: Wed, 19 Jun 2019 23:56:52 +0300 Subject: [PATCH 03/16] Pass an empty string instead of NULL as a 2nd arg to Source --- Tests/Unit/Twig/BaseTwigTestCase.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Tests/Unit/Twig/BaseTwigTestCase.php b/Tests/Unit/Twig/BaseTwigTestCase.php index 7ef74766..1dc8a0d3 100644 --- a/Tests/Unit/Twig/BaseTwigTestCase.php +++ b/Tests/Unit/Twig/BaseTwigTestCase.php @@ -30,6 +30,6 @@ final protected function parse($file, $debug = false) $env->addExtension(new SymfonyTranslationExtension($translator = new IdentityTranslator(new MessageSelector()))); $env->addExtension(new TranslationExtension($translator, $debug)); - return $env->parse($env->tokenize(new \Twig_Source($content, null)))->getNode('body'); + return $env->parse($env->tokenize(new \Twig_Source($content, '')))->getNode('body'); } } From 74de953ea65336584d173148f7fe8a57765819a1 Mon Sep 17 00:00:00 2001 From: bocharsky-bw Date: Thu, 20 Jun 2019 00:38:39 +0300 Subject: [PATCH 04/16] Downgrade Twig to fix tests --- composer.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 30c4e9a3..a7cbcbe7 100644 --- a/composer.json +++ b/composer.json @@ -21,7 +21,8 @@ "php-translation/common": "^1.0", "php-translation/symfony-storage": "^1.0", "php-translation/extractor": "^1.3", - "nyholm/nsa": "^1.1" + "nyholm/nsa": "^1.1", + "twig/twig": "<2.8" }, "require-dev": { "symfony/phpunit-bridge": "^3.4 || ^4.0", From 0097b900534126e257f356d50fd3d5945e2e5408 Mon Sep 17 00:00:00 2001 From: bocharsky-bw Date: Thu, 20 Jun 2019 00:41:18 +0300 Subject: [PATCH 05/16] Use ArrayLoader instead of deprecated Twig_Loader_Array --- Tests/Unit/Twig/BaseTwigTestCase.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Tests/Unit/Twig/BaseTwigTestCase.php b/Tests/Unit/Twig/BaseTwigTestCase.php index 1dc8a0d3..55f389c8 100644 --- a/Tests/Unit/Twig/BaseTwigTestCase.php +++ b/Tests/Unit/Twig/BaseTwigTestCase.php @@ -16,6 +16,7 @@ use Symfony\Component\Translation\IdentityTranslator; use Symfony\Bridge\Twig\Extension\TranslationExtension as SymfonyTranslationExtension; use Translation\Bundle\Twig\TranslationExtension; +use Twig\Loader\ArrayLoader; /** * @author Johannes M. Schmitt @@ -26,7 +27,7 @@ final protected function parse($file, $debug = false) { $content = file_get_contents(__DIR__.'/Fixture/'.$file); - $env = new \Twig_Environment(new \Twig_Loader_Array([])); + $env = new \Twig_Environment(new ArrayLoader()); $env->addExtension(new SymfonyTranslationExtension($translator = new IdentityTranslator(new MessageSelector()))); $env->addExtension(new TranslationExtension($translator, $debug)); From 5eb76f6c51a466f4fd2805d87513f75e4c123405 Mon Sep 17 00:00:00 2001 From: bocharsky-bw Date: Thu, 20 Jun 2019 00:45:37 +0300 Subject: [PATCH 06/16] Fix a few more deprecation notices --- Controller/WebUIController.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Controller/WebUIController.php b/Controller/WebUIController.php index 8a197f26..b95b2099 100644 --- a/Controller/WebUIController.php +++ b/Controller/WebUIController.php @@ -16,6 +16,7 @@ use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpKernel\Exception\BadRequestHttpException; use Symfony\Component\Intl\Intl; +use Symfony\Component\Intl\Locales; use Symfony\Component\Translation\MessageCatalogue; use Translation\Bundle\Exception\MessageValidationException; use Translation\Bundle\Service\StorageService; @@ -250,7 +251,7 @@ private function getMessageFromRequest(Request $request) private function getLocale2LanguageMap() { $configuredLocales = $this->getParameter('php_translation.locales'); - $names = Intl::getLocaleBundle()->getLocaleNames('en'); + $names = Locales::getNames('en'); $map = []; foreach ($configuredLocales as $l) { $map[$l] = isset($names[$l]) ? $names[$l] : $l; From 5c7dd0a2b107bd220ac2e4feb7c84a112764c8c9 Mon Sep 17 00:00:00 2001 From: bocharsky-bw Date: Thu, 20 Jun 2019 00:54:35 +0300 Subject: [PATCH 07/16] Show but do not fail tests on deprecations --- phpunit.xml.dist | 1 + 1 file changed, 1 insertion(+) diff --git a/phpunit.xml.dist b/phpunit.xml.dist index 5a93c70c..baabcc35 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -15,6 +15,7 @@ + From 4509bfea6b08865ba0e7cf3ce7dbab837c6bf13f Mon Sep 17 00:00:00 2001 From: bocharsky-bw Date: Thu, 20 Jun 2019 00:55:35 +0300 Subject: [PATCH 08/16] Remove unused namespace --- Controller/WebUIController.php | 1 - 1 file changed, 1 deletion(-) diff --git a/Controller/WebUIController.php b/Controller/WebUIController.php index b95b2099..c5850dfa 100644 --- a/Controller/WebUIController.php +++ b/Controller/WebUIController.php @@ -15,7 +15,6 @@ use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpKernel\Exception\BadRequestHttpException; -use Symfony\Component\Intl\Intl; use Symfony\Component\Intl\Locales; use Symfony\Component\Translation\MessageCatalogue; use Translation\Bundle\Exception\MessageValidationException; From 9a680fcc7381c4381652e7688deea44649327424 Mon Sep 17 00:00:00 2001 From: bocharsky-bw Date: Thu, 20 Jun 2019 09:54:30 +0300 Subject: [PATCH 09/16] Require Twig ^1.34,<2.8 on TrevisCI --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 4205ebf7..681d53db 100644 --- a/.travis.yml +++ b/.travis.yml @@ -44,7 +44,7 @@ matrix: - php: 7.2 env: DEPENDENCIES="dunglas/symfony-lock:^4" - php: 7.0 - env: DEPENDENCIES="dunglas/symfony-lock:^2 twig/twig:^1.34 symfony/property-access:^2.8" + env: DEPENDENCIES="dunglas/symfony-lock:^2 twig/twig:^1.34,<2.8 symfony/property-access:^2.8" # Latest commit to master - php: 7.2 From 5810d4bc6e52de462bbaaa4eb2428d71a9183522 Mon Sep 17 00:00:00 2001 From: bocharsky-bw Date: Thu, 20 Jun 2019 10:50:52 +0300 Subject: [PATCH 10/16] Require twig/twig:^1.34,<1.39 on CI and fix BC --- .travis.yml | 2 +- Controller/WebUIController.php | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 681d53db..99b2b304 100644 --- a/.travis.yml +++ b/.travis.yml @@ -44,7 +44,7 @@ matrix: - php: 7.2 env: DEPENDENCIES="dunglas/symfony-lock:^4" - php: 7.0 - env: DEPENDENCIES="dunglas/symfony-lock:^2 twig/twig:^1.34,<2.8 symfony/property-access:^2.8" + env: DEPENDENCIES="dunglas/symfony-lock:^2 twig/twig:^1.34,<1.39 symfony/property-access:^2.8" # Latest commit to master - php: 7.2 diff --git a/Controller/WebUIController.php b/Controller/WebUIController.php index c5850dfa..26a9edfb 100644 --- a/Controller/WebUIController.php +++ b/Controller/WebUIController.php @@ -15,6 +15,7 @@ use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpKernel\Exception\BadRequestHttpException; +use Symfony\Component\Intl\Intl; use Symfony\Component\Intl\Locales; use Symfony\Component\Translation\MessageCatalogue; use Translation\Bundle\Exception\MessageValidationException; @@ -250,7 +251,9 @@ private function getMessageFromRequest(Request $request) private function getLocale2LanguageMap() { $configuredLocales = $this->getParameter('php_translation.locales'); - $names = Locales::getNames('en'); + $names = class_exists(Locales::class) + ? Locales::getNames('en') + : Intl::getLocaleBundle()->getLocaleNames('en'); $map = []; foreach ($configuredLocales as $l) { $map[$l] = isset($names[$l]) ? $names[$l] : $l; From 08c08396d0d52e092b5e79531506361dcdca69dc Mon Sep 17 00:00:00 2001 From: bocharsky-bw Date: Thu, 20 Jun 2019 11:03:31 +0300 Subject: [PATCH 11/16] Require Twig <1.39 || <2.8 to fix more incompatibilities --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index a7cbcbe7..d4a09542 100644 --- a/composer.json +++ b/composer.json @@ -22,7 +22,7 @@ "php-translation/symfony-storage": "^1.0", "php-translation/extractor": "^1.3", "nyholm/nsa": "^1.1", - "twig/twig": "<2.8" + "twig/twig": "<1.39 || <2.8" }, "require-dev": { "symfony/phpunit-bridge": "^3.4 || ^4.0", From 47e4d532335364d968726f63f67ef434521ffada Mon Sep 17 00:00:00 2001 From: bocharsky-bw Date: Thu, 20 Jun 2019 11:17:51 +0300 Subject: [PATCH 12/16] Fix more BC breaks --- Tests/Unit/Twig/BaseTwigTestCase.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Tests/Unit/Twig/BaseTwigTestCase.php b/Tests/Unit/Twig/BaseTwigTestCase.php index 55f389c8..25f67fa6 100644 --- a/Tests/Unit/Twig/BaseTwigTestCase.php +++ b/Tests/Unit/Twig/BaseTwigTestCase.php @@ -27,7 +27,10 @@ final protected function parse($file, $debug = false) { $content = file_get_contents(__DIR__.'/Fixture/'.$file); - $env = new \Twig_Environment(new ArrayLoader()); + $loader = class_exists(ArrayLoader::class) + ? new ArrayLoader() + : new \Twig_Loader_Array([]); + $env = new \Twig_Environment($loader); $env->addExtension(new SymfonyTranslationExtension($translator = new IdentityTranslator(new MessageSelector()))); $env->addExtension(new TranslationExtension($translator, $debug)); From 79f9668d5f42e637ea93861206ef9a3d7ee690f5 Mon Sep 17 00:00:00 2001 From: bocharsky-bw Date: Thu, 20 Jun 2019 11:28:03 +0300 Subject: [PATCH 13/16] Bump PHPUnit bridge: ^3.4 -> ^3.4.19 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index d4a09542..e6363866 100644 --- a/composer.json +++ b/composer.json @@ -25,7 +25,7 @@ "twig/twig": "<1.39 || <2.8" }, "require-dev": { - "symfony/phpunit-bridge": "^3.4 || ^4.0", + "symfony/phpunit-bridge": "^3.4.19 || ^4.0", "php-translation/translator": "^1.0", "php-http/curl-client": "^1.7", "php-http/message": "^1.6", From a7440ab0684f9b18d0eb89c8c8d56ad4f5cdbc47 Mon Sep 17 00:00:00 2001 From: bocharsky-bw Date: Thu, 20 Jun 2019 11:46:15 +0300 Subject: [PATCH 14/16] Tweak Twig to '<1.39 || ^2.0,<2.8' --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index e6363866..d8919f10 100644 --- a/composer.json +++ b/composer.json @@ -22,7 +22,7 @@ "php-translation/symfony-storage": "^1.0", "php-translation/extractor": "^1.3", "nyholm/nsa": "^1.1", - "twig/twig": "<1.39 || <2.8" + "twig/twig": "<1.39 || ^2.0,<2.8" }, "require-dev": { "symfony/phpunit-bridge": "^3.4.19 || ^4.0", From a39ec1ef9b593f2bdd7b2f0337de4dcbdcc3d53b Mon Sep 17 00:00:00 2001 From: bocharsky-bw Date: Thu, 20 Jun 2019 15:28:26 +0300 Subject: [PATCH 15/16] Bump PHP to 5.6 --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 99b2b304..a82a23ee 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,11 +24,11 @@ matrix: # Test with lowest dependencies - php: 7.1 env: COMPOSER_FLAGS="--prefer-stable --prefer-lowest" SYMFONY_DEPRECATIONS_HELPER="weak" SYMFONY_PHPUNIT_VERSION="5.7" - - php: 5.5 + - php: 5.6 env: COMPOSER_FLAGS="--prefer-stable --prefer-lowest" SYMFONY_DEPRECATIONS_HELPER="weak" SYMFONY_PHPUNIT_VERSION="5.7" # Test the latest stable release - - php: 5.5 + - php: 5.6 env: SYMFONY_PHPUNIT_VERSION="5.7" - php: 5.6 env: SYMFONY_PHPUNIT_VERSION="5.7" From cefeade92791269b58fe09ab2ee5e0b5ee3dea02 Mon Sep 17 00:00:00 2001 From: bocharsky-bw Date: Thu, 20 Jun 2019 15:37:15 +0300 Subject: [PATCH 16/16] Disable Composer limit --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index a82a23ee..2413fa2b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,6 +13,7 @@ env: global: - TEST_COMMAND="composer test" - SYMFONY_PHPUNIT_VERSION="6.3" + - COMPOSER_MEMORY_LIMIT=-1 matrix: fast_finish: true