Merge 4.x into 5.x

sonata-project · Jan 24, 2024 · 7944b38 · 7944b38
2 parents 3dfd473 + b850c17
commit 7944b38
Show file tree

Hide file tree

Showing 9 changed files with 51 additions and 50 deletions.
diff --git a/.github/workflows/documentation.yaml b/.github/workflows/documentation.yaml
@@ -24,7 +24,7 @@ jobs:
 
         steps:
             - name: Checkout
-              uses: actions/checkout@v3
+              uses: actions/checkout@v4
 
             - name: Set up Python 3.11
               uses: actions/setup-python@v4
@@ -45,7 +45,7 @@ jobs:
 
         steps:
             - name: Checkout
-              uses: actions/checkout@v3
+              uses: actions/checkout@v4
 
             - name: Run DOCtor-RST
               uses: docker://oskarstark/doctor-rst

diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml
@@ -24,12 +24,12 @@ jobs:
 
         steps:
             - name: Checkout
-              uses: actions/checkout@v3
+              uses: actions/checkout@v4
 
             - name: Install PHP with extensions
               uses: shivammathur/setup-php@v2
               with:
-                  php-version: '8.2'
+                  php-version: '8.3'
                   coverage: none
                   tools: composer:v2
                   extensions: mongodb
@@ -49,12 +49,12 @@ jobs:
 
         steps:
             - name: Checkout
-              uses: actions/checkout@v3
+              uses: actions/checkout@v4
 
             - name: Install PHP with extensions
               uses: shivammathur/setup-php@v2
               with:
-                  php-version: '8.2'
+                  php-version: '8.3'
                   coverage: none
                   tools: composer:v2, composer-normalize:2
               env:
@@ -70,7 +70,7 @@ jobs:
 
         steps:
             - name: Checkout
-              uses: actions/checkout@v3
+              uses: actions/checkout@v4
 
             - name: Install yamllint
               run: sudo apt-get install yamllint
@@ -85,7 +85,7 @@ jobs:
 
         steps:
             - name: Checkout
-              uses: actions/checkout@v3
+              uses: actions/checkout@v4
 
             - name: Install required dependencies
               run: sudo apt-get update && sudo apt-get install libxml2-utils

diff --git a/.github/workflows/qa.yaml b/.github/workflows/qa.yaml
@@ -24,12 +24,12 @@ jobs:
 
         steps:
             - name: Checkout
-              uses: actions/checkout@v3
+              uses: actions/checkout@v4
 
             - name: Install PHP with extensions
               uses: shivammathur/setup-php@v2
               with:
-                  php-version: '8.2'
+                  php-version: '8.3'
                   coverage: none
                   tools: composer:v2
                   extensions: mongodb
@@ -49,12 +49,12 @@ jobs:
 
         steps:
             - name: Checkout code
-              uses: actions/checkout@v3
+              uses: actions/checkout@v4
 
             - name: Install PHP with extensions
               uses: shivammathur/setup-php@v2
               with:
-                  php-version: '8.2'
+                  php-version: '8.3'
                   coverage: none
                   tools: composer:v2
                   extensions: mongodb
@@ -65,7 +65,7 @@ jobs:
                   dependency-versions: highest
 
             - name: Psalm
-              run: vendor/bin/psalm --no-progress --show-info=false --stats --output-format=github --threads=$(nproc) --shepherd --php-version=8.2
+              run: vendor/bin/psalm --no-progress --show-info=false --stats --output-format=github --threads=$(nproc) --shepherd --php-version=8.3
 
     rector:
         name: Rector
@@ -74,12 +74,12 @@ jobs:
 
         steps:
             - name: Checkout code
-              uses: actions/checkout@v3
+              uses: actions/checkout@v4
 
             - name: Install PHP with extensions
               uses: shivammathur/setup-php@v2
               with:
-                  php-version: '8.2'
+                  php-version: '8.3'
                   coverage: none
                   tools: composer:v2
                   extensions: mongodb

diff --git a/.github/workflows/symfony-lint.yaml b/.github/workflows/symfony-lint.yaml
@@ -24,12 +24,12 @@ jobs:
 
         steps:
             - name: Checkout
