From 4b36736e91700aa4238920b56af42edbfebe081a Mon Sep 17 00:00:00 2001 From: Nicolas Grekas Date: Tue, 27 Oct 2020 11:05:03 +0100 Subject: [PATCH 1/5] minor #38838 [ProxyManager] use "composer/package-versions-deprecated" instead of "ocramius/package-versions" (nicolas-grekas) This PR was merged into the 4.4 branch. Discussion ---------- [ProxyManager] use "composer/package-versions-deprecated" instead of "ocramius/package-versions" | Q | A | ------------- | --- | Branch? | 4.4 | Bug fix? | no | New feature? | no | Deprecations? | no | Tickets | - | License | MIT | Doc PR | - As highlighted by our CI, `ocramius/proxy-manager` cannot be installed on PHP 7.3 using composer 2 because of broken versioning policies: ![image](https://user-images.githubusercontent.com/243674/97278564-37e73080-183a-11eb-885c-7b3cc07c26af.png) Fortunately, the package that causes all this mess (`ocramius/package-versions`) has been forked precisely to work around these broken policies. Requiring this fork allows resolving the dependencies properly. Commits ------- 8cf60c4ab7 [ProxyManager] use "composer/package-versions-deprecated" instead of "ocramius/package-versions" --- src/Symfony/Bridge/ProxyManager/composer.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Symfony/Bridge/ProxyManager/composer.json b/src/Symfony/Bridge/ProxyManager/composer.json index 09c390db09..492a1e1df6 100644 --- a/src/Symfony/Bridge/ProxyManager/composer.json +++ b/src/Symfony/Bridge/ProxyManager/composer.json @@ -17,6 +17,7 @@ ], "require": { "php": "^5.5.9|>=7.0.8", + "composer/package-versions-deprecated": "^1.8", "symfony/dependency-injection": "~3.4|~4.0", "ocramius/proxy-manager": "~0.4|~1.0|~2.0" }, From de01eeae0337997eec5c45e5452fba763a3d68c3 Mon Sep 17 00:00:00 2001 From: Nicolas Grekas Date: Tue, 27 Oct 2020 13:25:07 +0100 Subject: [PATCH 2/5] Fix CI --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index dd70410cc0..fa9e74188c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -287,7 +287,7 @@ install: export -f phpinfo for PHP in $TRAVIS_PHP_VERSION $php_extra; do - tfold $PHP phpinfo $PHP + tfold phpinfo phpinfo $PHP done - | @@ -299,7 +299,6 @@ install: return fi phpenv global ${PHP/hhvm*/hhvm} - composer self-update --2 rm vendor/composer/package-versions-deprecated -Rf if [[ $PHP = 7.* ]]; then ([[ $deps ]] && cd src/Symfony/Component/HttpFoundation; composer config platform.ext-mongodb 1.6.0; composer require --dev --no-update mongodb/mongodb ~1.5.0) From 57c986a441661410c4d46b6e4543a342109b9052 Mon Sep 17 00:00:00 2001 From: Nicolas Grekas Date: Tue, 27 Oct 2020 14:17:00 +0100 Subject: [PATCH 3/5] Fix CI --- .github/patch-types.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/patch-types.php b/.github/patch-types.php index 46c6980dab..311e9e7ee4 100644 --- a/.github/patch-types.php +++ b/.github/patch-types.php @@ -5,7 +5,7 @@ if (false === getenv('SYMFONY_PATCH_TYPE_DECLARATIONS')) { exit(1); } -require __DIR__.'/../.phpunit/phpunit-8.3-0/vendor/autoload.php'; +require __DIR__.'/../.phpunit/phpunit/vendor/autoload.php'; file_put_contents(__DIR__.'/../vendor/autoload.php', preg_replace('/^return (Composer.*);/m', <<<'EOTXT' $loader = \1; From 7af4fe989ab2a140f9f81e067164bf4bba43d4ca Mon Sep 17 00:00:00 2001 From: Nyholm Date: Tue, 27 Oct 2020 15:11:24 +0100 Subject: [PATCH 4/5] [Form] Some minor teaks for Swedish --- .../Form/Resources/translations/validators.sv.xlf | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Symfony/Component/Form/Resources/translations/validators.sv.xlf b/src/Symfony/Component/Form/Resources/translations/validators.sv.xlf index dff88e98f1..43e925628a 100644 --- a/src/Symfony/Component/Form/Resources/translations/validators.sv.xlf +++ b/src/Symfony/Component/Form/Resources/translations/validators.sv.xlf @@ -48,11 +48,11 @@ Please enter a valid date and time. - Ange datum och tid. + Ange ett giltigt datum och tid. Please enter a valid date. - Ange ett datum. + Ange ett giltigt datum. Please select a valid file. @@ -100,7 +100,7 @@ Please select a valid timezone. - Välj tidszon. + Välj en tidszon. Please enter a valid URL. @@ -132,7 +132,7 @@ Please enter a valid week. - Ange en vecka. + Ange en giltig vecka. From 92e0b3c9b26da40b1aacea26e678a82e9de91ab0 Mon Sep 17 00:00:00 2001 From: Nicolas Grekas Date: Tue, 27 Oct 2020 14:09:15 +0100 Subject: [PATCH 5/5] Fix CI for 3.4 --- .travis.yml | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/.travis.yml b/.travis.yml index fa9e74188c..8a02ce10d5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -78,14 +78,6 @@ before_install: export COMPONENTS=$(find src/Symfony -mindepth 2 -type f -name phpunit.xml.dist -printf '%h\n' | sort) find ~/.phpenv -name xdebug.ini -delete - if [[ $TRAVIS_PHP_VERSION = 5.* ]]; then - composer () { - $HOME/.phpenv/versions/7.1/bin/php $HOME/.phpenv/versions/7.1/bin/composer config platform.php $(echo ' =$SYMFONY_VERSION" fi - composer global require --no-progress --no-scripts --no-plugins symfony/flex + if [[ ! $TRAVIS_PHP_VERSION = 5.* ]]; then + composer global require --no-progress --no-scripts --no-plugins symfony/flex + fi - | # Legacy tests are skipped when deps=high and when the current branch version has not the same major version number as the next one @@ -304,11 +298,7 @@ install: ([[ $deps ]] && cd src/Symfony/Component/HttpFoundation; composer config platform.ext-mongodb 1.6.0; composer require --dev --no-update mongodb/mongodb ~1.5.0) fi tfold 'composer update' $COMPOSER_UP - if [[ $TRAVIS_PHP_VERSION = 5.* ]]; then - tfold 'phpunit install' 'composer global remove symfony/flex && ./phpunit install && composer global require --no-progress --no-scripts --no-plugins symfony/flex' - else - tfold 'phpunit install' ./phpunit install - fi + tfold 'phpunit install' ./phpunit install if [[ $deps = high ]]; then echo "$COMPONENTS" | parallel --gnu "tfold {} 'cd {} && $COMPOSER_UP && $PHPUNIT_X$LEGACY'" elif [[ $deps = low ]]; then