Merge 3.x into 4.x

sonata-project · May 23, 2022 · da97793 · da97793
2 parents 7a869e8 + e76f4f5
commit da97793
Show file tree

Hide file tree

Showing 10 changed files with 23 additions and 13 deletions.
diff --git a/.github/workflows/documentation.yaml b/.github/workflows/documentation.yaml
@@ -13,6 +13,9 @@ on:
             - 4.x
     pull_request:
 
+permissions:
+    contents: read
+
 jobs:
     build:
         name: Sphinx build

diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml
@@ -13,6 +13,9 @@ on:
             - 4.x
     pull_request:
 
+permissions:
+    contents: read
+
 jobs:
     php-cs-fixer:
         name: PHP-CS-Fixer

diff --git a/.github/workflows/qa.yaml b/.github/workflows/qa.yaml
@@ -13,6 +13,9 @@ on:
             - 4.x
     pull_request:
 
+permissions:
+    contents: read
+
 jobs:
     phpstan:
         name: PHPStan
@@ -39,6 +42,7 @@ jobs:
 
             - name: PHPStan
               run: vendor/bin/phpstan --no-progress --memory-limit=1G analyse --error-format=github
+
     psalm:
         name: Psalm
 

diff --git a/.github/workflows/symfony-lint.yaml b/.github/workflows/symfony-lint.yaml
@@ -13,6 +13,9 @@ on:
             - 4.x
     pull_request:
 
+permissions:
+    contents: read
+
 jobs:
     container:
         name: Symfony container

diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -13,6 +13,9 @@ on:
             - 4.x
     pull_request:
 
+permissions:
+    contents: read
+
 jobs:
     test:
         name: PHP ${{ matrix.php-version }} + ${{ matrix.dependencies }} + ${{ matrix.variant }}

diff --git a/composer.json b/composer.json
@@ -21,8 +21,8 @@
     "homepage": "https://docs.sonata-project.org/projects/SonataTranslationBundle",
     "require": {
         "php": "^7.4 || ^8.0",
-        "sonata-project/admin-bundle": "^4.0",
-        "sonata-project/block-bundle": "^4.0",
+        "sonata-project/admin-bundle": "^4.8",
+        "sonata-project/block-bundle": "^4.11",
         "symfony/config": "^4.4 || ^5.3 || ^6.0",
         "symfony/dependency-injection": "^4.4 || ^5.3 || ^6.0",
         "symfony/form": "^4.4 || ^5.3 || ^6.0",

diff --git a/src/Block/LocaleSwitcherBlockService.php b/src/Block/LocaleSwitcherBlockService.php
@@ -53,7 +53,7 @@ public function execute(BlockContextInterface $blockContext, ?Response $response
 
         \assert(\is_string($template));
 
-        return $this->renderPrivateResponse($template, [
+        return $this->renderResponse($template, [
             'block_context' => $blockContext,
             'block' => $blockContext->getBlock(),
         ], $response);

diff --git a/tests/App/config/config_v4.yml b/tests/App/config/config_v4.yml
@@ -21,5 +21,6 @@ parameters:
     locale: 'en'
 
 sonata_block:
+    http_cache: false
     blocks:
         sonata_translation.block.locale_switcher: ~
diff --git a/tests/App/config/config_v5.yml b/tests/App/config/config_v5.yml
@@ -22,5 +22,6 @@ parameters:
     locale: 'en'
 
 sonata_block:
+    http_cache: false
     blocks:
         sonata_translation.block.locale_switcher: ~
diff --git a/tests/App/config/services.php b/tests/App/config/services.php
@@ -30,24 +30,16 @@
         ->set(GedmoCategoryAdmin::class)
             ->tag('sonata.admin', [
                 'manager_type' => 'orm',
+                'model_class' => GedmoCategory::class,
                 'label' => 'Gedmo Category',
             ])
-            ->args([
-                '',
-                GedmoCategory::class,
-                null,
-            ])
 
         ->set(KnpCategoryAdmin::class)
             ->tag('sonata.admin', [
                 'manager_type' => 'orm',
+                'model_class' => KnpCategory::class,
                 'label' => 'Knp Category',
             ])
-            ->args([
-                '',
-                KnpCategory::class,
-                null,
-            ])
 
         ->set('app.gedmo.translation_listener', TranslatableListener::class)
             ->call('setAnnotationReader', [new Reference('annotation_reader')])