-              uses: actions/checkout@v3
+              uses: actions/checkout@v4
 
             - name: Install PHP with extensions
               uses: shivammathur/setup-php@v2
               with:
-                  php-version: '8.2'
+                  php-version: '8.3'
                   coverage: none
                   tools: composer:v2
 
@@ -48,12 +48,12 @@ jobs:
 
         steps:
             - name: Checkout
-              uses: actions/checkout@v3
+              uses: actions/checkout@v4
 
             - name: Install PHP with extensions
               uses: shivammathur/setup-php@v2
               with:
-                  php-version: '8.2'
+                  php-version: '8.3'
                   coverage: none
                   tools: composer:v2
 
@@ -72,12 +72,12 @@ jobs:
 
         steps:
             - name: Checkout
-              uses: actions/checkout@v3
+              uses: actions/checkout@v4
 
             - name: Install PHP with extensions
               uses: shivammathur/setup-php@v2
               with:
-                  php-version: '8.2'
+                  php-version: '8.3'
                   coverage: none
                   tools: composer:v2
 
@@ -96,12 +96,12 @@ jobs:
 
         steps:
             - name: Checkout
-              uses: actions/checkout@v3
+              uses: actions/checkout@v4
 
             - name: Install PHP with extensions
               uses: shivammathur/setup-php@v2
               with:
-                  php-version: '8.2'
+                  php-version: '8.3'
                   coverage: none
                   tools: composer:v2
 

diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -39,6 +39,7 @@ jobs:
                     - '8.0'
                     - '8.1'
                     - '8.2'
+                    - '8.3'
                 dependencies: [highest]
                 allowed-to-fail: [false]
                 symfony-require: ['']
@@ -48,43 +49,42 @@ jobs:
                       dependencies: lowest
                       allowed-to-fail: false
                       variant: normal
-                    - php-version: '8.2'
+                    - php-version: '8.3'
                       dependencies: highest
                       allowed-to-fail: false
                       symfony-require: 5.4.*
                       variant: symfony/symfony:"5.4.*"
-                    - php-version: '8.2'
+                    - php-version: '8.3'
                       dependencies: highest
                       allowed-to-fail: false
                       symfony-require: 6.3.*
                       variant: symfony/symfony:"6.3.*"
-                    - php-version: '8.2'
+                    - php-version: '8.3'
                       dependencies: highest
                       allowed-to-fail: false
                       symfony-require: 6.4.*
                       variant: symfony/symfony:"6.4.*"
+                    - php-version: '8.3'
+                      dependencies: highest
+                      allowed-to-fail: false
+                      symfony-require: 7.0.*
+                      variant: symfony/symfony:"7.0.*"
 
         steps:
             - name: Checkout
-              uses: actions/checkout@v3
+              uses: actions/checkout@v4
 
             - name: Install PHP with extensions
               uses: shivammathur/setup-php@v2
               with:
                   php-version: ${{ matrix.php-version }}
                   coverage: pcov
-                  tools: composer:v2
+                  tools: composer:v2, flex
                   extensions: mongodb
 
             - name: Add PHPUnit matcher
               run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
 
-            - name: Globally install symfony/flex
-              if: matrix.symfony-require != ''
-              run: |
-                  composer global config --no-plugins allow-plugins.symfony/flex true
-                  composer global require --no-progress --no-scripts --no-plugins symfony/flex
-
             - name: Install variant
               if: matrix.variant != 'normal' && !startsWith(matrix.variant, 'symfony/symfony')
               run: composer require ${{ matrix.variant }} --no-update

diff --git a/Makefile b/Makefile
@@ -117,7 +117,7 @@ phpstan:
 .PHONY: phpstan
 
 psalm:
-	vendor/bin/psalm --php-version=8.2
+	vendor/bin/psalm --php-version=8.3
 .PHONY: psalm
 
 rector:

diff --git a/composer.json b/composer.json
@@ -29,24 +29,24 @@
         "ext-mongodb": "*",
         "doctrine/collections": "^1.6 || ^2.0",
         "doctrine/mongodb-odm": "^2.3",
