Upgrade to Sylius 1.8

.github/workflows/build.yml

@@ -20,7 +20,7 @@ jobs:
  matrix:
  php: [7.3, 7.4]
  symfony: [^4.4]
- sylius: [~1.7.0]
+ sylius: [~1.8.0]
  node: [10.x]
  mysql: [5.7, 8.0]
 
@@ -130,7 +130,6 @@ jobs:
  -
  name: Prepare test application database
  run: |
- (cp migrations/* tests/Application/src/Migrations/)
  (cd tests/Application && bin/console doctrine:database:create -vvv)
  (cd tests/Application && bin/console doctrine:migrations:migrate -n -vvv -q)
 

composer.json

@@ -21,7 +21,7 @@
  "require": {
  "php": "^7.3",
 
- "sylius/sylius": "^1.7",
+ "sylius/sylius": "^1.8",
  "friendsofsymfony/jsrouting-bundle": "^2.2"
  },
  "require-dev": {
@@ -38,8 +38,8 @@
  "friends-of-behat/variadic-extension": "^1.1",
  "lakion/mink-debug-extension": "^1.2.3",
  "phpspec/phpspec": "^6.1",
- "phpstan/phpstan-shim": "^0.11",
- "phpstan/phpstan-webmozart-assert": "^0.11",
+ "phpstan/phpstan": "0.12.29",
+ "phpstan/phpstan-webmozart-assert": "0.12.6",
  "phpunit/phpunit": "^6.5",
  "se/selenium-server-standalone": "^2.52",
  "sylius-labs/coding-standard": "^3.0",

phpstan.neon

@@ -1,4 +1,7 @@
 parameters:
+ checkMissingIterableValueType: false
+ checkGenericClassInNonGenericObjectType: false
+
  excludes_analyse:
  # Makes PHPStan crash
  - 'src/DependencyInjection/Configuration.php'

src/DependencyInjection/SyliusAdminOrderCreationExtension.php

@@ -4,19 +4,43 @@
 
 namespace Sylius\AdminOrderCreationPlugin\DependencyInjection;
 
+use Sylius\Bundle\CoreBundle\DependencyInjection\PrependDoctrineMigrationsTrait;
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Extension\Extension;
+use Symfony\Component\DependencyInjection\Extension\PrependExtensionInterface;
 use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
 
-final class SyliusAdminOrderCreationExtension extends Extension
+final class SyliusAdminOrderCreationExtension extends Extension implements PrependExtensionInterface
 {
- /**
- * {@inheritdoc}
- */
+ use PrependDoctrineMigrationsTrait;
+
  public function load(array $config, ContainerBuilder $container): void
  {
- $config = $this->processConfiguration($this->getConfiguration([], $container), $config);
+ $this->processConfiguration($this->getConfiguration([], $container), $config);
  $loader = new XmlFileLoader($container, new FileLocator(__DIR__ . '/../Resources/config'));
  }
+
+ public function prepend(ContainerBuilder $container): void
+ {
+ $this->prependDoctrineMigrations($container);
+ }
+
+ protected function getMigrationsNamespace(): string
+ {
+ return 'Sylius\AdminOrderCreationPlugin\Migrations';
+ }
+
+ protected function getMigrationsDirectory(): string
+ {
+ return '@SyliusAdminOrderCreationPlugin/Migrations';
+ }
+
+ protected function getNamespacesOfMigrationsExecutedBefore(): array
+ {
+ return [
+ 'Sylius\Bundle\CoreBundle\Migrations',
+ 'Sylius\Bundle\AdminApiBundle\Migrations',
+ ];
+ }
 }

src/Form/Type/NewOrderType.php

