From b19c78b44b6a2926fa5098fae649607f058c9415 Mon Sep 17 00:00:00 2001
From: Maxime Huran <m.huran@monsieurbiz.com>
Date: Wed, 3 Jul 2024 16:42:08 +0200
Subject: [PATCH 1/2] Add Sylius 1.13 compatibility

---
 .github/workflows/recipe.yaml                 | 43 ++++++------
 .github/workflows/security.yaml               | 21 +++---
 .github/workflows/tests.yaml                  | 28 ++++----
 .php-cs-fixer.dist.php                        | 29 ++++----
 .php-version.dist                             |  2 +-
 Makefile                                      | 11 ++--
 README.md                                     | 21 +++++-
 composer.json                                 | 66 +++++--------------
 phpstan.neon                                  | 13 +---
 .../MonsieurBizSyliusCmsPageExtension.php     |  1 -
 src/Entity/Page.php                           |  2 -
 .../UniqueSlugByChannelValidator.php          | 10 +--
 12 files changed, 115 insertions(+), 132 deletions(-)

diff --git a/.github/workflows/recipe.yaml b/.github/workflows/recipe.yaml
index c4b117c..29710f5 100644
--- a/.github/workflows/recipe.yaml
+++ b/.github/workflows/recipe.yaml
@@ -9,22 +9,20 @@ jobs:
 
   recipe:
 
-    name: Flex recipe (PHP ${{ matrix.php }}, Sylius ${{ matrix.sylius }})
-
     runs-on: ubuntu-latest
 
     strategy:
       fail-fast: false
       matrix:
         php: ['8.0', '8.1', '8.2']
-        sylius: ['~1.11.0', '~1.12.0']
-        include:
-          - php: '8.1'
-            sylius: '~1.12.0'
-            sylius_paypal: '~1.5.0'
+        sylius: ["~1.11.0", "~1.12.0", "~1.13.0"]
+        exclude:
           - php: '8.2'
+            sylius: '~1.11.0'
+          - php: '8.0'
             sylius: '~1.12.0'
-            sylius_paypal: '~1.5.0'
+          - php: '8.0'
+            sylius: '~1.13.0'
 
     steps:
       - name: Setup PHP
@@ -32,24 +30,33 @@ jobs:
         with:
           php-version: ${{ matrix.php }}
           extensions: gd, intl, json
+          ini-values: date.timezone=UTC
+          tools: symfony-cli
 
       - name: Set project php-version
         run: |
-          echo "${{ matrix.php }}" > .php-version
+          echo ${{ matrix.php }} > .php-version
 
       - uses: actions/checkout@v3
         with:
           path: plugin
 
-      - run: mkdir -p /home/runner/{.composer/cache,.config/composer}
+      - name: Determine composer cache directory
+        id: composer-cache-directory
+        working-directory: plugin
+        run: echo "directory=$(composer config cache-dir)" >> $GITHUB_OUTPUT
 
-      - uses: actions/cache@v3
+      - name: Cache dependencies installed with composer
+        uses: actions/cache@v3
         id: cache-composer
         with:
-          path: /home/runner/.composer/cache
-          key: composer2-php:${{ matrix.php }}-sylius:${{ matrix.sylius }}-${{ github.sha }}
+          path: ${{ steps.composer-cache-directory.outputs.directory }}
+          key: composer2-php:${{ matrix.php }}-sylius:${{ matrix.sylius }}-${{ hashFiles('**/composer.json') }}
           restore-keys: composer2-php:${{ matrix.php }}-sylius:${{ matrix.sylius }}-
 
+      - name: Ensure that composer cache directory exists
+        run: mkdir -p ${{ steps.composer-cache-directory.outputs.directory }}
+
       - name: Composer Github Auth
         run: composer config -g github-oauth.github.com ${{ github.token }}
 
@@ -63,13 +70,6 @@ jobs:
         run: |
             composer require --no-install --no-scripts --no-progress sylius/sylius="${{ matrix.sylius }}"
 
