Merge pull request #39 from pamil/road-to-hell

Maintenance + stable Sylius support
Sylake · Nov 10, 2017 · 35726d6 · 35726d6
2 parents c93cfa4 + 5c1104d
commit 35726d6
Show file tree

Hide file tree

Showing 55 changed files with 90 additions and 99 deletions.
diff --git a/composer.json b/composer.json
@@ -17,13 +17,14 @@
         "php": "^7.1",
 
         "php-amqplib/rabbitmq-bundle": "^1.12",
-        "sylius-labs/rabbitmq-simplebus-bundle": "^1.0.0@beta",
-        "sylius/sylius": "1.0.0-beta.3"
+        "sylius-labs/rabbitmq-simplebus-bundle": "^1.0",
+        "sylius/sylius": "^1.0"
     },
     "require-dev": {
         "matthiasnoback/symfony-dependency-injection-test": "^1.0",
-        "phpspec/phpspec": "^3.2",
-        "phpunit/phpunit": "^5.6"
+        "phpspec/phpspec": "^4.0",
+        "phpunit/phpunit": "^5.6",
+        "sylius-labs/coding-standard": "^1.0"
     },
     "autoload": {
         "psr-4": {

diff --git a/easy-coding-standard.neon b/easy-coding-standard.neon
@@ -0,0 +1,2 @@
+includes:
+    - vendor/sylius-labs/coding-standard/easy-coding-standard.neon
diff --git a/spec/Denormalizer/AssociationTypeUpdatedDenormalizerSpec.php b/spec/Denormalizer/AssociationTypeUpdatedDenormalizerSpec.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace spec\Sylake\SyliusConsumerPlugin\Denormalizer;
 
 use PhpAmqpLib\Message\AMQPMessage;

diff --git a/spec/Denormalizer/AttributeOptionUpdatedDenormalizerSpec.php b/spec/Denormalizer/AttributeOptionUpdatedDenormalizerSpec.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace spec\Sylake\SyliusConsumerPlugin\Denormalizer;
 
 use PhpAmqpLib\Message\AMQPMessage;

diff --git a/spec/Denormalizer/AttributeUpdatedDenormalizerSpec.php b/spec/Denormalizer/AttributeUpdatedDenormalizerSpec.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace spec\Sylake\SyliusConsumerPlugin\Denormalizer;
 
 use PhpAmqpLib\Message\AMQPMessage;

diff --git a/spec/Denormalizer/FamilyUpdatedDenormalizerSpec.php b/spec/Denormalizer/FamilyUpdatedDenormalizerSpec.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace spec\Sylake\SyliusConsumerPlugin\Denormalizer;
 
 use PhpAmqpLib\Message\AMQPMessage;

diff --git a/spec/Denormalizer/GroupUpdatedDenormalizerSpec.php b/spec/Denormalizer/GroupUpdatedDenormalizerSpec.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace spec\Sylake\SyliusConsumerPlugin\Denormalizer;
 
 use PhpAmqpLib\Message\AMQPMessage;

diff --git a/spec/Denormalizer/TaxonUpdatedDenormalizerSpec.php b/spec/Denormalizer/TaxonUpdatedDenormalizerSpec.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace spec\Sylake\SyliusConsumerPlugin\Denormalizer;
 
 use PhpAmqpLib\Message\AMQPMessage;

diff --git a/spec/Model/TranslationsSpec.php b/spec/Model/TranslationsSpec.php
@@ -1,9 +1,10 @@
 <?php
 
+declare(strict_types=1);
+
 namespace spec\Sylake\SyliusConsumerPlugin\Model;
 
 use PhpSpec\ObjectBehavior;
-use Prophecy\Argument;
 
 final class TranslationsSpec extends ObjectBehavior
 {

diff --git a/src/Denormalizer/AssociationTypeUpdatedDenormalizer.php b/src/Denormalizer/AssociationTypeUpdatedDenormalizer.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Sylake\SyliusConsumerPlugin\Denormalizer;
 
 use Sylake\SyliusConsumerPlugin\Event\AssociationTypeUpdated;

diff --git a/src/Denormalizer/AttributeUpdatedDenormalizer.php b/src/Denormalizer/AttributeUpdatedDenormalizer.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Sylake\SyliusConsumerPlugin\Denormalizer;
 
 use Sylake\SyliusConsumerPlugin\Event\AttributeUpdated;

diff --git a/src/Denormalizer/ProductUpdatedDenormalizer.php b/src/Denormalizer/ProductUpdatedDenormalizer.php
@@ -9,7 +9,6 @@
 
 final class ProductUpdatedDenormalizer extends AkeneoDenormalizer
 {
-
     /**
      * {@inheritdoc}
      */

diff --git a/src/Denormalizer/TaxonUpdatedDenormalizer.php b/src/Denormalizer/TaxonUpdatedDenormalizer.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Sylake\SyliusConsumerPlugin\Denormalizer;
 
 use Sylake\SyliusConsumerPlugin\Event\TaxonUpdated;

diff --git a/src/DependencyInjection/Configuration.php b/src/DependencyInjection/Configuration.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Sylake\SyliusConsumerPlugin\DependencyInjection;
 
 use Symfony\Component\Config\Definition\Builder\TreeBuilder;

diff --git a/src/DependencyInjection/SylakeSyliusConsumerExtension.php b/src/DependencyInjection/SylakeSyliusConsumerExtension.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Sylake\SyliusConsumerPlugin\DependencyInjection;
 
 use Symfony\Component\Config\FileLocator;

diff --git a/src/Event/AssociationTypeUpdated.php b/src/Event/AssociationTypeUpdated.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Sylake\SyliusConsumerPlugin\Event;
 
 use Sylake\SyliusConsumerPlugin\Model\Translations;

diff --git a/src/Event/AttributeOptionUpdated.php b/src/Event/AttributeOptionUpdated.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Sylake\SyliusConsumerPlugin\Event;
 
 use Sylake\SyliusConsumerPlugin\Model\Translations;

diff --git a/src/Event/AttributeUpdated.php b/src/Event/AttributeUpdated.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Sylake\SyliusConsumerPlugin\Event;
 
 use Sylake\SyliusConsumerPlugin\Model\Translations;
@@ -12,7 +14,7 @@ final class AttributeUpdated
     /** @var string */
     private $type;
 
-    /**@var Translations */
+    /** @var Translations */
     private $names;
 
     public function __construct(string $code, string $type, Translations $names)

diff --git a/src/Event/FamilyUpdated.php b/src/Event/FamilyUpdated.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Sylake\SyliusConsumerPlugin\Event;
 
 use Sylake\SyliusConsumerPlugin\Model\Translations;

diff --git a/src/Event/GroupUpdated.php b/src/Event/GroupUpdated.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Sylake\SyliusConsumerPlugin\Event;
 
 use Sylake\SyliusConsumerPlugin\Model\Translations;

diff --git a/src/Event/ProductUpdated.php b/src/Event/ProductUpdated.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Sylake\SyliusConsumerPlugin\Event;
 
 final class ProductUpdated

diff --git a/src/Event/TaxonUpdated.php b/src/Event/TaxonUpdated.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Sylake\SyliusConsumerPlugin\Event;
 
 use Sylake\SyliusConsumerPlugin\Model\Translations;

diff --git a/src/Model/Translations.php b/src/Model/Translations.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Sylake\SyliusConsumerPlugin\Model;
 
 final class Translations implements \IteratorAggregate

diff --git a/src/Projector/AssociationTypeProjector.php b/src/Projector/AssociationTypeProjector.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Sylake\SyliusConsumerPlugin\Projector;
 
 use Psr\Log\LoggerInterface;

diff --git a/src/Projector/AttributeOptionProjector.php b/src/Projector/AttributeOptionProjector.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Sylake\SyliusConsumerPlugin\Projector;
 
 use Psr\Log\LoggerInterface;

diff --git a/src/Projector/AttributeProjector.php b/src/Projector/AttributeProjector.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Sylake\SyliusConsumerPlugin\Projector;
 
 use Psr\Log\LoggerInterface;

diff --git a/src/Projector/FamilyProjector.php b/src/Projector/FamilyProjector.php
@@ -1,10 +1,11 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Sylake\SyliusConsumerPlugin\Projector;
 
 use Psr\Log\LoggerInterface;
 use Sylake\SyliusConsumerPlugin\Entity\AkeneoAttributeOption;
-use Sylake\SyliusConsumerPlugin\Entity\AkeneoFamily;
 use Sylake\SyliusConsumerPlugin\Event\FamilyUpdated;
 use Sylake\SyliusConsumerPlugin\Model\Translations;
 use Sylius\Component\Attribute\AttributeType\TextAttributeType;

diff --git a/src/Projector/GroupProjector.php b/src/Projector/GroupProjector.php
@@ -1,10 +1,11 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Sylake\SyliusConsumerPlugin\Projector;
 
 use Psr\Log\LoggerInterface;
 use Sylake\SyliusConsumerPlugin\Entity\AkeneoAttributeOption;
-use Sylake\SyliusConsumerPlugin\Entity\AkeneoGroup;
 use Sylake\SyliusConsumerPlugin\Event\GroupUpdated;
 use Sylake\SyliusConsumerPlugin\Model\Translations;
 use Sylius\Component\Attribute\AttributeType\TextAttributeType;

diff --git a/src/Projector/Product/Attribute/ChannelPricingAttributeProcessor.php b/src/Projector/Product/Attribute/ChannelPricingAttributeProcessor.php
@@ -87,7 +87,7 @@ private function supports(Attribute $attribute): bool
         return $this->priceAttribute === $attribute->attribute() && is_array($attribute->data());
     }
 
-    private function processChannelPricings(Attribute $attribute, ProductVariantInterface$productVariant): array
+    private function processChannelPricings(Attribute $attribute, ProductVariantInterface $productVariant): array
     {
         /** @var ChannelPricingInterface[] $channelPricings */
         $channelPricings = [];
@@ -107,7 +107,7 @@ private function processChannelPricings(Attribute $attribute, ProductVariantInte
                 /** @var ChannelPricingInterface|null $channelPricing */
                 $channelPricing = $this->channelPricingRepository->findOneBy([
                     'productVariant' => $productVariant,
-                    'channelCode' => $channel->getCode()
+                    'channelCode' => $channel->getCode(),
                 ]);
 
                 if (null === $channelPricing) {
@@ -124,5 +124,4 @@ private function processChannelPricings(Attribute $attribute, ProductVariantInte
 
         return $channelPricings;
     }
-
 }
diff --git a/src/Projector/Product/Attribute/DescriptionAttributeProcessor.php b/src/Projector/Product/Attribute/DescriptionAttributeProcessor.php
@@ -36,5 +36,4 @@ private function supports(Attribute $attribute): bool
     {
         return $this->descriptionAttribute === $attribute->attribute() && is_string($attribute->data());
     }
-
 }
diff --git a/src/Projector/Product/Attribute/NameAttributeProcessor.php b/src/Projector/Product/Attribute/NameAttributeProcessor.php
@@ -36,5 +36,4 @@ private function supports(Attribute $attribute): bool
     {
         return $this->nameAttribute === $attribute->attribute() && (is_string($attribute->data()) || null === $attribute->data());
     }
-
 }
diff --git a/src/Projector/Product/Attribute/ScalarAttributeProcessor.php b/src/Projector/Product/Attribute/ScalarAttributeProcessor.php
@@ -6,8 +6,6 @@
 
 use Sylake\SyliusConsumerPlugin\Model\Attribute;
 use Sylius\Component\Attribute\AttributeType\CheckboxAttributeType;
-use Sylius\Component\Attribute\AttributeType\DateAttributeType;
-use Sylius\Component\Attribute\AttributeType\IntegerAttributeType;
 use Sylius\Component\Attribute\AttributeType\TextareaAttributeType;
 use Sylius\Component\Attribute\AttributeType\TextAttributeType;
 use Sylius\Component\Attribute\Model\AttributeValueInterface;
@@ -57,6 +55,10 @@ private function getValue(Attribute $attribute)
     {
         $value = $attribute->data();
 
+        if (is_int($value) || is_float($value)) {
+            return (string) $value;
+        }
+
         if (!is_string($value)) {
             return $value;
         }

diff --git a/src/Projector/TaxonProjector.php b/src/Projector/TaxonProjector.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Sylake\SyliusConsumerPlugin\Projector;
 
 use Psr\Log\LoggerInterface;

diff --git a/src/SylakeSyliusConsumerPlugin.php b/src/SylakeSyliusConsumerPlugin.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Sylake\SyliusConsumerPlugin;
 
 use Sylius\Bundle\CoreBundle\Application\SyliusPluginTrait;

diff --git a/tests/Application/app/AppKernel.php b/tests/Application/app/AppKernel.php
@@ -1,11 +1,10 @@
 <?php
 
+declare(strict_types=1);
+
 use Sylius\Bundle\CoreBundle\Application\Kernel;
 use Symfony\Component\Config\Loader\LoaderInterface;
 
-/**
- * @author Kamil Kokot <kamil@kokot.me>
- */
 class AppKernel extends Kernel
 {
     /**

diff --git a/tests/Application/app/autoload.php b/tests/Application/app/autoload.php
@@ -1,7 +1,9 @@
 <?php
 
-use Doctrine\Common\Annotations\AnnotationRegistry;
+declare(strict_types=1);
+
 use Composer\Autoload\ClassLoader;
+use Doctrine\Common\Annotations\AnnotationRegistry;
 
 /** @var ClassLoader $loader */
 $loader = require __DIR__ . '/../../../vendor/autoload.php';

diff --git a/tests/DependencyInjection/ExtensionTest.php b/tests/DependencyInjection/ExtensionTest.php
@@ -1,13 +1,12 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Tests\Sylake\SyliusConsumerPlugin\DependencyInjection;
 
 use Matthias\SymfonyDependencyInjectionTest\PhpUnit\AbstractExtensionTestCase;
 use Sylake\SyliusConsumerPlugin\DependencyInjection\SylakeSyliusConsumerExtension;
 
-/**
- * @author Kamil Kokot <kamil@kokot.me>
- */
 final class ExtensionTest extends AbstractExtensionTestCase
 {
     /**

diff --git a/tests/Functional/AssociationTypeSynchronizationTest.php b/tests/Functional/AssociationTypeSynchronizationTest.php
@@ -1,19 +1,13 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Tests\Sylake\SyliusConsumerPlugin\Functional;
 
-use Doctrine\Common\DataFixtures\Purger\ORMPurger;
-use Doctrine\ORM\EntityManagerInterface;
-use OldSound\RabbitMqBundle\RabbitMq\ConsumerInterface;
-use PhpAmqpLib\Message\AMQPMessage;
 use PHPUnit\Framework\Assert;
 use Sylius\Component\Product\Model\ProductAssociationTypeInterface;
 use Sylius\Component\Product\Repository\ProductAssociationTypeRepositoryInterface;
-use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 
-/**
- * @author Kamil Kokot <kamil@kokot.me>
- */
 final class AssociationTypeSynchronizationTest extends SynchronizationTestCase
 {
     /**