Merge 4.x into 5.x

sonata-project · Jan 24, 2024 · 0cddb8b · 0cddb8b
2 parents 666ea4d + bcf9955
commit 0cddb8b
Show file tree

Hide file tree

Showing 7 changed files with 49 additions and 39 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, gd
@@ -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, gd
@@ -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, gd
@@ -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, gd

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,48 +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.2'
+                    - 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, gd
 
             - 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/tests/DependencyInjection/SonataMediaExtensionTest.php b/tests/DependencyInjection/SonataMediaExtensionTest.php
@@ -41,6 +41,7 @@
 use Sonata\MediaBundle\Twig\MediaRuntime;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Extension\PrependExtensionInterface;
+use Symfony\Component\DependencyInjection\Reference;
 
 class SonataMediaExtensionTest extends AbstractExtensionTestCase
 {
@@ -486,7 +487,13 @@ public function testFallbackCDN(): void
             ],
         ]);
 
-        $this->assertContainerBuilderHasServiceDefinitionWithArgument('sonata.media.cdn.fallback', 0, 'sonata.media.cdn.cloudfront');
+        $this->assertContainerBuilderHasServiceDefinitionWithArgument(
+            'sonata.media.cdn.fallback',
+            0,
+            new Reference(
+                'sonata.media.cdn.cloudfront'
+            )
+        );
     }
 
     public function testReplicateFilesystem(): void
@@ -500,8 +507,16 @@ public function testReplicateFilesystem(): void
             ],
         ]);
 
-        $this->assertContainerBuilderHasServiceDefinitionWithArgument('sonata.media.adapter.filesystem.replicate', 0, 'sonata.media.adapter.filesystem.s3');
-        $this->assertContainerBuilderHasServiceDefinitionWithArgument('sonata.media.adapter.filesystem.replicate', 1, 'sonata.media.adapter.filesystem.local');
+        $this->assertContainerBuilderHasServiceDefinitionWithArgument(
+            'sonata.media.adapter.filesystem.replicate',
+            0,
+            new Reference('sonata.media.adapter.filesystem.s3')
+        );
+        $this->assertContainerBuilderHasServiceDefinitionWithArgument(
+            'sonata.media.adapter.filesystem.replicate',
+            1,
+            new Reference('sonata.media.adapter.filesystem.local')
+        );
     }
 
     /**