Merge pull request #1 from Locastic/travis-ci-fix

Bug fixes

Author: dujesa

.travis.yml

@@ -27,8 +27,19 @@ before_install:
 install:
     - composer install --no-interaction --prefer-dist
     - (cd tests/Application && yarn install)
+    - (cd /home/travis/build/Locastic/SyliusComparerPlugin/vendor/sylius/sylius/src/Sylius/Bundle/AdminBundle && npm i gulp)
+    - (cd /home/travis/build/Locastic/SyliusComparerPlugin/vendor/sylius/sylius/src/Sylius/Bundle/ShopBundle && npm i --save-dev gulp-concat)
+    - (cd /home/travis/build/Locastic/SyliusComparerPlugin/vendor/sylius/sylius/src/Sylius/Bundle/ShopBundle && npm i --save-dev gulp-if)
+    - (cd /home/travis/build/Locastic/SyliusComparerPlugin/vendor/sylius/sylius/src/Sylius/Bundle/ShopBundle && npm i --save-dev gulp-livereload)
+    - (cd /home/travis/build/Locastic/SyliusComparerPlugin/vendor/sylius/sylius/src/Sylius/Bundle/ShopBundle && npm i --save-dev gulp-order)
+    - (cd /home/travis/build/Locastic/SyliusComparerPlugin/vendor/sylius/sylius/src/Sylius/Bundle/ShopBundle && npm i --save-dev gulp-sass)
+    - (cd /home/travis/build/Locastic/SyliusComparerPlugin/vendor/sylius/sylius/src/Sylius/Bundle/ShopBundle && npm i --save-dev gulp-sourcemaps)
+    - (cd /home/travis/build/Locastic/SyliusComparerPlugin/vendor/sylius/sylius/src/Sylius/Bundle/ShopBundle && npm i --save-dev gulp-uglify)
+    - (cd /home/travis/build/Locastic/SyliusComparerPlugin/vendor/sylius/sylius/src/Sylius/Bundle/ShopBundle && npm i --save-dev gulp-uglifycss)
+    - (cd /home/travis/build/Locastic/SyliusComparerPlugin/vendor/sylius/sylius/src/Sylius/Bundle/ShopBundle && npm i --save-dev yargs)
 
 before_script:
+    - (cd tests/Application && chmod +x bin/console)
     - (cd tests/Application && bin/console doctrine:database:create --env=test -vvv)
     - (cd tests/Application && bin/console doctrine:schema:create --env=test -vvv)
     - (cd tests/Application && bin/console assets:install web --env=test -vvv)

phpstan.neon

@@ -2,10 +2,11 @@ parameters:
     excludes_analyse:
         # Makes PHPStan crash
         - 'src/DependencyInjection/Configuration.php'
+        - 'src/Validator/Constraints/'
 
         # Test dependencies
         - 'tests/Application/app/**.php'
         - 'tests/Application/src/**.php'
 
     ignoreErrors:
-        - '/Parameter #1 $configuration of method Symfony\Component\DependencyInjection\Extension\Extension::processConfiguration() expects Symfony\Component\Config\Definition\ConfigurationInterface, Symfony\Component\Config\Definition\ConfigurationInterface|null given./'
+        - '/Parameter #1 $configuration of method Symfony\Component\DependencyInjection\Extension\Extension::processConfiguration() expects Symfony\Component\Config\Definition\ConfigurationInterface, Symfony\Component\Config\Definition\ConfigurationInterface|null given./'

src/Entity/Comparer.php

@@ -14,7 +14,7 @@ class Comparer implements ComparerInterface
     /** @var int */
     private $id;
 
-    /** @var ComparerProductInterface|null */
+    /** @var ArrayCollection */
     private $comparerProducts;
 
     /** @var ShopUserInterface */
@@ -45,6 +45,7 @@ public function hasProduct(ProductInterface $product): bool
 
     public function getProducts(): Collection
     {
+        /** @var ArrayCollection $products */
         $products = $this->comparerProducts->map(function (ComparerProductInterface $comparerProduct) {
             return $comparerProduct->getProduct();
         });

src/Factory/ComparerProductFactory.php

@@ -21,7 +21,10 @@ public function __construct(FactoryInterface $comparerProductFactory)
 
     public function createNew(): ComparerProductInterface
     {
-        return $this->comparerProductFactory->createNew();
+        /** @var ComparerProductInterface $comparerProduct */
+        $comparerProduct = $this->comparerProductFactory->createNew();
+
+        return $comparerProduct;
     }
 
     public function createForComparerAndProduct(ComparerInterface $comparer, ProductInterface $product): ComparerProductInterface

src/Request/AddProductToComparerRequest.php

@@ -14,18 +14,18 @@ final class AddProductToComparerRequest implements ComparerRequestInterface
     /** @var ComparerInterface */
     private $comparer;
 
-    public function __construct(?string $productId, ?ComparerInterface $comparer)
+    public function __construct(string $productId, ComparerInterface $comparer)
     {
         $this->productId = $productId;
         $this->comparer = $comparer;
     }
 
-    public function getComparer(): ?ComparerInterface
+    public function getComparer(): ComparerInterface
     {
         return $this->comparer;
     }
 
-    public function getProductId(): ?string
+    public function getProductId(): string
     {
         return $this->productId;
     }

src/Request/ComparerRequestInterface.php

@@ -8,7 +8,7 @@
 
 interface ComparerRequestInterface
 {
-    public function getComparer(): ?ComparerInterface;
+    public function getComparer(): ComparerInterface;
 
-    public function getProductId(): ?string;
+    public function getProductId(): string;
 }

src/Request/RemoveProductFromComparerRequest.php

@@ -14,18 +14,18 @@ final class RemoveProductFromComparerRequest implements ComparerRequestInterface
     /** @var ComparerInterface */
     private $comparer;
 
-    public function __construct(?string $productId, ?ComparerInterface $comparer)
+    public function __construct(string $productId, ComparerInterface $comparer)
     {
         $this->productId = $productId;
         $this->comparer = $comparer;
     }
 
-    public function getComparer(): ?ComparerInterface
+    public function getComparer(): ComparerInterface
     {
         return $this->comparer;
     }
 
-    public function getProductId(): ?string
+    public function getProductId(): string
     {
         return $this->productId;
     }