Merge 4.x into 5.x

sonata-project · Jun 20, 2024 · 288c889 · 288c889
2 parents 1eaccb7 + d7a4fb3
commit 288c889
Show file tree

Hide file tree

Showing 9 changed files with 20 additions and 15 deletions.
diff --git a/.github/workflows/documentation.yaml b/.github/workflows/documentation.yaml
@@ -27,7 +27,7 @@ jobs:
               uses: actions/checkout@v4
 
             - name: Set up Python 3.11
-              uses: actions/setup-python@v4
+              uses: actions/setup-python@v5
               with:
                   python-version: '3.11'
                   cache: 'pip'

diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml
@@ -35,7 +35,7 @@ jobs:
                   extensions: mongodb
 
             - name: Install Composer dependencies (highest)
-              uses: ramsey/composer-install@v2
+              uses: ramsey/composer-install@v3
               with:
                   dependency-versions: highest
 

diff --git a/.github/workflows/qa.yaml b/.github/workflows/qa.yaml
@@ -35,7 +35,7 @@ jobs:
                   extensions: mongodb
 
             - name: Install Composer dependencies (highest)
-              uses: ramsey/composer-install@v2
+              uses: ramsey/composer-install@v3
               with:
                   dependency-versions: highest
 
@@ -60,7 +60,7 @@ jobs:
                   extensions: mongodb
 
             - name: Install Composer dependencies (highest)
-              uses: ramsey/composer-install@v2
+              uses: ramsey/composer-install@v3
               with:
                   dependency-versions: highest
 
@@ -85,7 +85,7 @@ jobs:
                   extensions: mongodb
 
             - name: Install Composer dependencies (highest)
-              uses: ramsey/composer-install@v2
+              uses: ramsey/composer-install@v3
               with:
                   dependency-versions: highest
 

diff --git a/.github/workflows/symfony-lint.yaml b/.github/workflows/symfony-lint.yaml
@@ -34,7 +34,7 @@ jobs:
                   tools: composer:v2
 
             - name: Install Composer dependencies (highest)
-              uses: ramsey/composer-install@v2
+              uses: ramsey/composer-install@v3
               with:
                   dependency-versions: highest
 
@@ -58,7 +58,7 @@ jobs:
                   tools: composer:v2
 
             - name: Install Composer dependencies (highest)
-              uses: ramsey/composer-install@v2
+              uses: ramsey/composer-install@v3
               with:
                   dependency-versions: highest
 
@@ -82,7 +82,7 @@ jobs:
                   tools: composer:v2
 
             - name: Install Composer dependencies (highest)
-              uses: ramsey/composer-install@v2
+              uses: ramsey/composer-install@v3
               with:
                   dependency-versions: highest
 
@@ -106,7 +106,7 @@ jobs:
                   tools: composer:v2
 
             - name: Install Composer dependencies (highest)
-              uses: ramsey/composer-install@v2
+              uses: ramsey/composer-install@v3
               with:
                   dependency-versions: highest
 

diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -90,14 +90,14 @@ jobs:
               run: composer require ${{ matrix.variant }} --no-update
 
             - name: Install Composer dependencies (${{ matrix.dependencies }})
-              uses: ramsey/composer-install@v2
+              uses: ramsey/composer-install@v3
               with:
                   dependency-versions: ${{ matrix.dependencies }}
 
             - name: Run Tests with coverage
               run: make coverage
 
             - name: Send coverage to Codecov
-              uses: codecov/codecov-action@v3
+              uses: codecov/codecov-action@v4
               with:
                   files: build/logs/clover.xml
diff --git a/composer.json b/composer.json
@@ -55,7 +55,7 @@
         "phpunit/phpunit": "^9.6",
         "psalm/plugin-phpunit": "^0.18",
         "psalm/plugin-symfony": "^5.0",
-        "rector/rector": "^0.19",
+        "rector/rector": "^1.1",
         "sonata-project/block-bundle": "^4.2 || ^5.0",
         "symfony/browser-kit": "^5.4 || ^6.2 || ^7.0",
         "symfony/css-selector": "^5.4 || ^6.2 || ^7.0",

diff --git a/psalm.xml b/psalm.xml
@@ -11,4 +11,7 @@
         <pluginClass class="Psalm\SymfonyPsalmPlugin\Plugin"/>
         <pluginClass class="Psalm\PhpUnitPlugin\Plugin"/>
     </plugins>
+    <issueHandlers>
+        <MissingClassConstType errorLevel="suppress"/>
+    </issueHandlers>
 </psalm>
diff --git a/src/Model/ModelManager.php b/src/Model/ModelManager.php
@@ -191,7 +191,7 @@ public function getIdentifierValues(object $model): array
 
     public function getIdentifierFieldNames(string $class): array
     {
-        return array_filter($this->getMetadata($class)->getIdentifier());
+        return array_filter($this->getMetadata($class)->getIdentifier(), static fn (?string $id) => null !== $id);
     }
 
     public function getNormalizedIdentifier(object $model): ?string

diff --git a/tests/Model/ModelManagerTest.php b/tests/Model/ModelManagerTest.php
@@ -327,8 +327,10 @@ public function testFailingBatchDelete(string $expectedExceptionMessage, array $
             Configuration::AUTOGENERATE_FILE_NOT_EXISTS
         );
         $uow = new UnitOfWork($dm, $eventManager, $hydratorFactory);
-        /** @psalm-suppress InternalMethod */
-        $hydratorFactory->setUnitOfWork($uow);
+        // @phpstan-ignore-next-line
+        if (method_exists($hydratorFactory, 'setUnitOfWork')) {
+            $hydratorFactory->setUnitOfWork($uow);
+        }
 
         $dm
             ->expects(static::atLeastOnce())