[ci] handle new 5.4 branch & make dev tests green

Author: jrushlow

.github/workflows/ci.yaml

@@ -11,7 +11,6 @@ on:
 env:
     PHPUNIT_FLAGS: "-v"
     SYMFONY_PHPUNIT_DIR: "$HOME/symfony-bridge/.phpunit"
-    SYMFONY_REQUIRE: ">=4.0"
 
 jobs:
     coding-standards:

src/Test/MakerTestEnvironment.php

@@ -460,18 +460,17 @@ private function getTargetSkeletonVersion(): string
 
             switch ($stability) {
                 case 'stable-dev':
-                    $httpClient = HttpClient::create();
-                    $response = $httpClient->request('GET', 'https://symfony.com/versions.json');
-                    $data = $response->toArray();
-
-                    $version = $data['latest'];
+                    $version = ($this->getSymfonyVersions())['latest'];
                     $parts = explode('.', $version);
 
                     $this->targetSkeletonVersion = sprintf('%s.%s.x-dev', $parts[0], $parts[1]);
 
                     break;
                 case 'dev':
-                    $this->targetSkeletonVersion = '5.x-dev';
+                    $version = ($this->getSymfonyVersions())['dev'];
+                    $parts = explode('.', $version);
+
+                    $this->targetSkeletonVersion = sprintf('%s.%s.x-dev', $parts[0], $parts[1]);
 
                     break;
                 default:
@@ -481,4 +480,12 @@ private function getTargetSkeletonVersion(): string
 
         return $this->targetSkeletonVersion;
     }
+
+    private function getSymfonyVersions(): array
+    {
+        $httpClient = HttpClient::create();
+        $response = $httpClient->request('GET', 'https://symfony.com/versions.json');
+
+        return $response->toArray();
+    }
 }

tests/Maker/MakeMigrationTest.php

@@ -29,6 +29,12 @@ public function getTestDetails()
             // only requires doctrine/dbal. But we're testing with the ORM,
             // so let's install it
             ->addExtraDependencies('doctrine/orm:@stable')
+            /*
+             * @legacy doctrine/migrations does not support psr/log >=2
+             *         some symfony components use psr/log ^1 || ^2 || ^3
+             *         once doctrine/migrations supports psr log >= 2, this line can be removed.
+             */
+            ->addExtraDependencies('psr/log:^1.1.4')
             ->assert(function (string $output, string $directory) {
                 $this->assertStringContainsString('Success', $output);
 
@@ -54,6 +60,12 @@ public function getTestDetails()
             // sync the database, so no changes are needed
             ->configureDatabase()
             ->addExtraDependencies('doctrine/orm:@stable')
+            /*
+             * @legacy doctrine/migrations does not support psr/log >=2
+             *         some symfony components use psr/log ^1 || ^2 || ^3
+             *         once doctrine/migrations supports psr log >= 2, this line can be removed.
+             */
+            ->addExtraDependencies('psr/log:^1.1.4')
             ->assert(function (string $output, string $directory) {
                 $this->assertStringNotContainsString('Success', $output);
 
@@ -71,6 +83,12 @@ public function getTestDetails()
             ->configureDatabase(false)
             ->addRequiredPackageVersion('doctrine/doctrine-migrations-bundle', '>=3')
             ->addExtraDependencies('doctrine/orm:@stable')
+            /*
+             * @legacy doctrine/migrations does not support psr/log >=2
+             *         some symfony components use psr/log ^1 || ^2 || ^3
+             *         once doctrine/migrations supports psr log >= 2, this line can be removed.
+             */
+            ->addExtraDependencies('psr/log:^1.1.4')
             // generate a migration first
             ->addPreMakeCommand('php bin/console make:migration')
             ->assert(function (string $output, string $directory) {
@@ -90,6 +108,12 @@ public function getTestDetails()
             ->configureDatabase(false)
             ->addRequiredPackageVersion('doctrine/doctrine-migrations-bundle', '>=3')
             ->addExtraDependencies('doctrine/orm:@stable')
+            /*
+             * @legacy doctrine/migrations does not support psr/log >=2
+             *         some symfony components use psr/log ^1 || ^2 || ^3
+             *         once doctrine/migrations supports psr log >= 2, this line can be removed.
+             */
+            ->addExtraDependencies('psr/log:^1.1.4')
             // generate a migration first
             ->addPreMakeCommand('php bin/console make:migration')
             ->assert(function (string $output, string $directory) {