Fixes #5024. Allow Symfony 5.4 and 6 (#5025)

.circleci/config.yml

@@ -109,7 +109,7 @@ jobs:
 
   # PHP 8 test with Drupal tip
   #   Determines whether a newer version of a dependency has broken Drush.
-  test_81_drupal94_highest:
+  test_81_drupal10_highest:
     <<: *defaults
     docker:
       - image: wodby/php:latest
@@ -122,7 +122,9 @@ jobs:
       - run: cp .docker/zz-php.ini /usr/local/etc/php/conf.d/
       - run: php --version
       - run: composer -n config platform.php --unset
-      - run: composer -n require --dev drupal/core-recommended:9.4.x-dev --no-update
+      - run: composer -n require --dev drupal/core-recommended:10.0.x-dev --no-update
+      # Bring it back when it is compatible with Drupal 10.
+      - run: composer -n remove drupal/semver_example --no-update --dev
       - run: composer -n update
       - run: mkdir -p /tmp/results
       - run: composer -n lint
@@ -144,7 +146,7 @@ workflows:
           <<: *requires
       - test_74_drupal9_mysql:
           <<: *requires
-      - test_81_drupal94_highest:
+      - test_81_drupal10_highest:
           <<: *requires
       - test_74_drupal9_sqlite:
           <<: *requires

composer.json

@@ -34,7 +34,7 @@
     "ext-dom": "*",
     "chi-teck/drupal-code-generator": "^2.3",
     "composer/semver": "^1.4 || ^3",
-    "consolidation/annotated-command": "^4.4",
+    "consolidation/annotated-command": "^4.5",
     "consolidation/config": "^1.2",
     "consolidation/filter-via-dot-access-data": "^1",
     "consolidation/robo": "^3",
@@ -46,19 +46,19 @@
     "league/container": "^3.4",
     "psr/log": "~1.0",
     "psy/psysh": "~0.11",
-    "symfony/event-dispatcher": "^4.0",
-    "symfony/finder": "^4.0 || ^5",
+    "symfony/event-dispatcher": "^4.0 || ^5.0 || ^6.0",
+    "symfony/finder": "^4.0 || ^5 || ^6",
     "symfony/polyfill-php80": "^1.23",
-    "symfony/var-dumper": "^4.0 || ^5.0",
-    "symfony/yaml": "^4.0",
+    "symfony/var-dumper": "^4.0 || ^5.0 || ^6.0",
+    "symfony/yaml": "^4.0 || ^5.0 || ^6.0",
     "webflo/drupal-finder": "^1.2",
     "webmozart/path-util": "^2.1.0"
   },
   "require-dev": {
     "composer/installers": "^1.7",
     "cweagans/composer-patches": "~1.0",
     "david-garcia/phpwhois": "4.3.0",
-    "drupal/core-recommended": "^9",
+    "drupal/core-recommended": "^9 || ^10",
     "drupal/semver_example": "2.2.0",
     "phpunit/phpunit": ">=7.5.20",
     "rector/rector": "^0.12",

sut/modules/unish/drush_empty_module/drush_empty_module.info.yml

@@ -1,7 +1,7 @@
 name: Drush empty module
 description: 'Drush empty module'
 core: 8.x
-core_version_requirement: ^8 || ^9
+core_version_requirement: ^8 || ^9 || ^10
 type: module
 # Require for the sake of tests - simulate what packaging would do.
 project: drush_empty_module

tests/fixtures/modules/woot/composer.json

@@ -14,7 +14,7 @@
   "extra": {
     "drush": {
       "services": {
-        "drush.services.yml": "^9 || ^10"
+        "drush.services.yml": "^9 || ^10 || ^11"
       }
     }
   }

tests/fixtures/modules/woot/woot.info.yml

@@ -1,5 +1,5 @@
 name: Woot
 type: module
 description: Woot Mightily.
-core_version_requirement: ^9
+core_version_requirement: ^9 || ^10
 package: Other

tests/integration/SecurityUpdatesTest.php

@@ -2,6 +2,8 @@
 
 namespace Unish;
 
+use Composer\Semver\Semver;
+
 /**
  * Tests "pm:security" command.
  * @group commands
@@ -14,6 +16,9 @@ class SecurityUpdatesTest extends UnishIntegrationTestCase
    */
     public function testInsecureDrupalPackage()
     {
+        if (Semver::satisfies(\Drupal::VERSION, '^10')) {
+            $this->markTestSkipped('drupal/semver_example not yet compatible.');
+        }
         list($expected_package, $expected_version) = ['drupal/semver_example', '2.2.0'];
         $this->drush('pm:security', [], ['format' => 'json'], self::EXIT_ERROR_WITH_CLARITY);
         $this->assertStringContainsString('One or more of your dependencies has an outstanding security update.', $this->getErrorOutput());

tests/unish/CreateEntityType.php

@@ -15,10 +15,17 @@ public static function createContentEntity($testCase): void
             'name' => 'Unish Article',
             'machine_name' => 'unish_article',
             'description' => 'A test module',
-            'package' => 'unish',
+            // See https://www.drupal.org/project/drupal/issues/3096609.
+            'package' => 'Testing',
             'dependencies' => 'drupal:text',
         ];
         $testCase->drush('generate', ['module'], ['verbose' => null, 'answer' => $answers, 'destination' => Path::join($testCase->webroot(), 'modules/contrib')], null, null, $testCase::EXIT_SUCCESS, null, ['SHELL_INTERACTIVE' => 1]);
+        // Currently needed for Drush 10.x tests. Harmless on other versions.
+        $path = Path::join($testCase->webroot(), 'modules/contrib/unish_article/unish_article.info.yml');
+        $contents = file_get_contents($path);
+        file_put_contents($path, str_replace('^8 || ^9', '^8 || ^9 || ^10', $contents));
+
+
         // Create a content entity type and enable its module.
         // Note that only the values below are used. The keys are for documentation.
         $answers = [

tests/unish/TestModuleHelperTrait.php

@@ -33,7 +33,7 @@ public function setupModulesForTests(array $modules, $sourcePath)
                 $info_path = $targetDir . "/$module.info.yml";
                 $module_info = file_get_contents($info_path);
                 if (strpos($module_info, 'core_version_requirement') === false) {
-                    $module_info = "core_version_requirement: ^8 || ^9\n$module_info";
+                    $module_info = "core_version_requirement: ^8 || ^9 || ^10\n$module_info";
                     file_put_contents($info_path, $module_info);
                 }
             }