minor #50407 [7.0] Remove hacks that made the CI green (nicolas-grekas)

nicolas-grekas · nicolas-grekas · commit c5749551d07e · 2023-05-30T13:36:39.000+02:00
This PR was merged into the 7.0 branch. Discussion ---------- [7.0] Remove hacks that made the CI green | Q | A | ------------- | --- | Branch? | 7.0 | Bug fix? | no | New feature? | no | Deprecations? | no | Tickets | - | License | MIT | Doc PR | - Follows #50404 The Windows build is blocked by ext-redis and ext-apcu not being available as DLL for PHP 8.2. /cc `@weltling` 🙏 It's time to allow Symfony 7 again :) - [x] composer/composer#11474 - [x] async-aws/aws#1409 - [x] doctrine/orm#10724 - [x] [FriendsOfPHP/proxy-manager-lts](FriendsOfPHP/proxy-manager-lts@d93bd79) - [x] symfony/security-acl#111 - [x] tijsverkoyen/CssToInlineStyles#243 We also need a sigchild-enabled PHP, which `@derrabus` knows how to build :) Commits ------- 6dd126a [7.0] Remove hacks that made the CI green
diff --git a/.github/build-packages.php b/.github/build-packages.php
@@ -11,10 +11,6 @@
 $mergeBase = trim(shell_exec(sprintf('git merge-base "%s" HEAD', array_shift($dirs))));
 $version = array_shift($dirs);
 
-if ('7.0' === $version) {
-    $version = '6.4'; // to be removed once deps allow ^7.0
-}
-
 $packages = [];
 $flags = JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE;
 $preferredInstall = json_decode(file_get_contents(__DIR__.'/composer-config.json'), true)['config']['preferred-install'];
diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
@@ -155,8 +155,7 @@ jobs:
         run: |
           COMPOSER_HOME="$(composer config home)"
           ([ -d "$COMPOSER_HOME" ] || mkdir "$COMPOSER_HOME") && cp .github/composer-config.json "$COMPOSER_HOME/config.json"
-          #export COMPOSER_ROOT_VERSION=$(grep ' VERSION = ' src/Symfony/Component/HttpKernel/Kernel.php | grep -P -o '[0-9]+\.[0-9]+').x-dev
-          export COMPOSER_ROOT_VERSION=6.4.x-dev # to be removed once deps allow ^7.0
+          export COMPOSER_ROOT_VERSION=$(grep ' VERSION = ' src/Symfony/Component/HttpKernel/Kernel.php | grep -P -o '[0-9]+\.[0-9]+').x-dev
           echo COMPOSER_ROOT_VERSION=$COMPOSER_ROOT_VERSION >> $GITHUB_ENV
 
           echo "::group::composer update"
diff --git a/.github/workflows/intl-data-tests.yml b/.github/workflows/intl-data-tests.yml
@@ -63,8 +63,7 @@ jobs:
         run: |
           COMPOSER_HOME="$(composer config home)"
           ([ -d "$COMPOSER_HOME" ] || mkdir "$COMPOSER_HOME") && cp .github/composer-config.json "$COMPOSER_HOME/config.json"
-          #export COMPOSER_ROOT_VERSION=$(grep ' VERSION = ' src/Symfony/Component/HttpKernel/Kernel.php | grep -P -o '[0-9]+\.[0-9]+').x-dev
-          export COMPOSER_ROOT_VERSION=6.4.x-dev # to be removed once deps allow ^7.0
+          export COMPOSER_ROOT_VERSION=$(grep ' VERSION = ' src/Symfony/Component/HttpKernel/Kernel.php | grep -P -o '[0-9]+\.[0-9]+').x-dev
           echo COMPOSER_ROOT_VERSION=$COMPOSER_ROOT_VERSION >> $GITHUB_ENV
 
           echo "::group::composer update"
diff --git a/.github/workflows/psalm.yml b/.github/workflows/psalm.yml
@@ -41,8 +41,7 @@ jobs:
         run: |
           COMPOSER_HOME="$(composer config home)"
           ([ -d "$COMPOSER_HOME" ] || mkdir "$COMPOSER_HOME") && cp .github/composer-config.json "$COMPOSER_HOME/config.json"
-          #export COMPOSER_ROOT_VERSION=$(grep ' VERSION = ' src/Symfony/Component/HttpKernel/Kernel.php | grep -P -o '[0-9]+\.[0-9]+').x-dev
-          export COMPOSER_ROOT_VERSION=6.4.x-dev # to be removed once deps allow ^7.0
+          export COMPOSER_ROOT_VERSION=$(grep ' VERSION = ' src/Symfony/Component/HttpKernel/Kernel.php | grep -P -o '[0-9]+\.[0-9]+').x-dev
           composer remove --dev --no-update --no-interaction symfony/phpunit-bridge
           composer require --no-progress --ansi --no-plugins psalm/phar phpunit/phpunit:^9.6 php-http/discovery psr/event-dispatcher mongodb/mongodb jetbrains/phpstorm-stubs
 
diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
@@ -122,8 +122,7 @@ jobs:
           [[ "${{ matrix.mode }}" = high-deps && $SYMFONY_VERSION = *.4 ]] && echo LEGACY=,legacy >> $GITHUB_ENV || true
 
           echo SYMFONY_VERSION=$SYMFONY_VERSION >> $GITHUB_ENV
-          #echo COMPOSER_ROOT_VERSION=$SYMFONY_VERSION.x-dev >> $GITHUB_ENV
-          echo COMPOSER_ROOT_VERSION=6.4.x-dev >> $GITHUB_ENV # to be removed once all deps allow ^7.0
+          echo COMPOSER_ROOT_VERSION=$SYMFONY_VERSION.x-dev >> $GITHUB_ENV
           echo SYMFONY_REQUIRE=">=$([ '${{ matrix.mode }}' = low-deps ] && echo 5.4 || echo $SYMFONY_VERSION)" >> $GITHUB_ENV
           [[ "${{ matrix.mode }}" = *-deps ]] && mv composer.json.phpunit composer.json || true
 