-      # Fix Paypal 1.5 on Sylius 1.12 and PHP 8.1
-      - name: Make sure to install the required version of Sylius Paypal Plugin
-        if: ${{ matrix.sylius_paypal }}
-        working-directory: ./sylius
-        run: |
-            composer require --no-install --no-scripts --no-progress sylius/paypal-plugin="${{ matrix.sylius_paypal }}" # @see https://github.com/Sylius/PayPalPlugin/issues/295
-
       - name: Setup some requirements
         working-directory: ./sylius
         run: |
@@ -79,8 +79,9 @@ jobs:
             composer config --no-plugins --unset platform.php
             composer config --no-plugins extra.symfony.docker false
             composer config --no-plugins --json extra.symfony.endpoint '["https://api.github.com/repos/monsieurbiz/symfony-recipes/contents/index.json?ref=flex/master","flex://defaults"]'
+            composer config repositories.plugin '{"type": "path", "url": "../plugin/"}'
 
       - name: Require plugin & install all dependencies
         working-directory: ./sylius
         run: |
-            composer require monsieurbiz/sylius-cms-page-plugin="*@dev"
+          composer require monsieurbiz/sylius-cms-page-plugin="*@dev"
diff --git a/.github/workflows/security.yaml b/.github/workflows/security.yaml
index 67a89bb..c100cfa 100644
--- a/.github/workflows/security.yaml
+++ b/.github/workflows/security.yaml
@@ -8,14 +8,12 @@ jobs:
 
   security:
 
-    name: Security check (PHP ${{ matrix.php }})
-
     runs-on: ubuntu-latest
 
     strategy:
       fail-fast: false
       matrix:
-        php: ['8.0', '8.1', '8.2']
+        php: ['8.1', '8.2']
 
     steps:
       - uses: actions/checkout@v3
@@ -30,21 +28,26 @@ jobs:
         run: |
           echo "${{ matrix.php }}" > .php-version
 
-      - uses: actions/cache@v3
+      - name: Determine composer cache directory
+        id: composer-cache-directory
+        run: echo "directory=$(composer config cache-dir)" >> $GITHUB_OUTPUT
+
+      - name: Cache dependencies installed with composer
+        uses: actions/cache@v3
         id: cache-composer
         with:
-          path: /home/runner/.composer/cache
+          path: ${{ steps.composer-cache-directory.outputs.directory }}
           key: composer2-php:${{ matrix.php }}-${{ github.sha }}
           restore-keys: composer2-php:${{ matrix.php }}-
 
-      - run: mkdir -p /home/runner/{.composer/cache,.config/composer}
+      - name: Ensure that composer cache directory exists
+        run: mkdir -p ${{ steps.composer-cache-directory.outputs.directory }}
 
       - name: Composer Github Auth
         run: composer config -g github-oauth.github.com ${{ github.token }}
 
-      - uses: actions/checkout@v3
-
       - name: Install PHP dependencies
         run: composer update --prefer-dist
 
-      - uses: symfonycorp/security-checker-action@v3
+      - uses: symfonycorp/security-checker-action@v4
+
diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
index 04d68ad..877ce6a 100644
--- a/.github/workflows/tests.yaml
+++ b/.github/workflows/tests.yaml
@@ -9,14 +9,12 @@ jobs:
 
   php:
 
-    name: Quality tests (PHP ${{ matrix.php }})
-
     runs-on: ubuntu-latest
 
     strategy:
       fail-fast: false
       matrix:
-        php: ['8.0', '8.1', '8.2']
+        php: ['8.1', '8.2']
 
     env:
       SYMFONY_ARGS: --no-tls
@@ -24,34 +22,36 @@ jobs:
       DOCKER_INTERACTIVE_ARGS: -t
 
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
+      - uses: actions/checkout@v2
+      - uses: actions/setup-node@v2
         with:
-          node-version: '16'
-
+          node-version: '14'
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.php }}
           extensions: gd, intl, json
+          ini-values: date.timezone=UTC
+          tools: symfony-cli
 
       - name: Set project php-version
         run: |
           echo "${{ matrix.php }}" > .php-version
 
-      - name: Install symfony CLI
-        run: |
-          curl -1sLf 'https://dl.cloudsmith.io/public/symfony/stable/setup.deb.sh' | sudo -E bash
-          sudo apt install symfony-cli
+      - name: Determine composer cache directory
+        id: composer-cache-directory
+        run: echo "directory=$(composer config cache-dir)" >> $GITHUB_OUTPUT
 
