Fix new PhpStan errors

pimcore · Mar 3, 2022 · ce5c01f · ce5c01f
1 parent 80573c2
commit ce5c01f
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 13 deletions.
diff --git a/composer.json b/composer.json
@@ -169,8 +169,8 @@
     "codeception/codeception": "^4.1.12",
     "codeception/module-symfony": "^1.6.0",
     "codeception/phpunit-wrapper": "^9",
-    "phpstan/phpstan": "^1.4",
-    "phpstan/phpstan-symfony": "^1.1",
+    "phpstan/phpstan": "^1.4.7",
+    "phpstan/phpstan-symfony": "^1.1.7",
     "phpunit/phpunit": "^9.3",
     "spiritix/php-chrome-html2pdf": "^1.6",
     "elasticsearch/elasticsearch": "^7.11",

diff --git a/lib/Image/Adapter/Imagick.php b/lib/Image/Adapter/Imagick.php
@@ -461,7 +461,7 @@ public static function getCMYKColorProfile()
                 $path = __DIR__ . '/../icc-profiles/ISOcoated_v2_eci.icc'; // default profile
             }
 
-            if ($path && file_exists($path)) {
+            if (file_exists($path)) {
                 self::$CMYKColorProfile = file_get_contents($path);
             }
         }

diff --git a/lib/Tool/AssetsInstaller.php b/lib/Tool/AssetsInstaller.php
@@ -29,12 +29,12 @@
 class AssetsInstaller
 {
     /**
-     * @var \Closure
+     * @var \Closure|null
      */
     private $runCallback;
 
     /**
-     * @var string
+     * @var string|null
      */
     private $composerJsonSetting;
 
@@ -109,7 +109,7 @@ public function resolveOptions(array $options = [])
     }
 
     /**
-     * @param \Closure $runCallback
+     * @param \Closure|null $runCallback
      */
     public function setRunCallback(\Closure $runCallback = null)
     {

diff --git a/models/Asset/Image.php b/models/Asset/Image.php
@@ -125,10 +125,10 @@ public function detectFaces(): bool
                         list($x, $y, $width, $height) = explode(' ', $coordinates);
 
                         // percentages
-                        $Px = $x / $imageWidth * 100;
-                        $Py = $y / $imageHeight * 100;
-                        $Pw = $width / $imageWidth * 100;
-                        $Ph = $height / $imageHeight * 100;
+                        $Px = (int) $x / $imageWidth * 100;
+                        $Py = (int) $y / $imageHeight * 100;
+                        $Pw = (int) $width / $imageWidth * 100;
+                        $Ph = (int) $height / $imageHeight * 100;
 
                         $faceCoordinates[] = [
                             'x' => $Px,

diff --git a/models/DataObject/ClassDefinition/Data/Time.php b/models/DataObject/ClassDefinition/Data/Time.php
@@ -151,12 +151,12 @@ public function isEmpty($data)
      */
     private function toTime($timestamp)
     {
-        $time = @date('H:i', strtotime($timestamp));
-        if (!$time) {
+        $timestamp = strtotime($timestamp);
+        if (!$timestamp) {
             return null;
         }
 
-        return $time;
+        return date('H:i', $timestamp);
     }
 
     /**

diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -70,6 +70,11 @@ parameters:
 			count: 1
 			path: bundles/EcommerceFrameworkBundle/IndexService/ProductList/DefaultFindologic.php
 
+		-
+			message: "#^Call to function is_array\\(\\) with mixed will always evaluate to false\\.$#"
+			count: 1
+			path: bundles/EcommerceFrameworkBundle/IndexService/Worker/DefaultFindologic.php
+
 		-
 			message: "#^Negated boolean expression is always false\\.$#"
 			count: 1