Merge branch '3.4.x' into 3.5.x

* 3.4.x: Doctrine CS 12 (#404) CI: Bump workflows (#405)
doctrine · Oct 29, 2023 · 9aa3df0 · 9aa3df0
2 parents d51447b + 6197634
commit 9aa3df0
Show file tree

Hide file tree

Showing 10 changed files with 15 additions and 22 deletions.
diff --git a/.github/workflows/coding-standards.yml b/.github/workflows/coding-standards.yml
@@ -12,4 +12,4 @@ on:
 jobs:
   coding-standards:
     name: "Coding Standards"
-    uses: "doctrine/.github/.github/workflows/coding-standards.yml@3.0.0"
+    uses: "doctrine/.github/.github/workflows/coding-standards.yml@3.1.0"
diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
@@ -30,6 +30,7 @@ jobs:
           - "8.0"
           - "8.1"
           - "8.2"
+          - "8.3"
         dependencies:
           - "highest"
         stability:
@@ -47,11 +48,11 @@ jobs:
             php-version: "7.3"
           - dependencies: "highest"
             stability: "dev"
-            php-version: "8.2"
+            php-version: "8.3"
 
     steps:
       - name: "Checkout"
-        uses: "actions/checkout@v3"
+        uses: "actions/checkout@v4"
         with:
           fetch-depth: 2
 
@@ -114,12 +115,12 @@ jobs:
 
     steps:
       - name: "Checkout"
-        uses: "actions/checkout@v3"
+        uses: "actions/checkout@v4"
         with:
           fetch-depth: 2
 
       - name: "Download coverage files"
-        uses: "actions/download-artifact@v2"
+        uses: "actions/download-artifact@v3"
         with:
           path: "reports"
 

diff --git a/.github/workflows/release-on-milestone-closed.yml b/.github/workflows/release-on-milestone-closed.yml
@@ -8,7 +8,7 @@ on:
 jobs:
   release:
     name: "Git tag, release & create merge-up PR"
-    uses: "doctrine/.github/.github/workflows/release-on-milestone-closed.yml@3.0.0"
+    uses: "doctrine/.github/.github/workflows/release-on-milestone-closed.yml@3.1.0"
     secrets:
       GIT_AUTHOR_EMAIL: ${{ secrets.GIT_AUTHOR_EMAIL }}
       GIT_AUTHOR_NAME: ${{ secrets.GIT_AUTHOR_NAME }}

diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml
@@ -11,4 +11,4 @@ on:
 
 jobs:
   static-analysis:
-    uses: "doctrine/.github/.github/workflows/static-analysis.yml@3.0.0"
+    uses: "doctrine/.github/.github/workflows/static-analysis.yml@3.1.0"
diff --git a/Command/LoadDataFixturesDoctrineCommand.php b/Command/LoadDataFixturesDoctrineCommand.php
@@ -39,9 +39,7 @@ class LoadDataFixturesDoctrineCommand extends DoctrineCommand
     /** @var PurgerFactory[] */
     private $purgerFactories;
 
-    /**
-     * @param PurgerFactory[] $purgerFactories
-     */
+    /** @param PurgerFactory[] $purgerFactories */
     public function __construct(SymfonyFixturesLoader $fixturesLoader, ?ManagerRegistry $doctrine = null, array $purgerFactories = [])
     {
         if ($doctrine === null) {
@@ -71,7 +69,7 @@ protected function configure()
             ->addOption('purge-exclusions', null, InputOption::VALUE_IS_ARRAY | InputOption::VALUE_REQUIRED, 'List of database tables to ignore while purging')
             ->addOption('shard', null, InputOption::VALUE_REQUIRED, 'The shard connection to use for this command.')
             ->addOption('purge-with-truncate', null, InputOption::VALUE_NONE, 'Purge data by using a database-level TRUNCATE statement')
-            ->setHelp(<<<EOT
+            ->setHelp(<<<'EOT'
 The <info>%command.name%</info> command loads data fixtures from your application:
 
   <info>php %command.full_name%</info>

diff --git a/DependencyInjection/DoctrineFixturesExtension.php b/DependencyInjection/DoctrineFixturesExtension.php
@@ -16,7 +16,7 @@
 class DoctrineFixturesExtension extends Extension
 {
     /**
-     * {@inheritdoc}
+     * {@inheritDoc}
      *
      * @return void
      */

diff --git a/Purger/PurgerFactory.php b/Purger/PurgerFactory.php
@@ -9,9 +9,7 @@
 
 interface PurgerFactory
 {
-    /**
-     * @psalm-param list<string> $excluded
-     */
+    /** @psalm-param list<string> $excluded */
     public function createForEntityManager(
         ?string $emName,
         EntityManagerInterface $em,

diff --git a/Tests/Command/LoadDataFixturesDoctrineCommandTest.php b/Tests/Command/LoadDataFixturesDoctrineCommandTest.php
@@ -41,9 +41,7 @@ public function testInstantiatingWithoutManagerRegistry(): void
         }
     }
 
-    /**
-     * @doesNotPerformAssertions
-     */
+    /** @doesNotPerformAssertions */
     public function testInstantiatingWithManagerRegistry(): void
     {
         $registry = $this->createMock(ManagerRegistry::class);

diff --git a/Tests/IntegrationTest.php b/Tests/IntegrationTest.php
@@ -457,8 +457,6 @@ public function testRunCommandWithPurgeMode(): void
 
 interface ForwardCompatibleEntityManager extends EntityManagerInterface
 {
-    /**
-     * @return mixed
-     */
+    /** @return mixed */
     public function wrapInTransaction(callable $func);
 }
diff --git a/composer.json b/composer.json
@@ -32,7 +32,7 @@
         "symfony/http-kernel": "^3.4|^4.3|^5.0|^6.0|^7."
     },
     "require-dev": {
-        "doctrine/coding-standard": "^9",
+        "doctrine/coding-standard": "^9 || ^12",
         "phpstan/phpstan": "^1.4.10",
         "phpunit/phpunit": "^7.5.20 || ^8.5.26 || ^9.5.20",
         "symfony/phpunit-bridge": "^6.3",