Merge 5.x into 6.x

Author: SonataCI

.github/workflows/lint.yaml

@@ -29,7 +29,7 @@ jobs:
             - name: Install PHP with extensions
               uses: shivammathur/setup-php@v2
               with:
-                  php-version: '8.3'
+                  php-version: '8.4'
                   coverage: none
                   tools: composer:v2
 
@@ -53,7 +53,7 @@ jobs:
             - name: Install PHP with extensions
               uses: shivammathur/setup-php@v2
               with:
-                  php-version: '8.3'
+                  php-version: '8.4'
                   coverage: none
                   tools: composer:v2, composer-normalize:2
               env:

.github/workflows/qa.yaml

@@ -29,7 +29,7 @@ jobs:
             - name: Install PHP with extensions
               uses: shivammathur/setup-php@v2
               with:
-                  php-version: '8.3'
+                  php-version: '8.4'
                   coverage: none
                   tools: composer:v2
 
@@ -53,7 +53,7 @@ jobs:
             - name: Install PHP with extensions
               uses: shivammathur/setup-php@v2
               with:
-                  php-version: '8.3'
+                  php-version: '8.4'
                   coverage: none
                   tools: composer:v2
 
@@ -63,7 +63,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.3
+              run: vendor/bin/psalm --no-progress --show-info=false --stats --output-format=github --threads=$(nproc) --shepherd --php-version=8.4
 
     rector:
         name: Rector
@@ -77,7 +77,7 @@ jobs:
             - name: Install PHP with extensions
               uses: shivammathur/setup-php@v2
               with:
-                  php-version: '8.3'
+                  php-version: '8.4'
                   coverage: none
                   tools: composer:v2
 

.github/workflows/symfony-lint.yaml

@@ -29,7 +29,7 @@ jobs:
             - name: Install PHP with extensions
               uses: shivammathur/setup-php@v2
               with:
-                  php-version: '8.3'
+                  php-version: '8.4'
                   coverage: none
                   tools: composer:v2
 
@@ -53,7 +53,7 @@ jobs:
             - name: Install PHP with extensions
               uses: shivammathur/setup-php@v2
               with:
-                  php-version: '8.3'
+                  php-version: '8.4'
                   coverage: none
                   tools: composer:v2
 
@@ -77,7 +77,7 @@ jobs:
             - name: Install PHP with extensions
               uses: shivammathur/setup-php@v2
               with:
-                  php-version: '8.3'
+                  php-version: '8.4'
                   coverage: none
                   tools: composer:v2
 
@@ -101,7 +101,7 @@ jobs:
             - name: Install PHP with extensions
               uses: shivammathur/setup-php@v2
               with:
-                  php-version: '8.3'
+                  php-version: '8.4'
                   coverage: none
                   tools: composer:v2
 

.github/workflows/test.yaml

@@ -33,6 +33,7 @@ jobs:
                     - '8.1'
                     - '8.2'
                     - '8.3'
+                    - '8.4'
                 dependencies: [highest]
                 allowed-to-fail: [false]
                 symfony-require: ['']
@@ -42,17 +43,17 @@ jobs:
                       dependencies: lowest
                       allowed-to-fail: false
                       variant: normal
-                    - php-version: '8.3'
+                    - php-version: '8.4'
                       dependencies: highest
                       allowed-to-fail: false
                       symfony-require: 6.4.*
                       variant: symfony/symfony:"6.4.*"
-                    - php-version: '8.3'
+                    - php-version: '8.4'
                       dependencies: highest
                       allowed-to-fail: false
                       symfony-require: 7.1.*
                       variant: symfony/symfony:"7.1.*"
-                    - php-version: '8.3'
+                    - php-version: '8.4'
                       dependencies: highest
                       allowed-to-fail: false
                       symfony-require: 7.2.*

CHANGELOG.md

@@ -2,6 +2,10 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [5.2.0](https://github.com/sonata-project/SonataBlockBundle/compare/5.1.2...5.2.0) - 2025-05-16
+### Deprecated
+- [[#1232](https://github.com/sonata-project/SonataBlockBundle/pull/1232)] Extending BlockHelper ([@VincentLanglet](https://github.com/VincentLanglet))
+
 ## [5.1.2](https://github.com/sonata-project/SonataBlockBundle/compare/5.1.1...5.1.2) - 2025-02-05
 ### Fixed
 - [[#1218](https://github.com/sonata-project/SonataBlockBundle/pull/1218)] Fix: form validations are by passed when an Exception is thrown ([@sad270](https://github.com/sad270))

Makefile

@@ -44,7 +44,7 @@ lint-xliff:
 .PHONY: lint-xliff
 
 lint-php:
-	vendor/bin/php-cs-fixer fix --ansi --verbose --diff --dry-run
+	PHP_CS_FIXER_IGNORE_ENV=1 vendor/bin/php-cs-fixer fix --ansi --verbose --diff --dry-run
 .PHONY: lint-php
 
 lint-symfony: lint-symfony-container lint-symfony-twig lint-symfony-xliff lint-symfony-yaml
@@ -70,7 +70,7 @@ cs-fix: cs-fix-php cs-fix-xml cs-fix-xliff cs-fix-composer
 .PHONY: cs-fix
 
 cs-fix-php:
-	vendor/bin/php-cs-fixer fix --verbose
+	PHP_CS_FIXER_IGNORE_ENV=1 vendor/bin/php-cs-fixer fix --verbose
 .PHONY: cs-fix-php
 
 cs-fix-xml:
@@ -117,7 +117,7 @@ phpstan:
 .PHONY: phpstan
 
 psalm:
-	vendor/bin/psalm --php-version=8.3
+	vendor/bin/psalm --php-version=8.4
 .PHONY: psalm
 
 rector:

docs/reference/testing.rst

@@ -32,9 +32,9 @@ Given the following block service::
 
 You can write unit tests for block services with the following code::
 
-    use Sonata\BlockBundle\Test\AbstractBlockServiceTestCase;
+    use Sonata\BlockBundle\Test\BlockServiceTestCase;
 
-    class CustomBlockServiceTest extends AbstractBlockServiceTestCase
+    class CustomBlockServiceTest extends BlockServiceTestCase
     {
         public function testDefaultSettings(): void
         {
@@ -47,17 +47,4 @@ You can write unit tests for block services with the following code::
                 'template' => false,
             ], $blockContext);
         }
-
-        public function testExecute(): void
-        {
-            $blockService = new CustomBlockService('foo', $this->twig);
-            $blockContext = $this->getBlockContext($blockService);
-
-            $blockService->execute($blockContext);
-
-            $this->assertSame($blockContext, $this->templating->parameters['context']);
-            $this->assertInternalType('array', $this->templating->parameters['settings']);
-            $this->assertInstanceOf('Sonata\BlockBundle\Model\BlockInterface', $this->templating->parameters['block']);
-            $this->assertSame('bar', $this->templating->parameters['foo']);
-        }
     }