From eb19df2fa09277d96e38fd8b2b37df15be5f6661 Mon Sep 17 00:00:00 2001 From: Maxime Leclercq Date: Wed, 21 Dec 2022 18:02:24 +0100 Subject: [PATCH 1/9] feat: allow sylius 1.12 and update test application to install 1.12 --- .github/workflows/recipe.yaml | 4 +++- Makefile | 2 +- composer.json | 14 +++++++------- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/.github/workflows/recipe.yaml b/.github/workflows/recipe.yaml index e57b7884..1b64c84a 100644 --- a/.github/workflows/recipe.yaml +++ b/.github/workflows/recipe.yaml @@ -18,12 +18,14 @@ jobs: fail-fast: false matrix: php: ['7.4' ,'8.0'] - sylius: ["~1.9.0", "~1.10.0", "~1.11.0"] + sylius: ["~1.9.0", "~1.10.0", "~1.11.0", "~1.12.0"] exclude: - 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 diff --git a/Makefile b/Makefile index 68ca7c53..f8398545 100644 --- a/Makefile +++ b/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 diff --git a/composer.json b/composer.json index dd5db6af..068ec948 100644 --- a/composer.json +++ b/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", @@ -42,11 +42,11 @@ "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, From 416a13fd38e965dd685c15ca546d5b2401041c52 Mon Sep 17 00:00:00 2001 From: Maxime Leclercq Date: Fri, 23 Jun 2023 17:05:56 +0200 Subject: [PATCH 2/9] fix: add return type to make compatibilty with sf6 --- src/DependencyInjection/MonsieurBizSyliusSearchExtension.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/DependencyInjection/MonsieurBizSyliusSearchExtension.php b/src/DependencyInjection/MonsieurBizSyliusSearchExtension.php index cc7eaa34..88036fe2 100644 --- a/src/DependencyInjection/MonsieurBizSyliusSearchExtension.php +++ b/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()); } From 34a65268f230561ff56198e4ac28c337fc5df638 Mon Sep 17 00:00:00 2001 From: Maxime Leclercq Date: Fri, 23 Jun 2023 17:06:47 +0200 Subject: [PATCH 3/9] fix: corrects format of controller definitions in routes for sf6 --- src/Resources/config/routing/shop.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Resources/config/routing/shop.yaml b/src/Resources/config/routing/shop.yaml index 10b90786..89cc7123 100644 --- a/src/Resources/config/routing/shop.yaml +++ b/src/Resources/config/routing/shop.yaml @@ -2,7 +2,7 @@ monsieurbiz_search_search: path: /search/{query} methods: [GET] defaults: - _controller: MonsieurBiz\SyliusSearchPlugin\Controller\SearchController:searchAction + _controller: MonsieurBiz\SyliusSearchPlugin\Controller\SearchController::searchAction requirements: query: .+ @@ -10,19 +10,19 @@ 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: From 9f9d45ce54f1016cb1e7c8e68179f759613d49ed Mon Sep 17 00:00:00 2001 From: Maxime Leclercq Date: Fri, 23 Jun 2023 17:07:53 +0200 Subject: [PATCH 4/9] fix: conditional for support is dropped no in sf6 --- src/Resources/views/Search/_pagination.html.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Resources/views/Search/_pagination.html.twig b/src/Resources/views/Search/_pagination.html.twig index 21f7d365..290f64e3 100644 --- a/src/Resources/views/Search/_pagination.html.twig +++ b/src/Resources/views/Search/_pagination.html.twig @@ -6,7 +6,7 @@ {{ 'sylius.ui.show'|trans }} {{ result.paginator.maxPerPage }}
- {% 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})) %} {{ limit }} {% endfor %} From 9a905cd4f59ca05c29ab42ae96943b4d1c837d1f Mon Sep 17 00:00:00 2001 From: Maxime Leclercq Date: Fri, 23 Jun 2023 17:08:40 +0200 Subject: [PATCH 5/9] fix: InputBag::get method return only scalar type, not array --- src/Resources/views/Search/_filters.html.twig | 2 +- src/Resources/views/Search/_sorting.html.twig | 17 +++++++++-------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/src/Resources/views/Search/_filters.html.twig b/src/Resources/views/Search/_filters.html.twig index 4f44e6c7..8fa35cf0 100644 --- a/src/Resources/views/Search/_filters.html.twig +++ b/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 %} diff --git a/src/Resources/views/Search/_sorting.html.twig b/src/Resources/views/Search/_sorting.html.twig index 7103c174..62ee93bf 100644 --- a/src/Resources/views/Search/_sorting.html.twig +++ b/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 %} From b9d95d82589a6dbddf73114e47224b7f091e1bed Mon Sep 17 00:00:00 2001 From: Maxime Leclercq Date: Fri, 23 Jun 2023 17:51:54 +0200 Subject: [PATCH 6/9] feat: use PHP 8.1 as default and add this version in workflow --- .github/workflows/recipe.yaml | 4 +++- .github/workflows/security.yaml | 2 +- .github/workflows/tests.yaml | 2 +- .php-version.dist | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/recipe.yaml b/.github/workflows/recipe.yaml index 1b64c84a..08074bba 100644 --- a/.github/workflows/recipe.yaml +++ b/.github/workflows/recipe.yaml @@ -17,9 +17,11 @@ jobs: strategy: fail-fast: false matrix: - php: ['7.4' ,'8.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 diff --git a/.github/workflows/security.yaml b/.github/workflows/security.yaml index 0f8e85b6..ea02b814 100644 --- a/.github/workflows/security.yaml +++ b/.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 diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index 14694f5f..17fed329 100644 --- a/.github/workflows/tests.yaml +++ b/.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 diff --git a/.php-version.dist b/.php-version.dist index cc40bca6..b8eb0263 100644 --- a/.php-version.dist +++ b/.php-version.dist @@ -1 +1 @@ -8.0 +8.1 From 91c8ca47a5ab5030c82c292489c192298c0ba1da Mon Sep 17 00:00:00 2001 From: Maxime Leclercq Date: Mon, 26 Jun 2023 08:43:12 +0200 Subject: [PATCH 7/9] chore: allows phpspec/phpspec in version 7.2 for sylius 1.12 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 068ec948..4240ef25 100644 --- a/composer.json +++ b/composer.json @@ -34,7 +34,7 @@ "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", From 3102a8d9244dec2531852a3844d7c4b92e9a0ea6 Mon Sep 17 00:00:00 2001 From: Maxime Leclercq Date: Mon, 26 Jun 2023 08:44:04 +0200 Subject: [PATCH 8/9] fix: ignore php version for phpcs fixer before update it --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 4240ef25..2b53c89d 100644 --- a/composer.json +++ b/composer.json @@ -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", From 3e6cbb4decaa29247b8bdd7b9c9646687a011e83 Mon Sep 17 00:00:00 2001 From: Maxime Leclercq Date: Mon, 26 Jun 2023 08:58:30 +0200 Subject: [PATCH 9/9] fix(ci): setup transports to avoid an error with sf version 6.3 --- Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index f8398545..47188e11 100644 --- a/Makefile +++ b/Makefile @@ -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 ### ¯¯¯¯¯¯¯¯