Sylius 1.12 and SF6 compatibility

.github/workflows/recipe.yaml

@@ -17,13 +17,17 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: ['7.4' ,'8.0']
-        sylius: ["~1.9.0", "~1.10.0", "~1.11.0"]
+        php: ['7.4' ,'8.0', '8.1']
+        sylius: ["~1.9.0", "~1.10.0", "~1.11.0", "~1.12.0"]
         exclude:
+          - php: 8.1
+            sylius: "~1.9.0"
           - php: 8.0
             sylius: "~1.9.0"
           - php: 7.4
             sylius: "~1.11.0"
+          - php: 7.4
+            sylius: "~1.12.0"
 
     steps:
       - name: Setup PHP

.github/workflows/security.yaml

@@ -15,7 +15,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: ['7.4', '8.0']
+        php: ['7.4', '8.0', '8.1']
 
     steps:
       - uses: actions/checkout@v2

.github/workflows/tests.yaml

@@ -14,7 +14,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: ['8.0']
+        php: ['8.0', '8.1']
 
     env:
       SYMFONY_ARGS: --no-tls

.php-version.dist

@@ -1 +1 @@
-8.0
+8.1

Makefile

@@ -1,7 +1,7 @@
 .DEFAULT_GOAL := help
 SHELL=/bin/bash
 APP_DIR=tests/Application
-SYLIUS_VERSION=1.11.0
+SYLIUS_VERSION=1.12.0
 SYMFONY=cd ${APP_DIR} && symfony
 COMPOSER=symfony composer
 CONSOLE=${SYMFONY} console
@@ -149,7 +149,7 @@ test.twig: ## Validate Twig templates
 ### SYLIUS
 ### ¯¯¯¯¯¯
 
-sylius: dependencies sylius.database sylius.fixtures sylius.assets ## Install Sylius
+sylius: dependencies sylius.database sylius.fixtures sylius.assets messenger.setup ## Install Sylius
 .PHONY: sylius
 
 sylius.database: ## Setup the database
@@ -165,6 +165,9 @@ sylius.assets: ## Install all assets with symlinks
 	${CONSOLE} sylius:install:assets
 	${CONSOLE} sylius:theme:assets:install --symlink
 
+messenger.setup: ## Setup Messenger transports
+	${CONSOLE} messenger:setup-transports
+
 ###
 ### PLATFORM
 ### ¯¯¯¯¯¯¯¯

composer.json

@@ -11,8 +11,8 @@
         "jane-php/automapper-bundle": "^7.1",
         "jolicode/elastically": "^1.4.0",
         "monsieurbiz/sylius-settings-plugin": "^1.0",
-        "sylius/sylius": ">=1.9 <1.12",
-        "symfony/messenger": "^4.4 || ^5.2"
+        "sylius/sylius": ">=1.9 <1.13",
+        "symfony/messenger": "^4.4 || ^5.2 || ^6.0"
     },
     "require-dev": {
         "behat/behat": "^3.6.1",
@@ -34,19 +34,19 @@
         "mikey179/vfsstream": "^1.6",
         "mockery/mockery": "^1.4",
         "pamil/prophecy-common": "^0.1",
-        "phpspec/phpspec": "^6.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",
+        "symfony/browser-kit": "^4.4 || ^5.2 || ^6.0",
+        "symfony/debug-bundle": "^4.4 || ^5.2 || ^6.0",
+        "symfony/dotenv": "^4.4 || ^5.2 || ^6.0",
+        "symfony/flex": "^1.7 || ^2.2.2",
+        "symfony/web-profiler-bundle": "^4.4 || ^5.2 || ^6.0",
         "phpmd/phpmd": "@stable"
     },
     "prefer-stable": true,
@@ -61,7 +61,7 @@
             "cache:clear": "symfony-cmd",
             "assets:install %PUBLIC_DIR%": "symfony-cmd"
         },
-        "phpcs": "php-cs-fixer fix --using-cache=no",
+        "phpcs": "PHP_CS_FIXER_IGNORE_ENV=1 php-cs-fixer fix --using-cache=no",
         "jane-generate": "jane generate --config-file=src/Resources/config/jane/jane-configuration.php",
         "phpstan": "phpstan analyse -c phpstan.neon src/",
         "phpmd": "phpmd --exclude Migrations/* src/ ansi phpmd.xml",

src/DependencyInjection/MonsieurBizSyliusSearchExtension.php

@@ -44,7 +44,7 @@ public function load(array $configs, ContainerBuilder $container): void
     /**
      * @inheritdoc
      */
-    public function getAlias()
+    public function getAlias(): string
     {
         return str_replace(['monsieur_biz'], ['monsieurbiz'], parent::getAlias());
     }

src/Resources/config/routing/shop.yaml

@@ -2,27 +2,27 @@ monsieurbiz_search_search:
   path: /search/{query}
   methods: [GET]
   defaults:
-    _controller: MonsieurBiz\SyliusSearchPlugin\Controller\SearchController:searchAction
+    _controller: MonsieurBiz\SyliusSearchPlugin\Controller\SearchController::searchAction
   requirements:
     query: .+
 
 monsieurbiz_search_post:
   path: /search
   methods: [POST]
   defaults:
