Merge 4.x into 5.x

sonata-project · Jun 20, 2024 · bbcd36f · bbcd36f
2 parents 639ff4b + 3006548
commit bbcd36f
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 17 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
@@ -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
 

diff --git a/.github/workflows/qa.yaml b/.github/workflows/qa.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
 

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-platforms.yaml b/.github/workflows/test-platforms.yaml
@@ -60,7 +60,7 @@ jobs:
               run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
 
             - name: Install Composer dependencies (${{ matrix.dependencies }})
-              uses: ramsey/composer-install@v2
+              uses: ramsey/composer-install@v3
               with:
                   dependency-versions: ${{ matrix.dependencies }}
 
@@ -113,7 +113,7 @@ jobs:
               run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
 
             - name: Install Composer dependencies (${{ matrix.dependencies }})
-              uses: ramsey/composer-install@v2
+              uses: ramsey/composer-install@v3
               with:
                   dependency-versions: ${{ matrix.dependencies }}
 

diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -83,14 +83,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
@@ -59,7 +59,7 @@
         "phpunit/phpunit": "^9.5",
         "psalm/plugin-phpunit": "^0.18",
         "psalm/plugin-symfony": "^5.0",
-        "rector/rector": "^0.19",
+        "rector/rector": "^1.1",
         "sonata-project/block-bundle": "^5.0",
         "sonata-project/entity-audit-bundle": "^1.1",
         "symfony/browser-kit": "^5.4 || ^6.2 || ^7.0",

diff --git a/psalm.xml b/psalm.xml
@@ -16,5 +16,6 @@
         <!-- Psalm equivalent of PHPStan config `treatPhpDocTypesAsCertain: false` -->
         <DocblockTypeContradiction errorLevel="suppress"/>
         <RedundantConditionGivenDocblockType errorLevel="suppress"/>
+        <MissingClassConstType errorLevel="suppress"/>
     </issueHandlers>
 </psalm>
diff --git a/src/Datagrid/ProxyQuery.php b/src/Datagrid/ProxyQuery.php
@@ -314,9 +314,6 @@ public function entityJoin(array $associationMappings): string
     /**
      * Sets a {@see Query} hint. If the hint name is not recognized, it is silently ignored.
      *
-     * @param string $name  the name of the hint
-     * @param mixed  $value the value of the hint
-     *
      * @see Query::setHint
      * @see Query::HINT_CUSTOM_OUTPUT_WALKER
      *