Bump version to PHPStan 1.7

- PHPStan のエラー修正
EC-CUBE · May 27, 2022 · 274cebc · 274cebc
1 parent 68db960
commit 274cebc
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 22 deletions.
diff --git a/composer.json b/composer.json
@@ -108,7 +108,7 @@
         "dama/doctrine-test-bundle": "^6.6",
         "fakerphp/faker": "^1.16",
         "mikey179/vfsstream": "^1.6",
-        "phpstan/phpstan": "^0.12",
+        "phpstan/phpstan": "^1.7",
         "symfony/browser-kit": "^5.4",
         "symfony/phpunit-bridge": "^5.4"
     },

diff --git a/composer.lock b/composer.lock
diff --git a/phpstan.neon.dist b/phpstan.neon.dist
@@ -1,6 +1,2 @@
 parameters:
   level: 1
-  ignoreErrors:
-    -
-      message: "#^Function twig_localized_date_filter not found\\.$#"
-      path: src/Eccube/Twig/Extension/IntlExtension.php
diff --git a/src/Eccube/Entity/Product.php b/src/Eccube/Entity/Product.php
@@ -417,7 +417,7 @@ public function getMainListImage()
         {
             $ProductImages = $this->getProductImage();
 
-            return empty($ProductImages) ? null : $ProductImages[0];
+            return $ProductImages->isEmpty() ? null : $ProductImages[0];
         }
 
         public function getMainFileName()

diff --git a/src/Eccube/Form/Type/Admin/OrderItemType.php b/src/Eccube/Form/Type/Admin/OrderItemType.php
@@ -310,7 +310,7 @@ public function getBlockPrefix()
      */
     protected function addErrorsIfExists(FormInterface $form, ConstraintViolationListInterface $errors)
     {
-        if (empty($errors)) {
+        if (count($errors) < 1) {
             return;
         }
 

diff --git a/src/Eccube/Service/EntityProxyService.php b/src/Eccube/Service/EntityProxyService.php
@@ -134,7 +134,7 @@ private function originalEntityPath(string $entityClassName): string
             return $originalPath;
         }
 
-        $rc = new ClassReflection($entityClassName);
+        $rc = new \ReflectionClass($entityClassName);
 
         return str_replace('\\', '/', $rc->getFileName());
     }

diff --git a/src/Eccube/Service/MailService.php b/src/Eccube/Service/MailService.php
@@ -389,7 +389,7 @@ public function sendOrderMail(Order $Order)
 
         // HTML用メールの設定
         $htmlBody = $message->getHtmlBody();
-        if (!empty($multipart)) {
+        if (!empty($htmlBody)) {
             $MailHistory->setMailHtmlBody($htmlBody);
         }
-Original file line number
+Diff line change
@@ Expand Up / @@ -310,7 +310,7 @@ public function getBlockPrefix() @@
          */
         protected function addErrorsIfExists(FormInterface $form, ConstraintViolationListInterface $errors)
         {
-            if (empty($errors)) {
+            if (count($errors) < 1) {
                 return;
             }
@@ Expand Down @@