-    _controller: MonsieurBiz\SyliusSearchPlugin\Controller\SearchController:postAction
+    _controller: MonsieurBiz\SyliusSearchPlugin\Controller\SearchController::postAction
 
 monsieurbiz_search_instant:
   path: /instant
   methods: [POST]
   defaults:
-    _controller: MonsieurBiz\SyliusSearchPlugin\Controller\SearchController:instantAction
+    _controller: MonsieurBiz\SyliusSearchPlugin\Controller\SearchController::instantAction
 
 monsieurbiz_sylius_search_taxon:
   path: /taxons/{slug}
   methods: [GET]
   defaults:
-    _controller: MonsieurBiz\SyliusSearchPlugin\Controller\SearchController:taxonAction
+    _controller: MonsieurBiz\SyliusSearchPlugin\Controller\SearchController::taxonAction
     _sylius:
       taxon: "expr:notFoundOnNull(service('sylius.repository.taxon').findOneBySlug($slug, service('sylius.context.locale').getLocaleCode()))"
   requirements:

src/Resources/views/Search/_filters.html.twig

@@ -16,7 +16,7 @@
             {% endfor %}
 
             {# Don't loose current sorting #}
-            {% set sorting = app.request.query.get('sorting') %}
+            {% set sorting = app.request.query.all()['sorting']|default() %}
             {% if sorting is not empty %}
                 {% for sort, order in sorting %}
                     <input type="hidden" name="sorting[{{ sort }}]" value="{{ order }}" />

src/Resources/views/Search/_pagination.html.twig

@@ -6,7 +6,7 @@
             {{ 'sylius.ui.show'|trans }} {{ result.paginator.maxPerPage }}
             <i class="dropdown icon"></i>
             <div class="menu">
-                {% for limit in paginationLimits if limit != result.paginator.maxPerPage %}
+                {% for limit in paginationLimits|filter(limit => limit != result.paginator.maxPerPage) %}
                     {% set path = path(app.request.attributes.get('_route'), app.request.attributes.get('_route_params')|merge(app.request.query.all)|merge({'limit': limit})) %}
                     <a class="item" href="{{ path }}">{{ limit }}</a>
                 {% endfor %}

src/Resources/views/Search/_sorting.html.twig

@@ -2,7 +2,7 @@
     {% set route = app.request.attributes.get('_route') %}
     {% set route_parameters = app.request.attributes.get('_route_params')|merge(app.request.query.all) %}
 
-    {% set criteria = app.request.query.get('criteria', {}) %}
+    {% set criteria = app.request.query.all()['criteria']|default({}) %}
 
     {% set default_path = path(route, route_parameters|merge({'sorting': null, 'criteria': criteria})) %}
     {% set from_a_to_z_path = path(route, route_parameters|merge({'sorting': {'name': 'asc'}, 'criteria': criteria})) %}
@@ -12,19 +12,20 @@
     {% set cheapest_first_path = path(route, route_parameters|merge({'sorting': {'price': 'asc'}, 'criteria': criteria})) %}
     {% set most_expensive_first_path = path(route, route_parameters|merge({'sorting': {'price': 'desc'}, 'criteria': criteria})) %}
 
-    {% if app.request.query.get('sorting') is empty %}
+    {% set sorting = app.request.query.all()['sorting']|default() %}
+    {% if sorting is empty %}
         {% set current_sorting_label = 'sylius.ui.by_position'|trans|lower %}
-    {% elseif app.request.query.get('sorting').name is defined and app.request.query.get('sorting').name == 'asc'%}
+    {% elseif sorting.name is defined and sorting.name == 'asc'%}
         {% set current_sorting_label = 'sylius.ui.from_a_to_z'|trans|lower %}
-    {% elseif app.request.query.get('sorting').name is defined and app.request.query.get('sorting').name == 'desc'%}
+    {% elseif sorting.name is defined and sorting.name == 'desc'%}
         {% set current_sorting_label = 'sylius.ui.from_z_to_a'|trans|lower %}
-    {% elseif app.request.query.get('sorting').created_at is defined and app.request.query.get('sorting').created_at == 'desc'%}
+    {% elseif sorting.created_at is defined and sorting.created_at == 'desc'%}
         {% set current_sorting_label = 'sylius.ui.newest_first'|trans|lower %}
-    {% elseif app.request.query.get('sorting').created_at is defined and app.request.query.get('sorting').created_at == 'asc'%}
+    {% elseif sorting.created_at is defined and sorting.created_at == 'asc'%}
         {% set current_sorting_label = 'sylius.ui.oldest_first'|trans|lower %}
-    {% elseif app.request.query.get('sorting').price is defined and app.request.query.get('sorting').price == 'asc'%}
+    {% elseif sorting.price is defined and sorting.price == 'asc'%}
         {% set current_sorting_label = 'sylius.ui.cheapest_first'|trans|lower %}
-    {% elseif app.request.query.get('sorting').price is defined and app.request.query.get('sorting').price == 'desc' %}
+    {% elseif sorting.price is defined and sorting.price == 'desc' %}
         {% set current_sorting_label = 'sylius.ui.most_expensive_first'|trans|lower %}
     {% else %}
         {% set current_sorting_label = 'sylius.ui.by_position'|trans|lower %}