MAGECLOUD-5359: Patches 1.0.2 fail on magento version 2.1.4 with php …

…7.0 (#22)
magento · Feb 19, 2020 · 9c31eac · 9c31eac
1 parent 7adbf2f
commit 9c31eac
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 22 deletions.
diff --git a/Model/UrlFinder/Product.php b/Model/UrlFinder/Product.php
@@ -21,7 +21,7 @@ class Product implements CloudUrlFinderInterface
     /**
      * Product limit per store
      */
-    public const PRODUCT_LIMIT = 100;
+    const PRODUCT_LIMIT = 100;
 
     /**
      * @var UrlFixer

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

diff --git a/Test/static/Sniffs/Directives/StrictTypesSniff.php b/Test/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) : void
+    private function fix(File $phpcsFile, int $position)
     {
         // Get the fixer.
         $fixer = $phpcsFile->fixer;

diff --git a/Test/static/phpstan.neon b/Test/static/phpstan.neon
diff --git a/Test/static/static-travis.sh b/Test/static/static-travis.sh
@@ -10,8 +10,6 @@ function log() {
     printf "\nRunning %s tests:\n" "$1"
 }
 
-log "phpstan"
-./vendor/bin/phpstan analyse -c Test/static/phpstan.neon
 log "phpcs"
 ./vendor/bin/phpcs ./ --standard=Test/static/phpcs-ruleset.xml -p -n
 log "phpmd"

diff --git a/composer.json b/composer.json
@@ -2,7 +2,7 @@
   "name": "magento/magento-cloud-components",
   "description": "Cloud Components Module for Magento 2.x",
   "type": "magento2-module",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "require": {
     "php": "^7.0",
     "ext-json": "*"
@@ -14,18 +14,15 @@
   },
   "require-dev": {
     "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",