-        "doctrine/mongodb-odm-bundle": "^4.4",
+        "doctrine/mongodb-odm-bundle": "^4.4 || ^5.0",
         "doctrine/persistence": "^3.0",
         "sonata-project/admin-bundle": "^4.18",
         "sonata-project/exporter": "^2.0 || ^3.0",
         "sonata-project/form-extensions": "^1.7.1 || ^2.0",
-        "symfony/config": "^5.4 || ^6.2",
-        "symfony/dependency-injection": "^5.4 || ^6.2",
-        "symfony/doctrine-bridge": "^5.4 || ^6.2",
-        "symfony/form": "^5.4 || ^6.2",
-        "symfony/http-kernel": "^5.4 || ^6.2",
-        "symfony/property-access": "^5.4 || ^6.2",
+        "symfony/config": "^5.4 || ^6.2 || ^7.0",
+        "symfony/dependency-injection": "^5.4 || ^6.2 || ^7.0",
+        "symfony/doctrine-bridge": "^5.4 || ^6.2 || ^7.0",
+        "symfony/form": "^5.4 || ^6.2 || ^7.0",
+        "symfony/http-kernel": "^5.4 || ^6.2 || ^7.0",
+        "symfony/property-access": "^5.4 || ^6.2 || ^7.0",
         "twig/twig": "^3.0"
     },
     "require-dev": {
         "doctrine/data-fixtures": "^1.6",
         "friendsofphp/php-cs-fixer": "^3.4",
-        "matthiasnoback/symfony-config-test": "^4.2",
-        "matthiasnoback/symfony-dependency-injection-test": "^4.1",
+        "matthiasnoback/symfony-config-test": "^4.2 || ^5.0",
+        "matthiasnoback/symfony-dependency-injection-test": "^4.1 || ^5.0",
         "phpstan/extension-installer": "^1.1",
         "phpstan/phpstan": "^1.0",
         "phpstan/phpstan-phpunit": "^1.0",
@@ -57,11 +57,11 @@
         "psalm/plugin-symfony": "^5.0",
         "rector/rector": "^0.19",
         "sonata-project/block-bundle": "^4.2 || ^5.0",
-        "symfony/browser-kit": "^5.4 || ^6.2",
-        "symfony/css-selector": "^5.4 || ^6.2",
+        "symfony/browser-kit": "^5.4 || ^6.2 || ^7.0",
+        "symfony/css-selector": "^5.4 || ^6.2 || ^7.0",
         "symfony/panther": "^2.0.1",
-        "symfony/phpunit-bridge": "^6.2",
-        "symfony/twig-bridge": "^5.4 || ^6.2",
+        "symfony/phpunit-bridge": "^6.2 || ^7.0",
+        "symfony/twig-bridge": "^5.4 || ^6.2 || ^7.0",
         "vimeo/psalm": "^5.7"
     },
     "conflict": {

diff --git a/src/DependencyInjection/Configuration.php b/src/DependencyInjection/Configuration.php
@@ -27,7 +27,7 @@
 final class Configuration implements ConfigurationInterface
 {
     /**
-     * @psalm-suppress PossiblyNullReference, UndefinedInterfaceMethod
+     * @psalm-suppress UndefinedInterfaceMethod
      *
      * @see https://github.com/psalm/psalm-plugin-symfony/issues/174
      */

diff --git a/tests/DependencyInjection/SonataDoctrineMongoDBAdminExtensionTest.php b/tests/DependencyInjection/SonataDoctrineMongoDBAdminExtensionTest.php
@@ -15,6 +15,7 @@
 
 use Matthias\SymfonyDependencyInjectionTest\PhpUnit\AbstractExtensionTestCase;
 use Sonata\DoctrineMongoDBAdminBundle\DependencyInjection\SonataDoctrineMongoDBAdminExtension;
+use Symfony\Component\DependencyInjection\Reference;
 
 final class SonataDoctrineMongoDBAdminExtensionTest extends AbstractExtensionTestCase
 {
@@ -52,7 +53,7 @@ public function testEntityManagerSetFactory(): void
         $this->assertContainerBuilderHasServiceDefinitionWithArgument(
             'sonata.admin.manipulator.acl.object.doctrine_mongodb',
             0,
-            'doctrine_mongodb'
+            new Reference('doctrine_mongodb')
         );
     }