-      - uses: actions/cache@v3
+      - name: Cache dependencies installed with composer
+        uses: actions/cache@v3
         id: cache-composer
         with:
-          path: /home/runner/.composer/cache
+          path: ${{ steps.composer-cache-directory.outputs.directory }}
           key: composer2-php:${{ matrix.php }}-${{ github.sha }}
           restore-keys: composer2-php:${{ matrix.php }}-
 
-      - run: mkdir -p /home/runner/{.composer/cache,.config/composer}
+      - name: Ensure that composer cache directory exists
+        run: mkdir -p ${{ steps.composer-cache-directory.outputs.directory }}
 
       - name: Composer Github Auth
         run: composer config -g github-oauth.github.com ${{ github.token }}
diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
index 6c98da0..828b32e 100644
--- a/.php-cs-fixer.dist.php
+++ b/.php-cs-fixer.dist.php
@@ -49,10 +49,8 @@
         'binary_operator_spaces' => true,
         'blank_line_after_opening_tag' => true,
         'blank_line_after_namespace' => true,
+        'blank_lines_before_namespace' => true,
         'blank_line_before_statement' => true,
-        'braces' => [
-            'allow_single_line_closure' => true,
-        ],
         'cast_spaces' => true,
         'class_attributes_separation' => true,
         'class_definition' => [
@@ -62,7 +60,7 @@
         'combine_consecutive_issets' => true,
         'combine_consecutive_unsets' => true,
         'comment_to_phpdoc' => true,
-        'compact_nullable_typehint' => true,
+        'compact_nullable_type_declaration' => true,
         'concat_space' => [
             'spacing' => 'one',
         ],
@@ -88,8 +86,12 @@
         'fully_qualified_strict_types' => true,
         'function_declaration' => true,
         'function_to_constant' => true,
-        'function_typehint_space' => true,
         'general_phpdoc_tag_rename' => true,
+        'global_namespace_import' => [
+            'import_classes' => true,
+            'import_constants' => false,
+            'import_functions' => false,
+        ],
         'header_comment' => [
             'header' => $header,
             'location' => 'after_open',
@@ -110,6 +112,7 @@
         'lowercase_static_reference' => true,
         'magic_constant_casing' => true,
         'method_argument_space' => true,
+        'modernize_strpos' => false,
         'modernize_types_casting' => true,
         'multiline_comment_opening_closing' => true,
         'multiline_whitespace_before_semicolons' => [
@@ -117,7 +120,7 @@
         ],
         'native_constant_invocation' => true,
         'native_function_casing' => true,
-        'new_with_braces' => true,
+        'new_with_parentheses' => true,
         'no_alias_functions' => true,
         'no_alternative_syntax' => true,
         'no_blank_lines_after_class_opening' => true,
@@ -156,27 +159,27 @@
         'no_short_bool_cast' => true,
         'no_spaces_after_function_name' => true,
         'no_spaces_around_offset' => true,
-        'no_spaces_inside_parenthesis' => true,
+        'spaces_inside_parentheses' => true,
         'no_superfluous_elseif' => true,
         'no_superfluous_phpdoc_tags' => [
             'allow_mixed' => true,
         ],
         'no_unset_cast' => true,
         'no_unneeded_control_parentheses' => true,
-        'no_unneeded_curly_braces' => true,
+        'no_unneeded_braces' => true,
         'no_unneeded_final_method' => true,
         'no_unset_on_property' => true,
         'no_unused_imports' => true,
         'no_useless_else' => true,
         'no_useless_return' => true,
-        'no_trailing_comma_in_list_call' => true,
-        'no_trailing_comma_in_singleline_array' => true,
+        'no_trailing_comma_in_singleline' => true,
         'no_trailing_whitespace' => true,
         'no_trailing_whitespace_in_comment' => true,
         'no_whitespace_before_comma_in_array' => true,
         'no_whitespace_in_blank_line' => true,
         'non_printable_character' => true,
         'normalize_index_brace' => true,
+        'nullable_type_declaration_for_default_null_value' => false,
         'object_operator_without_whitespace' => true,
         'ordered_imports' => [
             'imports_order' => [
@@ -211,7 +214,9 @@
         'phpdoc_order' => true,
         'phpdoc_return_self_reference' => true,
         'phpdoc_scalar' => true,
-        'phpdoc_separation' => true,
+        'phpdoc_separation' => ['groups' => [
+            ['ORM\\*'], ['Assert\\*'],
+        ]],
         'phpdoc_single_line_var_spacing' => true,
         'phpdoc_tag_type' => true,
         'phpdoc_to_comment' => false,
@@ -231,7 +236,6 @@
         'self_accessor' => true,
         'short_scalar_cast' => true,
         'single_blank_line_at_eof' => true,
-        'single_blank_line_before_namespace' => true,
         'single_class_element_per_statement' => true,
         'single_import_per_statement' => true,
         'single_line_after_imports' => true,
@@ -248,6 +252,7 @@
             'elements' => ['arrays'],
         ],
         'trim_array_spaces' => true,
+        'type_declaration_spaces' => true,
         'unary_operator_spaces' => true,
         'visibility_required' => [
             'elements' => [
diff --git a/.php-version.dist b/.php-version.dist
index b8eb026..2983cad 100644
--- a/.php-version.dist
+++ b/.php-version.dist
@@ -1 +1 @@
-8.1
+8.2
diff --git a/Makefile b/Makefile
index 2c55fb3..bcff5c5 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,7 @@
 .DEFAULT_GOAL := help
 SHELL=/bin/bash
 APP_DIR=tests/Application
-SYLIUS_VERSION=1.12.0
-SYLIUS_PAYPAL_VERSION=1.5.0
+SYLIUS_VERSION=1.13.0
 SYMFONY=cd ${APP_DIR} && symfony
 COMPOSER=symfony composer
 CONSOLE=${SYMFONY} console
@@ -73,8 +72,8 @@ setup_application:
 	(cd ${APP_DIR} && ${COMPOSER} config extra.symfony.allow-contrib true)
 	(cd ${APP_DIR} && ${COMPOSER} config minimum-stability dev)
 	(cd ${APP_DIR} && ${COMPOSER} config --no-plugins allow-plugins true)
+	(cd ${APP_DIR} && ${COMPOSER} config --no-plugins --json extra.symfony.endpoint '["https://api.github.com/repos/monsieurbiz/symfony-recipes/contents/index.json?ref=flex/master","flex://defaults"]')
 	(cd ${APP_DIR} && ${COMPOSER} require --no-install --no-scripts --no-progress sylius/sylius="~${SYLIUS_VERSION}") # Make sure to install the required version of sylius because the sylius-standard has a soft constraint
-	(cd ${APP_DIR} && ${COMPOSER} require --no-install --no-scripts --no-progress sylius/paypal-plugin="~${SYLIUS_PAYPAL_VERSION}") # @see https://github.com/Sylius/PayPalPlugin/issues/295
 	$(MAKE) ${APP_DIR}/.php-version
 	$(MAKE) ${APP_DIR}/php.ini
 	(cd ${APP_DIR} && ${COMPOSER} install --no-interaction)
@@ -86,8 +85,8 @@ setup_application:
 ${APP_DIR}/docker-compose.yaml:
 	rm -f ${APP_DIR}/docker-compose.yml
 	rm -f ${APP_DIR}/docker-compose.yaml
-	rm -f ${APP_DIR}/compose.yml
-	rm -f ${APP_DIR}/compose.override.dist.yml
+	rm -f ${APP_DIR}/compose.yml # Remove Sylius file about Docker
+	rm -f ${APP_DIR}/compose.override.dist.yml # Remove Sylius file about Docker
 	ln -s ../../docker-compose.yaml.dist ${APP_DIR}/docker-compose.yaml
 .PHONY: ${APP_DIR}/docker-compose.yaml
 
@@ -139,7 +138,7 @@ test.container: ## Lint the symfony container
 	${CONSOLE} lint:container
 
 test.yaml: ## Lint the symfony Yaml files
-	${CONSOLE} lint:yaml ../../src/Resources/config
+	${CONSOLE} lint:yaml ../../src/Resources/config --parse-tags
 
 test.schema: ## Validate MySQL Schema
 	${CONSOLE} doctrine:schema:validate
diff --git a/README.md b/README.md
index cdf2b23..d0b6ffb 100644
--- a/README.md
+++ b/README.md
@@ -1,10 +1,11 @@
 [![Banner of Sylius CMS Pages plugin](docs/images/banner.jpg)](https://monsieurbiz.com/agence-web-experte-sylius)
 
-<h1 align="center">CMS Pages</h1>
+<h1 align="center">Sylius CMS Pages</h1>
 
 [![CMS Page Plugin license](https://img.shields.io/github/license/monsieurbiz/SyliusCmsPagePlugin?public)](https://github.com/monsieurbiz/SyliusCmsPagePlugin/blob/master/LICENSE.txt)
-[![Tests Status](https://img.shields.io/github/workflow/status/monsieurbiz/SyliusCmsPagePlugin/Tests?logo=github)](https://github.com/monsieurbiz/SyliusCmsPagePlugin/actions?query=workflow%3ATests)
-[![Security Status](https://img.shields.io/github/workflow/status/monsieurbiz/SyliusCmsPagePlugin/Security?label=security&logo=github)](https://github.com/monsieurbiz/SyliusCmsPagePlugin/actions?query=workflow%3ASecurity)
+[![Tests Status](https://img.shields.io/github/actions/workflow/status/monsieurbiz/SyliusCmsPagePlugin/tests.yaml?branch=master&logo=github)](https://github.com/monsieurbiz/SyliusCmsPagePlugin/actions?query=workflow%3ATests)
+[![Recipe Status](https://img.shields.io/github/actions/workflow/status/monsieurbiz/SyliusCmsPagePlugin/recipe.yaml?branch=master&label=recipes&logo=github)](https://github.com/monsieurbiz/SyliusCmsPagePlugin/actions?query=workflow%3ASecurity)
+[![Security Status](https://img.shields.io/github/actions/workflow/status/monsieurbiz/SyliusCmsPagePlugin/security.yaml?branch=master&label=security&logo=github)](https://github.com/monsieurbiz/SyliusCmsPagePlugin/actions?query=workflow%3ASecurity)
 
 This plugins allows you to add manage CMS pages using the Rich Editor.
 
@@ -12,8 +13,22 @@ If you want to know more about our editor, see the [Rich Editor Repository](http
 
 ![Example of CMS page creation](screenshots/demo.gif)
 
+## Compatibility
+
+| Sylius Version | PHP Version |
+|---|---|
+| 1.11 | 8.0 - 8.1 |
+| 1.12 | 8.1 - 8.2 |
+| 1.13 | 8.1 - 8.2 |
+
 ## Installation
 
+If you want to use our recipes, you can configure your composer.json by running:
+
+```bash
+composer config --no-plugins --json extra.symfony.endpoint '["https://api.github.com/repos/monsieurbiz/symfony-recipes/contents/index.json?ref=flex/master","flex://defaults"]'
+```
+
 ```bash
 composer require monsieurbiz/sylius-cms-page-plugin
 ```
diff --git a/composer.json b/composer.json
index f516d74..8931f39 100644
--- a/composer.json
+++ b/composer.json
@@ -5,46 +5,19 @@
     "description": "This plugins allows you to add manage CMS pages using the Rich Editor",
     "license": "MIT",
     "require": {
-        "php": "~7.4|~8.0",
-        "sylius/sylius": ">=1.8 <1.13",
-        "gedmo/doctrine-extensions": "^2.4.12 || ^3.0",
-        "monsieurbiz/sylius-rich-editor-plugin": "^2.2",
-        "monsieurbiz/sylius-plus-adapter-plugin": "^1.0"
+        "monsieurbiz/sylius-plus-adapter-plugin": "^1.1",
+        "monsieurbiz/sylius-rich-editor-plugin": "^2.8",
+        "php": "^8.0",
+        "sylius/sylius": ">=1.11 <1.14"
     },
     "require-dev": {
-        "behat/behat": "^3.6.1",
-        "behat/mink-selenium2-driver": "^1.4",
-        "dmore/behat-chrome-extension": "^1.3",
-        "dmore/chrome-mink-driver": "^2.7",
-        "doctrine/data-fixtures": "^1.4",
-        "ergebnis/composer-normalize": "^2.5",
-        "friends-of-behat/mink": "^1.8",
-        "friends-of-behat/mink-browserkit-driver": "^1.4",
-        "friends-of-behat/mink-extension": "^2.4",
-        "friends-of-behat/page-object-extension": "^0.3",
-        "friends-of-behat/symfony-extension": "^2.1",
-        "friends-of-behat/variadic-extension": "^1.3",
-        "hwi/oauth-bundle": "^1.1",
-        "lchrusciel/api-test-case": "^5.0",
-        "matthiasnoback/symfony-config-test": "^4.2",
-        "matthiasnoback/symfony-dependency-injection-test": "^4.1",
-        "mikey179/vfsstream": "^1.6",
-        "mockery/mockery": "^1.4",
-        "pamil/prophecy-common": "^0.1",
-        "phpspec/phpspec": "^6.1|^7.2",
-        "phpstan/phpstan": "^0.12.57",
-        "phpstan/phpstan-doctrine": "^0.12.19",
-        "phpstan/phpstan-webmozart-assert": "^0.12.7",
-        "phpunit/phpunit": "^8.5",
-        "psalm/plugin-mockery": "^0.3",
-        "psr/event-dispatcher": "^1.0",
-        "sylius-labs/coding-standard": "^3.1",
-        "symfony/browser-kit": "^4.4",
-        "symfony/debug-bundle": "^4.4",
-        "symfony/dotenv": "^4.4",
-        "symfony/flex": "^1.7",
-        "symfony/web-profiler-bundle": "^4.4",
-        "phpmd/phpmd": "@stable"
+        "friendsofphp/php-cs-fixer": "^3.16",
+        "phpspec/phpspec": "^7.0",
+        "phpstan/phpstan": "^1.8.4",
+        "phpstan/phpstan-doctrine": "^1.3.2",
+        "phpstan/phpstan-webmozart-assert": "^1.1",
+        "phpunit/phpunit": "^10.5",
+        "phpmd/phpmd": "^2.15"
     },
     "prefer-stable": true,
     "autoload": {
@@ -57,30 +30,27 @@
             "cache:clear": "symfony-cmd",
             "assets:install %PUBLIC_DIR%": "symfony-cmd"
         },
-        "phpcs": "PHP_CS_FIXER_IGNORE_ENV=1 php-cs-fixer fix --using-cache=false",
+        "phpcs": "PHP_CS_FIXER_IGNORE_ENV=1 php-cs-fixer fix --using-cache=no",
         "phpstan": "phpstan analyse -c phpstan.neon src/",
         "phpmd": "phpmd --exclude Migrations/* src/ ansi phpmd.xml",
         "phpunit": "phpunit",
         "phpspec": "phpspec run"
     },
     "extra": {
+        "branch-alias": {
+            "dev-master": "1.1-dev"
+        },
         "symfony": {
             "docker": false,
-            "endpoint": [
-                "https://api.github.com/repos/monsieurbiz/symfony-recipes/contents/index.json?ref=flex/master",
-                "flex://defaults"
-            ]
-        },
-        "branch-alias": {
-            "dev-master": "1.0-dev"
+            "endpoint": ["https://api.github.com/repos/monsieurbiz/symfony-recipes/contents/index.json?ref=flex/master", "flex://defaults"]
         }
     },
     "config": {
         "allow-plugins": {
-            "dealerdirect/phpcodesniffer-composer-installer": true,
             "symfony/thanks": true,
-            "ergebnis/composer-normalize": true,
             "symfony/flex": true,
+            "dealerdirect/phpcodesniffer-composer-installer": true,
+            "ergebnis/composer-normalize": true,
             "php-http/discovery": true
         }
     }
diff --git a/phpstan.neon b/phpstan.neon
index 726b9b7..44b4ae4 100644
--- a/phpstan.neon
+++ b/phpstan.neon
@@ -1,21 +1,14 @@
-includes:
-    - vendor/phpstan/phpstan-doctrine/extension.neon
-    - vendor/phpstan/phpstan-webmozart-assert/extension.neon
-
 parameters:
     level: max
     paths:
         - %rootDir%/src/
 
-    checkMissingIterableValueType: false
-
-    excludes_analyse:
+    excludePaths:
         # Makes PHPStan crash
-        - 'src/DependencyInjection/Configuration.php'
         - 'src/DependencyInjection/MonsieurBizSyliusCmsPageExtension.php'
 
         # Test dependencies
         - 'tests/Application/**/*'
 
-        # Menu Provider
-        - 'src/Menu/PageUrlProvider.php'
+    ignoreErrors:
+        - identifier: missingType.iterableValue
diff --git a/src/DependencyInjection/MonsieurBizSyliusCmsPageExtension.php b/src/DependencyInjection/MonsieurBizSyliusCmsPageExtension.php
index c471bea..918e37b 100644
--- a/src/DependencyInjection/MonsieurBizSyliusCmsPageExtension.php
+++ b/src/DependencyInjection/MonsieurBizSyliusCmsPageExtension.php
@@ -25,7 +25,6 @@
 final class MonsieurBizSyliusCmsPageExtension extends Extension implements PrependExtensionInterface
 {
     use PrependDoctrineMigrationsTrait;
-
     use SyliusPlusCompatibilityTrait;
 
     /**
diff --git a/src/Entity/Page.php b/src/Entity/Page.php
index 74544ae..2bde616 100644
--- a/src/Entity/Page.php
+++ b/src/Entity/Page.php
@@ -26,9 +26,7 @@
 class Page implements PageInterface
 {
     use TimestampableTrait;
-
     use ToggleableTrait;
-
     use TranslatableTrait {
         __construct as private initializeTranslationsCollection;
 
diff --git a/src/Validator/Constraints/UniqueSlugByChannelValidator.php b/src/Validator/Constraints/UniqueSlugByChannelValidator.php
index ab14ca2..3adeb9e 100644
--- a/src/Validator/Constraints/UniqueSlugByChannelValidator.php
+++ b/src/Validator/Constraints/UniqueSlugByChannelValidator.php
@@ -44,11 +44,11 @@ public function validate($value, Constraint $constraint): void
         foreach ($value->getTranslations() as $translation) {
             foreach ($value->getChannels() as $channel) {
                 if ($this->pageRepository->existsOneByChannelAndSlug(
-                        $channel,
-                        $translation->getLocale(),
-                        $translation->getSlug(),
-                        $value->getId() ? [$value] : []
-                    )) {
+                    $channel,
+                    $translation->getLocale(),
+                    $translation->getSlug(),
+                    $value->getId() ? [$value] : []
+                )) {
                     $this->context->buildViolation($constraint->message, [
                         '%channel%' => $channel->getCode(),
                         '%locale%' => $translation->getLocale(),

From bad4a91e3286d266ac9778d0e906cf86f35fc40e Mon Sep 17 00:00:00 2001
From: Maxime Huran <m.huran@monsieurbiz.com>
Date: Wed, 3 Jul 2024 16:57:56 +0200
Subject: [PATCH 2/2] Fix PHP Stan

---
 phpstan.neon                                         |  4 ++++
 src/Controller/PageController.php                    |  5 ++++-
 src/DependencyInjection/Configuration.php            | 12 +-----------
 src/Repository/PageRepository.php                    |  3 +++
 .../Constraints/UniqueSlugByChannelValidator.php     |  4 +++-
 5 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/phpstan.neon b/phpstan.neon
index 44b4ae4..d2a414f 100644
--- a/phpstan.neon
+++ b/phpstan.neon
@@ -10,5 +10,9 @@ parameters:
         # Test dependencies
         - 'tests/Application/**/*'
 
+        # Menu Provider
+        - 'src/Menu/PageUrlProvider.php'
+
     ignoreErrors:
+        - identifier: missingType.generics
         - identifier: missingType.iterableValue
diff --git a/src/Controller/PageController.php b/src/Controller/PageController.php
index e77f5cd..ff29346 100644
--- a/src/Controller/PageController.php
+++ b/src/Controller/PageController.php
@@ -32,7 +32,10 @@ public function previewAction(Request $request, SwitchAdminLocaleInterface $swit
         $this->isGrantedOr403($configuration, ResourceActions::SHOW);
         $resource = $this->findOr404($configuration);
 
-        return $this->render($configuration->getRequest()->get('template'), [
+        /** @var string $template */
+        $template = $configuration->getRequest()->get('template');
+
+        return $this->render($template, [
             'configuration' => $configuration,
             'metadata' => $this->metadata,
             'resource' => $resource,
diff --git a/src/DependencyInjection/Configuration.php b/src/DependencyInjection/Configuration.php
index c217d8f..e12fa54 100644
--- a/src/DependencyInjection/Configuration.php
+++ b/src/DependencyInjection/Configuration.php
@@ -23,16 +23,6 @@ final class Configuration implements ConfigurationInterface
      */
     public function getConfigTreeBuilder(): TreeBuilder
     {
-        $treeBuilder = new TreeBuilder('monsieurbiz_sylius_cms_page');
-        if (method_exists($treeBuilder, 'getRootNode')) {
-            $treeBuilder->getRootNode();
-
-            return $treeBuilder;
-        }
-
-        // BC layer for symfony/config 4.1 and older
-        $treeBuilder->root('monsieurbiz_sylius_cms_page');
-
-        return $treeBuilder;
+        return new TreeBuilder('monsieurbiz_sylius_cms_page');
     }
 }
diff --git a/src/Repository/PageRepository.php b/src/Repository/PageRepository.php
index a54c223..473be21 100644
--- a/src/Repository/PageRepository.php
+++ b/src/Repository/PageRepository.php
@@ -40,6 +40,7 @@ public function existsOneByChannelAndSlug(ChannelInterface $channel, ?string $lo
             ;
         }
 
+        /** @phpstan-ignore-next-line */
         $count = (int) $queryBuilder
             ->getQuery()
             ->getSingleScalarResult()
@@ -55,6 +56,7 @@ public function existsOneEnabledByChannelAndSlug(ChannelInterface $channel, ?str
             ->andWhere('p.enabled = true')
         ;
 
+        /** @phpstan-ignore-next-line */
         $count = (int) $queryBuilder
             ->getQuery()
             ->getSingleScalarResult()
@@ -68,6 +70,7 @@ public function existsOneEnabledByChannelAndSlug(ChannelInterface $channel, ?str
      */
     public function findOneEnabledBySlugAndChannelCode(string $slug, string $localeCode, string $channelCode): ?PageInterface
     {
+        /** @phpstan-ignore-next-line */
         return $this->createQueryBuilder('p')
             ->leftJoin('p.translations', 'translation')
             ->innerJoin('p.channels', 'channels')
diff --git a/src/Validator/Constraints/UniqueSlugByChannelValidator.php b/src/Validator/Constraints/UniqueSlugByChannelValidator.php
index 3adeb9e..914483a 100644
--- a/src/Validator/Constraints/UniqueSlugByChannelValidator.php
+++ b/src/Validator/Constraints/UniqueSlugByChannelValidator.php
@@ -14,6 +14,7 @@
 namespace MonsieurBiz\SyliusCmsPagePlugin\Validator\Constraints;
 
 use MonsieurBiz\SyliusCmsPagePlugin\Entity\PageInterface;
+use MonsieurBiz\SyliusCmsPagePlugin\Entity\PageTranslationInterface;
 use MonsieurBiz\SyliusCmsPagePlugin\Repository\PageRepositoryInterface;
 use Symfony\Component\Validator\Constraint;
 use Symfony\Component\Validator\ConstraintValidator;
@@ -41,12 +42,13 @@ public function validate($value, Constraint $constraint): void
         Assert::isInstanceOf($constraint, UniqueSlugByChannel::class);
 
         // Check if the slug is unique for each channel and locale
+        /** @var PageTranslationInterface $translation */
         foreach ($value->getTranslations() as $translation) {
             foreach ($value->getChannels() as $channel) {
                 if ($this->pageRepository->existsOneByChannelAndSlug(
                     $channel,
                     $translation->getLocale(),
-                    $translation->getSlug(),
+                    (string) $translation->getSlug(),
                     $value->getId() ? [$value] : []
                 )) {
                     $this->context->buildViolation($constraint->message, [