Merge pull request #8 from webgriffe/sylius-10-php-8

Add support for Sylius 1.10 and PHP 8.0

Author: lruozzi9

.github/workflows/build.yml

@@ -21,16 +21,17 @@ jobs:
         strategy:
             fail-fast: false
             matrix:
-                php: [7.4, 7.3]
-                symfony: [^4.4, ^5.2]
-                sylius: [~1.8.0, ~1.9.0]
-                node: [10.x]
-                mysql: [5.7]
+                php: ["8.0", "7.4"]
+                symfony: ["^4.4", "^5.2"]
+                sylius: ["~1.9.0", "~1.10.0@alpha"]
+                node: ["10.x"]
+                mysql: ["8.0"]
 
                 exclude:
                     -
-                        sylius: ~1.8.0
-                        symfony: ^5.2
+                        php: "8.0"
+                        sylius: "~1.9.0"
+
 
         env:
             APP_ENV: test

composer.json

@@ -8,51 +8,47 @@
     ],
     "license": "MIT",
     "require": {
-        "php": "^7.3",
+        "php": "^7.4 || ^8.0",
         "sandwich/vies-bundle": "^2.1",
-        "sylius/sylius": "~1.8.0 || ~1.9.0",
+        "sylius/sylius": "~1.9.0 || ~1.10.0@beta",
         "webmozart/assert": "^1.9"
     },
-    "conflict": {
-        "api-platform/core": "^2.6",
-        "symplify/package-builder": "^8.3.25"
-    },
     "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",
         "friends-of-behat/mink": "^1.8",
         "friends-of-behat/mink-browserkit-driver": "^1.4",
+        "friends-of-behat/mink-debug-extension": "^2.0.0",
         "friends-of-behat/mink-extension": "^2.4",
         "friends-of-behat/page-object-extension": "^0.3",
         "friends-of-behat/suite-settings-extension": "^1.0",
         "friends-of-behat/symfony-extension": "^2.1",
         "friends-of-behat/variadic-extension": "^1.3",
         "friendsofsymfony/oauth-server-bundle": "^1.6 || >2.0.0-alpha.0 ^2.0@dev",
-        "lakion/mink-debug-extension": "^2.0.0",
         "phpspec/phpspec": "^7.0",
         "phpstan/extension-installer": "^1.0",
-        "phpstan/phpstan": "0.12.74",
-        "phpstan/phpstan-doctrine": "0.12.31",
+        "phpstan/phpstan": "0.12.85",
+        "phpstan/phpstan-doctrine": "0.12.33",
         "phpstan/phpstan-strict-rules": "^0.12.0",
         "phpstan/phpstan-webmozart-assert": "0.12.12",
         "phpunit/phpunit": "^9.5",
         "sensiolabs/security-checker": "^6.0",
-        "sylius-labs/coding-standard": "^3.1",
+        "sylius-labs/coding-standard": "^4.0",
         "symfony/browser-kit": "^4.4 || ^5.2",
         "symfony/debug-bundle": "^4.4 || ^5.2",
         "symfony/dotenv": "^4.4 || ^5.2",
         "symfony/intl": "^4.4 || ^5.2",
         "symfony/web-profiler-bundle": "^4.4 || ^5.2",
-        "vimeo/psalm": "4.4.1"
+        "vimeo/psalm": "4.7.1"
     },
     "config": {
         "sort-packages": true
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "0.x-dev"
+            "dev-master": "1.10-dev"
         }
     },
     "autoload": {

easy-coding-standard.yml

@@ -0,0 +1,14 @@
+<?php
+
+use PhpCsFixer\Fixer\ClassNotation\VisibilityRequiredFixer;
+use SlevomatCodingStandard\Sniffs\Commenting\InlineDocCommentDeclarationSniff;
+use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
+use Symplify\EasyCodingStandard\ValueObject\Option;
+
+return static function (ContainerConfigurator $containerConfigurator): void {
+    $containerConfigurator->import('vendor/sylius-labs/coding-standard/ecs.php');
+
+    $containerConfigurator->parameters()->set(Option::SKIP, [
+        VisibilityRequiredFixer::class => ['*Spec.php'],
+    ]);
+};

ecs.php

@@ -9,6 +9,9 @@
 
 final class Configuration implements ConfigurationInterface
 {
+    /**
+     * @psalm-suppress UnusedVariable
+     */
     public function getConfigTreeBuilder(): TreeBuilder
     {
         $treeBuilder = new TreeBuilder('webgriffe_sylius_italian_invoiceable_order_plugin');

package-lock.json

@@ -12,6 +12,9 @@
 
 final class WebgriffeSyliusItalianInvoiceableOrderExtension extends Extension
 {
+    /**
+     * @psalm-suppress UnusedVariable
+     */
     public function load(array $configs, ContainerBuilder $container): void
     {
         $config = $this->processConfiguration($this->getConfiguration([], $container), $configs);

src/DependencyInjection/Configuration.php

@@ -28,19 +28,25 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
                     'placeholder' => false,
                 ]
             )
-            ->add('taxCode', TextType::class,
+            ->add(
+                'taxCode',
+                TextType::class,
                 [
                     'label' => 'webgriffe_sylius_italian_invoiceable_order.form.address.tax_code.label',
                     'required' => false,
                 ]
             )
-            ->add('vatNumber', TextType::class,
+            ->add(
+                'vatNumber',
+                TextType::class,
                 [
                     'label' => 'webgriffe_sylius_italian_invoiceable_order.form.address.vat_number.label',
                     'required' => false,
                 ]
             )
-            ->add('sdiCode', TextType::class,
+            ->add(
+                'sdiCode',
+                TextType::class,
                 [
                     'label' => 'webgriffe_sylius_italian_invoiceable_order.form.address.sdi_code.label',
                     'required' => false,

src/DependencyInjection/WebgriffeSyliusItalianInvoiceableOrderExtension.php

@@ -4,7 +4,6 @@
 
 namespace Webgriffe\SyliusItalianInvoiceableOrderPlugin\Model;
 
-use Sylius\Component\Core\Model\AddressInterface;
 use Sylius\Component\Addressing\Model\ZoneInterface;
 use Sylius\Component\Core\Model\ChannelInterface;
 use Sylius\Component\Core\Model\OrderInterface;
@@ -14,13 +13,13 @@
 
 final class ItalianTaxCalculationStrategy implements TaxCalculationStrategyInterface
 {
-    /** @var string $type */
+    /** @var string */
     private $type;
 
     /** @var OrderTaxesApplicatorInterface[] */
     private $applicators;
 
-    /** @var string $euTaxZoneCode */
+    /** @var string */
     private $euTaxZoneCode;
 
     /**
@@ -77,7 +76,6 @@ private function shouldSkipTaxesApplication(OrderInterface $order, ZoneInterface
             return false;
         }
 
-        /** @var AddressInterface|null $billingAddress */
         $billingAddress = $order->getBillingAddress();
 
         Assert::nullOrIsInstanceOf($billingAddress, ItalianInvoiceableAddressInterface::class);

src/Form/Extension/ItalianInvoiceableAddressTypeExtension.php

@@ -6,6 +6,9 @@
 
 use Symfony\Component\Validator\Constraint;
 
+/**
+ * @psalm-suppress PropertyNotSetInConstructor
+ */
 final class ItalianTaxCode extends Constraint
 {
     /** @var string */