Merge pull request #320 from kbond/modernize-v2

Modernize 2.x

Author: kbond

.github/workflows/ci.yml

@@ -15,19 +15,18 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
+        php: [ 8.1, 8.2, 8.3, 8.4 ]
+        deps: [ highest ]
+        symfony: [ 6.4.*, 7.2.*, 7.3.* ]
         include:
-          - php: 7.4
-            symfony: 5.4.*
-          - php: 8.0
-            symfony: 5.4.*
           - php: 8.1
-            symfony: 6.4.*
-          - php: 8.2
-            symfony: 6.4.*
-          - php: 8.2
-            symfony: 7.0.*
-          - php: 8.3
-            symfony: 7.0.*
+            deps: lowest
+            symfony: '*'
+        exclude:
+          - php: 8.1
+            symfony: 7.2.*
+          - php: 8.1
+            symfony: 7.3.*
 
     steps:
       - name: Checkout code
@@ -40,43 +39,17 @@ jobs:
           coverage: none
           tools: flex
 
-      - name: Install symfony/mailer
-        run: composer require --dev "symfony/mailer" --no-update
-
       - name: Install dependencies
         uses: ramsey/composer-install@v2
         with:
+          dependency-versions: ${{ inputs.deps }}
           composer-options: --prefer-dist
         env:
           SYMFONY_REQUIRE: ${{ matrix.symfony }}
 
       - name: Run tests
         run: vendor/bin/phpunit -v
 
-  prefer-lowest-tests:
-    name: "Test: prefer-lowest"
-
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-
-      - name: Setup PHP
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: 7.3
-          coverage: none
-
-      - name: Install dependencies
-        uses: ramsey/composer-install@v2
-        with:
-          dependency-versions: lowest
-          composer-options: --prefer-dist
-
-      - name: Run tests
-        run: vendor/bin/phpunit -v
-
   code-coverage:
     name: Code Coverage
     runs-on: ubuntu-latest
@@ -87,12 +60,9 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: 7.4
+          php-version: 8.3
           coverage: xdebug
 
-      - name: Install symfony/mailer
-        run: composer require --dev "symfony/mailer" --no-update
-
       - name: Install dependencies
         uses: ramsey/composer-install@v2
         with:
@@ -111,7 +81,7 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: 7.4
+          php-version: 8.3
           coverage: none
 
       - name: Validate composer.json
@@ -127,7 +97,7 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: 7.4
+          php-version: 8.1
           coverage: none
 
       - name: Install dependencies

.gitignore

@@ -1,6 +1,6 @@
-/Tests/app/cache
-/Tests/app/logs
-/Tests/app/var
+/Tests/Fixture/cache
+/Tests/Fixture/logs
+/Tests/Fixture/var
 /vendor
 composer.lock
 .phpunit.result.cache

.scrutinizer.yml

@@ -42,7 +42,7 @@ class DoctrineMigrationsCollection implements CheckCollectionInterface
      */
     public function __construct(
         ContainerInterface $container,
-        array $migrations
+        array $migrations,
     ) {
         $this->container = $container;
         $this->migrations = $migrations;

Check/DoctrineMigrationsCollection.php

@@ -4,6 +4,7 @@
 
 use Laminas\Diagnostics\Check\AbstractCheck;
 use Laminas\Diagnostics\Result\Failure;
+use Laminas\Diagnostics\Result\ResultInterface;
 use Laminas\Diagnostics\Result\Success;
 use Laminas\Diagnostics\Result\Warning;
 use Symfony\Component\Messenger\Transport\Receiver\MessageCountAwareInterface;
@@ -29,7 +30,7 @@ public function __construct(MessageCountAwareInterface $transport, string $trans
         }
     }
 
-    public function check()
+    public function check(): ResultInterface
     {
         $count = $this->transport->getMessageCount();
 

Check/SymfonyMessengerTransportCount.php

@@ -27,7 +27,7 @@ public function __construct(ServiceLocator $messengerReceiverLocator, array $tra
         $this->transports = $transportConfig;
     }
 
-    public function getChecks()
+    public function getChecks(): array
     {
         $checks = [];
         foreach ($this->transports as $transportName => $config) {

Check/SymfonyMessengerTransportCountCollection.php

@@ -24,14 +24,12 @@ public function process(ContainerBuilder $container): void
         }
 
         try {
-            $definition = $container->findDefinition('mailer');
-        } catch (ServiceNotFoundException $e) {
-            throw new \InvalidArgumentException('To enable mail reporting you have to install the "swiftmailer/swiftmailer" or "symfony/mailer".');
+            $container->findDefinition('mailer');
+        } catch (ServiceNotFoundException) {
+            throw new \InvalidArgumentException('To enable mail reporting you have to install "symfony/mailer".');
         }
 
-        $filename = \Swift_Mailer::class !== $definition->getClass() ? 'symfony_mailer.xml' : 'swift_mailer.xml';
-
         $loader = new Loader\XmlFileLoader($container, new FileLocator(__DIR__.'/../../Resources/config'));
-        $loader->load($filename);
+        $loader->load('symfony_mailer.xml');
     }
 }

DependencyInjection/Compiler/MailerCompilerPass.php

@@ -22,6 +22,6 @@ abstract public function createMigrationConfigurationService(
         ContainerBuilder $container,
         string $connectionName,
         string $serviceId,
-        ?string $filename = null
+        ?string $filename = null,
     ): void;
 }

DependencyInjection/DoctrineMigrations/AbstractDoctrineMigrationsLoader.php

@@ -52,7 +52,7 @@ public function createMigrationConfigurationService(
         ContainerBuilder $container,
         string $connectionName,
         string $serviceId,
-        ?string $filename = null
+        ?string $filename = null,
     ): void {
         if (!$container->has(Configuration::class)) {
             $container->register(Configuration::class)
@@ -136,7 +136,7 @@ public function createMigrationConfigurationService(
     private function createTemporaryConfiguration(
         ContainerBuilder $container,
         Connection $connection,
-        string $filename = null
+        ?string $filename = null,
     ): DoctrineMigrationConfiguration {
         if (null === $filename) {
             // this is configured from migrations bundle

DependencyInjection/DoctrineMigrations/V2MigrationsLoader.php

@@ -23,7 +23,7 @@ public function createMigrationConfigurationService(
         ContainerBuilder $container,
         string $connectionName,
         string $serviceId,
-        ?string $filename = null
+        ?string $filename = null,
     ): void {
         if (null !== $filename) {
             $configurationClass = $this->getConfigurationLoaderClass($container, $filename);