@@ -16,7 +16,7 @@
 
 final class NewOrderType extends AbstractResourceType
 {
- public function buildForm(FormBuilderInterface $builder, array $options)
+ public function buildForm(FormBuilderInterface $builder, array $options): void
  {
  $builder
  ->add('promotionCoupon', PromotionCouponToCodeType::class, [

src/Form/Type/PaymentType.php

@@ -10,7 +10,7 @@
 
 final class PaymentType extends AbstractResourceType
 {
- public function buildForm(FormBuilderInterface $builder, array $options)
+ public function buildForm(FormBuilderInterface $builder, array $options): void
  {
  $builder->add('method', PaymentMethodChoiceType::class, [
  'required' => true,

src/Form/Type/ShipmentType.php

@@ -10,7 +10,7 @@
 
 final class ShipmentType extends AbstractResourceType
 {
- public function buildForm(FormBuilderInterface $builder, array $options)
+ public function buildForm(FormBuilderInterface $builder, array $options): void
  {
  $builder->add('method', ShippingMethodChoiceType::class, [
  'required' => true,

migrations/Version20180626065141.php → src/Migrations/Version20180626065141.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace DoctrineMigrations;
+namespace Sylius\AdminOrderCreationPlugin\Migrations;
 
 use Doctrine\DBAL\Schema\Schema;
 use Doctrine\Migrations\AbstractMigration;

migrations/Version20180709120541.php → src/Migrations/Version20180709120541.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace DoctrineMigrations;
+namespace Sylius\AdminOrderCreationPlugin\Migrations;
 
 use Doctrine\DBAL\Schema\Schema;
 use Doctrine\Migrations\AbstractMigration;

src/ReorderProcessing/CompositeReorderProcessor.php

@@ -9,7 +9,7 @@
 
 final class CompositeReorderProcessor implements ReorderProcessor
 {
- /*** @var PriorityQueue|ReorderProcessor[] */
+ /** @var PriorityQueue|ReorderProcessor[] */
  private $reorderProcessors;
 
  public function __construct()

tests/Application/.env

@@ -21,3 +21,9 @@ DATABASE_URL=mysql://root@127.0.0.1/sylius_admin_order_creation_plugin_%kernel.e
 # Delivery is disabled by default via "null://localhost"
 MAILER_URL=smtp://localhost
 ###< symfony/swiftmailer-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=YOUR_SECRET_PASSPHRASE
+###< lexik/jwt-authentication-bundle ###

tests/Application/.env.test

@@ -1,3 +1,9 @@
 APP_SECRET='ch4mb3r0f5ecr3ts'
 
 KERNEL_CLASS='Tests\Sylius\AdminOrderCreationPlugin\Application\Kernel'
+
+###> lexik/jwt-authentication-bundle ###
+JWT_SECRET_KEY=%kernel.project_dir%/config/jwt/private-test.pem
+JWT_PUBLIC_KEY=%kernel.project_dir%/config/jwt/public-test.pem
+JWT_PASSPHRASE=ALL_THAT_IS_GOLD_DOES_NOT_GLITTER_NOT_ALL_THOSE_WHO_WANDER_ARE_LOST
+###< lexik/jwt-authentication-bundle ###

tests/Application/config/bundles.php

@@ -55,4 +55,8 @@
  Sylius\AdminOrderCreationPlugin\SyliusAdminOrderCreationPlugin::class => ['all' => true],
  FriendsOfBehat\SymfonyExtension\Bundle\FriendsOfBehatSymfonyExtensionBundle::class => ['test' => true, 'test_cached' => true],
  FOS\JsRoutingBundle\FOSJsRoutingBundle::class => ['all' => true],
+ ApiPlatform\Core\Bridge\Symfony\Bundle\ApiPlatformBundle::class => ['all' => true],
+ Sylius\Bundle\ApiBundle\SyliusApiBundle::class => ['all' => true],
+ Lexik\Bundle\JWTAuthenticationBundle\LexikJWTAuthenticationBundle::class => ['all' => true],
+ SyliusLabs\DoctrineMigrationsExtraBundle\SyliusLabsDoctrineMigrationsExtraBundle::class => ['all' => true],
 ];

tests/Application/config/jwt/private-test.pem

@@ -0,0 +1,51 @@
+-----BEGIN RSA PRIVATE KEY-----
+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
+-----END RSA PRIVATE KEY-----

tests/Application/config/jwt/public-test.pem

@@ -0,0 +1,14 @@
+-----BEGIN PUBLIC KEY-----
+MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAxuS1SudSNkjTQcP4H5Sj
+zrdO29upko9KYZgUH6z5n+weDtIo5tysdm7xY3nNAU9ixo7wrBvttuf7T1fDCVJj
+hzqX5iewaCZks7q9kYygCbvmrAocbx5D9EPZPH0sQQoa9gMuNou2nqWpVdTYCMAj
+xzVpqa2krioUzkBJzaWGDYiijv9qKbjWvRUUoYFNOFIFXHFFDrK5ISBC155XiETK
+yBYhB1wZVWX1tHe1nDW609BHAAsr1Ve3uiodzYzQ7S9Rw9Q6RCRSRgZRzFV1GTJE
+uyMpCCD51DA4otYeEPQf+8hvV3aKbSNydzrQICY95kfB0p9HxorBPh8QHq0qKZOI
+le1Aglp0UV3OWgXLWncNc0m8e8hT2I55lYkLio99/4PGfalAdJBPhKtTzbJllaER
+HOnlMkEvwk7eggkbbXEN/Ay6usi0R8mRaxhMkS9i8MxubgQBDsOomtegRqA1EzSG
+U/FJMS5g/I/gO9bjFu2l2LJwd6B4t/FZt/9mAIGYbIj5/Ykd0E1WIKYAIRUoyW1g
+TrGe70yxdHEPEILnZZMRVJzDbkVYfgKAFUpAUqbHTtS+YI6p9tjFuxBrc6GZR/kp
+pL/MkEARDX0ZX3n4sPLQf/vdR7+Ks8Yqws1IqsZ3h8iP8WpykbEwnd1w49A1ZBBi
+nIXU3idf41EtQgawbpK5Oy0CAwEAAQ==
+-----END PUBLIC KEY-----

tests/Application/config/packages/_sylius.yaml

@@ -6,6 +6,8 @@ imports:
 
  - { resource: "@SyliusShopBundle/Resources/config/app/config.yml" }
 
+ - { resource: "@SyliusApiBundle/Resources/config/app/config.yaml" }
+
  - { resource: "@SyliusAdminOrderCreationPlugin/Resources/config/app/config.yml" }
 
 parameters:

tests/Application/config/packages/doctrine_migrations.yaml

@@ -1,5 +1,6 @@
 doctrine_migrations:
- dir_name: "%kernel.project_dir%/src/Migrations"
-
- # Namespace is arbitrary but should be different from App\Migrations as migrations classes should NOT be autoloaded
- namespace: DoctrineMigrations
+ storage:
+ table_storage:
+ table_name: sylius_migrations
+ migrations_paths:
+ 'DoctrineMigrations': '%kernel.project_dir%/src/Migrations'

tests/Application/config/packages/lexik_jwt_authentication.yaml

@@ -0,0 +1,4 @@
+lexik_jwt_authentication:
+ secret_key: '%env(resolve:JWT_SECRET_KEY)%'
+ public_key: '%env(resolve:JWT_PUBLIC_KEY)%'
+ pass_phrase: '%env(JWT_PASSPHRASE)%'

tests/Application/config/packages/security.yaml

@@ -1,16 +1,29 @@
 parameters:
- sylius.security.admin_regex: "^/admin"
+ sylius.security.admin_regex: "^/%sylius_admin.path_name%"
  sylius.security.api_regex: "^/api"
- sylius.security.shop_regex: "^/(?!admin|api/.*|api$|media/.*)[^/]++"
+ 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:
  providers:
  sylius_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_admin_user_provider:
+ id: sylius.admin_user_provider.email_or_name_based
+ sylius_api_shop_user_provider:
+ id: sylius.shop_user_provider.email_or_name_based
+
  encoders:
  Sylius\Component\User\Model\UserInterface: argon2i
+
  firewalls:
  admin:
  switch_user: true
@@ -30,7 +43,7 @@ security:
  csrf_token_id: admin_authenticate
  remember_me:
  secret: "%env(APP_SECRET)%"
- path: /admin
+ path: "/%sylius_admin.path_name%"
  name: APP_ADMIN_REMEMBER_ME
  lifetime: 31536000
  remember_me_parameter: _remember_me
@@ -50,6 +63,36 @@ security:
  stateless: true
  anonymous: true
 
+ new_api_admin_user:
+ pattern: "%sylius.security.new_api_admin_regex%/.*"
+ provider: sylius_api_admin_user_provider
+ stateless: true
+ anonymous: true
+ json_login:
+ check_path: "%sylius.security.new_api_admin_route%/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_shop_regex%/.*"
+ provider: sylius_api_shop_user_provider
+ stateless: true
+ anonymous: true
+ json_login:
+ check_path: "%sylius.security.new_api_shop_route%/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
+
  shop:
  switch_user: { role: ROLE_ALLOWED_TO_SWITCH }
  context: shop
@@ -100,3 +143,8 @@ security:
  - { 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 }
+ - { path: "%sylius.security.new_api_admin_route%/authentication-token", role: IS_AUTHENTICATED_ANONYMOUSLY }
+ - { path: "%sylius.security.new_api_shop_route%/authentication-token", role: IS_AUTHENTICATED_ANONYMOUSLY }

tests/Application/config/routes/sylius_api.yaml

@@ -0,0 +1,3 @@
+sylius_api:
+ resource: "@SyliusApiBundle/Resources/config/routing.yml"
+ prefix: "%sylius.security.new_api_route%"