From 68694882cdebc9acf5277ee75623fefe284bea95 Mon Sep 17 00:00:00 2001 From: Marek Rzytki <61479357+marekrzytki@users.noreply.github.com> Date: Fri, 4 Mar 2022 12:51:07 +0100 Subject: [PATCH] Sylius 1.11 support (#5) * Add sylius 1.11 support * Update build * Remove scrutinizer * Add missing space Co-authored-by: Jakub 'Wolen' Tobiasz <80641364+jakubtobiasz@users.noreply.github.com> * Add Sylius 1.9 to build * Add conflict section to composer json * Try to fix Sylius 1.9 build * Bump node version in build Co-authored-by: Jakub 'Wolen' Tobiasz <80641364+jakubtobiasz@users.noreply.github.com> --- .github/workflows/build.yml | 7 +- .scrutinizer.yml | 7 - composer.json | 22 ++- tests/Application/.env.dist | 14 ++ tests/Application/Kernel.php | 2 +- .../Application/config/api_platform/.gitkeep | 0 .../config/sylius/1.11/bundles.php | 7 + .../config/sylius/1.11/packages/security.yaml | 148 ++++++++++++++++++ 8 files changed, 193 insertions(+), 14 deletions(-) delete mode 100644 .scrutinizer.yml create mode 100644 tests/Application/config/api_platform/.gitkeep create mode 100644 tests/Application/config/sylius/1.11/bundles.php create mode 100644 tests/Application/config/sylius/1.11/packages/security.yaml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f38339a..5c1a95b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -23,8 +23,8 @@ jobs: matrix: php: [7.4, 8.0] symfony: [^4.4, ^5.2] - sylius: [~1.8.0, ~1.10.0] - node: [10.x] + sylius: [~1.8.0, ~1.9.0, ~1.10.0, ~1.11.0] + node: [14.x] mysql: [5.7] exclude: @@ -37,6 +37,9 @@ jobs: - sylius: ~1.9.0 php: 8.0 + - + sylius: ~1.11.0 + php: 7.4 env: APP_ENV: test diff --git a/.scrutinizer.yml b/.scrutinizer.yml deleted file mode 100644 index efb9ec3..0000000 --- a/.scrutinizer.yml +++ /dev/null @@ -1,7 +0,0 @@ -build: - environment: - variables: - COMPOSER_MEMORY_LIMIT: -1 - -filter: - excluded_paths: [tests/*, spec/*] diff --git a/composer.json b/composer.json index 378ad1a..0099e1a 100644 --- a/composer.json +++ b/composer.json @@ -6,7 +6,7 @@ "license": "MIT", "require": { "php": "^7.3 || ^8.0", - "sylius/sylius": "~1.8.0 || ~1.9.0 || ~1.10.0", + "sylius/sylius": "~1.8.0 || ~1.9.0 || ~1.10.0 || ~1.11.0", "braintree/braintree_php": "^6.4" }, "require-dev": { @@ -39,12 +39,26 @@ "symfony/intl": "^4.4 || ^5.2", "symfony/web-profiler-bundle": "^4.4 || ^5.2", "symfony/web-server-bundle": "^3.4|^4.1", - "vimeo/psalm": "4.7.1" + "vimeo/psalm": "4.7.1", + "polishsymfonycommunity/symfony-mocker-container": "^1.0" }, "config": { - "sort-packages": true + "sort-packages": true, + "allow-plugins": { + "symfony/thanks": true, + "composer/package-versions-deprecated": true, + "dealerdirect/phpcodesniffer-composer-installer": true, + "phpstan/extension-installer": true + } + }, + "conflict": { + "doctrine/dbal": "^3.0", + "symfony/symfony": "4.1.8", + "symfony/browser-kit": "4.1.8", + "symfony/dom-crawler": "4.1.8", + "symfony/routing": "4.1.8", + "symfony/doctrine-bridge": "4.4.16" }, - "prefer-stable": true, "autoload": { "psr-4": { "BitBag\\SyliusBraintreePlugin\\": "src/", diff --git a/tests/Application/.env.dist b/tests/Application/.env.dist index 1465c68..1ac23f8 100644 --- a/tests/Application/.env.dist +++ b/tests/Application/.env.dist @@ -15,6 +15,20 @@ APP_SECRET=EDITME DATABASE_URL=mysql://root@127.0.0.1/sylius_%kernel.environment%?serverVersion=5.5 ###< doctrine/doctrine-bundle ### +###> lexik/jwt-authentication-bundle ### +JWT_SECRET_KEY=%kernel.project_dir%/config/jwt/private.pem +JWT_PUBLIC_KEY=%kernel.project_dir%/config/jwt/public.pem +JWT_PASSPHRASE=acme_plugin_development +###< lexik/jwt-authentication-bundle ### + +###> symfony/messenger ### +# Choose one of the transports below +# MESSENGER_TRANSPORT_DSN=amqp://guest:guest@localhost:5672/%2f/messages +# MESSENGER_TRANSPORT_DSN=doctrine://default +# MESSENGER_TRANSPORT_DSN=redis://localhost:6379/messages +MESSENGER_TRANSPORT_DSN=sync:// +###< symfony/messenger ### + ###> symfony/swiftmailer-bundle ### # For Gmail as a transport, use: "gmail://username:password@localhost" # For a generic SMTP server, use: "smtp://localhost:25?encryption=&auth_mode=" diff --git a/tests/Application/Kernel.php b/tests/Application/Kernel.php index 50c8fb6..da624c2 100644 --- a/tests/Application/Kernel.php +++ b/tests/Application/Kernel.php @@ -67,7 +67,7 @@ protected function configureRoutes(RouteCollectionBuilder $routes): void protected function getContainerBaseClass(): string { - if ($this->isTestEnvironment()) { + if ($this->isTestEnvironment() && class_exists(MockerContainer::class)) { return MockerContainer::class; } diff --git a/tests/Application/config/api_platform/.gitkeep b/tests/Application/config/api_platform/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/tests/Application/config/sylius/1.11/bundles.php b/tests/Application/config/sylius/1.11/bundles.php new file mode 100644 index 0000000..ce7c123 --- /dev/null +++ b/tests/Application/config/sylius/1.11/bundles.php @@ -0,0 +1,7 @@ + ['all' => true], + SyliusLabs\Polyfill\Symfony\Security\Bundle\SyliusLabsPolyfillSymfonySecurityBundle::class => ['all' => true], + Sylius\Calendar\SyliusCalendarBundle::class => ['all' => true], +]; diff --git a/tests/Application/config/sylius/1.11/packages/security.yaml b/tests/Application/config/sylius/1.11/packages/security.yaml new file mode 100644 index 0000000..1062810 --- /dev/null +++ b/tests/Application/config/sylius/1.11/packages/security.yaml @@ -0,0 +1,148 @@ +parameters: + sylius.security.admin_regex: "^/%sylius_admin.path_name%" + sylius.security.api_regex: "^/api" + sylius.security.shop_regex: "^/(?!%sylius_admin.path_name%|new-api|api/.*|api$|media/.*)[^/]++" + sylius.security.new_api_route: "/new-api" + sylius.security.new_api_regex: "^%sylius.security.new_api_route%" + sylius.security.new_api_admin_route: "%sylius.security.new_api_route%/admin" + sylius.security.new_api_admin_regex: "^%sylius.security.new_api_admin_route%" + sylius.security.new_api_shop_route: "%sylius.security.new_api_route%/shop" + sylius.security.new_api_shop_regex: "^%sylius.security.new_api_shop_route%" + +security: + always_authenticate_before_granting: true + providers: + sylius_admin_user_provider: + id: sylius.admin_user_provider.email_or_name_based + sylius_api_admin_user_provider: + id: sylius.admin_user_provider.email_or_name_based + sylius_shop_user_provider: + id: sylius.shop_user_provider.email_or_name_based + sylius_api_shop_user_provider: + id: sylius.shop_user_provider.email_or_name_based + sylius_api_chain_provider: + chain: + providers: [sylius_api_shop_user_provider, sylius_api_admin_user_provider] + + encoders: + Sylius\Component\User\Model\UserInterface: argon2i + firewalls: + admin: + switch_user: true + context: admin + pattern: "%sylius.security.admin_regex%" + provider: sylius_admin_user_provider + form_login: + provider: sylius_admin_user_provider + login_path: sylius_admin_login + check_path: sylius_admin_login_check + failure_path: sylius_admin_login + default_target_path: sylius_admin_dashboard + use_forward: false + use_referer: true + csrf_token_generator: security.csrf.token_manager + csrf_parameter: _csrf_admin_security_token + csrf_token_id: admin_authenticate + remember_me: + secret: "%env(APP_SECRET)%" + path: "/%sylius_admin.path_name%" + name: APP_ADMIN_REMEMBER_ME + lifetime: 31536000 + remember_me_parameter: _remember_me + logout: + path: sylius_admin_logout + target: sylius_admin_login + anonymous: true + + new_api_admin_user: + pattern: "%sylius.security.new_api_route%/admin-user-authentication-token" + provider: sylius_admin_user_provider + stateless: true + anonymous: true + json_login: + check_path: "%sylius.security.new_api_route%/admin-user-authentication-token" + username_path: email + password_path: password + success_handler: lexik_jwt_authentication.handler.authentication_success + failure_handler: lexik_jwt_authentication.handler.authentication_failure + guard: + authenticators: + - lexik_jwt_authentication.jwt_token_authenticator + + new_api_shop_user: + pattern: "%sylius.security.new_api_route%/shop-user-authentication-token" + provider: sylius_shop_user_provider + stateless: true + anonymous: true + json_login: + check_path: "%sylius.security.new_api_route%/shop-user-authentication-token" + username_path: email + password_path: password + success_handler: lexik_jwt_authentication.handler.authentication_success + failure_handler: lexik_jwt_authentication.handler.authentication_failure + guard: + authenticators: + - lexik_jwt_authentication.jwt_token_authenticator + + new_api: + pattern: "%sylius.security.new_api_regex%/*" + provider: sylius_api_chain_provider + stateless: true + anonymous: lazy + guard: + authenticators: + - lexik_jwt_authentication.jwt_token_authenticator + + shop: + switch_user: { role: ROLE_ALLOWED_TO_SWITCH } + context: shop + pattern: "%sylius.security.shop_regex%" + provider: sylius_shop_user_provider + form_login: + success_handler: sylius.authentication.success_handler + failure_handler: sylius.authentication.failure_handler + provider: sylius_shop_user_provider + login_path: sylius_shop_login + check_path: sylius_shop_login_check + failure_path: sylius_shop_login + default_target_path: sylius_shop_homepage + use_forward: false + use_referer: true + csrf_token_generator: security.csrf.token_manager + csrf_parameter: _csrf_shop_security_token + csrf_token_id: shop_authenticate + remember_me: + secret: "%env(APP_SECRET)%" + name: APP_SHOP_REMEMBER_ME + lifetime: 31536000 + remember_me_parameter: _remember_me + logout: + path: sylius_shop_logout + target: sylius_shop_login + invalidate_session: false + success_handler: sylius.handler.shop_user_logout + anonymous: true + + dev: + pattern: ^/(_(profiler|wdt)|css|images|js)/ + security: false + + access_control: + - { path: "%sylius.security.admin_regex%/_partial", role: IS_AUTHENTICATED_ANONYMOUSLY, ips: [127.0.0.1, ::1] } + - { path: "%sylius.security.admin_regex%/_partial", role: ROLE_NO_ACCESS } + - { path: "%sylius.security.shop_regex%/_partial", role: IS_AUTHENTICATED_ANONYMOUSLY, ips: [127.0.0.1, ::1] } + - { path: "%sylius.security.shop_regex%/_partial", role: ROLE_NO_ACCESS } + + - { path: "%sylius.security.admin_regex%/login", role: IS_AUTHENTICATED_ANONYMOUSLY } + - { path: "%sylius.security.api_regex%/login", role: IS_AUTHENTICATED_ANONYMOUSLY } + - { path: "%sylius.security.shop_regex%/login", role: IS_AUTHENTICATED_ANONYMOUSLY } + + - { path: "%sylius.security.shop_regex%/register", role: IS_AUTHENTICATED_ANONYMOUSLY } + - { path: "%sylius.security.shop_regex%/verify", role: IS_AUTHENTICATED_ANONYMOUSLY } + + - { path: "%sylius.security.admin_regex%", role: ROLE_ADMINISTRATION_ACCESS } + - { path: "%sylius.security.api_regex%/.*", role: ROLE_API_ACCESS } + - { path: "%sylius.security.shop_regex%/account", role: ROLE_USER } + + - { path: "%sylius.security.new_api_admin_regex%/.*", role: ROLE_API_ACCESS } + - { path: "%sylius.security.new_api_shop_regex%/.*", role: IS_AUTHENTICATED_ANONYMOUSLY }