Resolving merge conflicts

Author: BaDos

Model/UrlFinder/Product.php

@@ -21,7 +21,7 @@ class Product implements CloudUrlFinderInterface
     /**
      * Product limit per store
      */
-    const PRODUCT_LIMIT = 100;
+    public const PRODUCT_LIMIT = 100;
 
     /**
      * @var UrlFixer

Test/Unit/Model/UrlFinderFactoryTest.php

@@ -41,7 +41,7 @@ protected function setUp()
         $this->urlFinderFactory = new UrlFinderFactory($this->objectManagerMock);
     }
 
-    public function testCreateCategoryOrCmsPageEntity()
+    public function testCreateCategoryOrCmsPageEntity(): void
     {
         $this->objectManagerMock->expects($this->once())
             ->method('create')
@@ -56,7 +56,7 @@ public function testCreateCategoryOrCmsPageEntity()
         ]);
     }
 
-    public function testCreateProductEntity()
+    public function testCreateProductEntity(): void
     {
         $this->objectManagerMock->expects($this->once())
             ->method('create')
@@ -74,7 +74,7 @@ public function testCreateProductEntity()
         ]);
     }
 
-    public function testCreateWrongType()
+    public function testCreateWrongType(): void
     {
         $this->expectException(UnexpectedValueException::class);
         $this->expectExceptionMessage('Wrong entity type.');

composer.json

@@ -17,15 +17,18 @@
     "codeception/codeception": "^2.5.3",
     "consolidation/robo": "^1.2",
     "phpmd/phpmd": "@stable",
+    "phpstan/phpstan": "^0.11",
     "phpunit/phpunit": "^6.2",
     "squizlabs/php_codesniffer": "^3.0"
   },
   "scripts": {
     "test": [
+      "@phpstan",
       "@phpcs",
       "@phpmd",
       "@phpunit"
     ],
+    "phpstan": "phpstan analyse -c test/static/phpstan.neon",
     "phpcs": "phpcs ./ --standard=test/static/phpcs-ruleset.xml -p -n",
     "phpmd": "phpmd Console xml test/static/phpmd-ruleset.xml",
     "phpunit": "phpunit --configuration Test/Unit",

tests/static/Sniffs/Directives/StrictTypesSniff.php

@@ -79,7 +79,7 @@ public function process(File $phpcsFile, $stackPtr)
      * @param File $phpcsFile
      * @param int $position
      */
-    private function fix(File $phpcsFile, int $position)
+    private function fix(File $phpcsFile, int $position) : void
     {
         // Get the fixer.
         $fixer = $phpcsFile->fixer;