PHPStan のエラーを修正

see EC-CUBE#4835
nanasess · Jan 15, 2021 · 45781e8 · 45781e8
1 parent 1ded4aa
commit 45781e8
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 3 deletions.
diff --git a/src/Eccube/Controller/Admin/Setting/Shop/MailController.php b/src/Eccube/Controller/Admin/Setting/Shop/MailController.php
@@ -24,9 +24,11 @@
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template;
 use Symfony\Component\Filesystem\Filesystem;
 use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
 use Symfony\Component\Routing\Annotation\Route;
 use Twig\Environment;
 
+
 /**
  * Class MailController
  */

diff --git a/src/Eccube/Entity/Master/AbstractMasterEntity.php b/src/Eccube/Entity/Master/AbstractMasterEntity.php
@@ -146,8 +146,7 @@ protected static function getConstantValue($name)
             throw new \InvalidArgumentException();
         }
         // see also. http://qiita.com/Hiraku/items/71e385b56dcaa37629fe
-        $class = get_class(new static());
-        $ref = new \ReflectionClass($class);
+        $ref = new \ReflectionClass(static::class);
         // クラス定数が存在していれば, クラス定数から値を取得する
         $constants = $ref->getConstants();
         if (array_key_exists($name, $constants)) {
@@ -157,6 +156,6 @@ protected static function getConstantValue($name)
         $refProperty = $ref->getProperty($name);
         $refProperty->setAccessible(true);
 
-        return $refProperty->getValue(new $class());
+        return $refProperty->getValue($ref->newInstance());
     }
 }
diff --git a/src/Eccube/Service/OrderHelper.php b/src/Eccube/Service/OrderHelper.php
@@ -91,6 +91,36 @@ class OrderHelper
      */
     protected $orderItemTypeRepository;
 
+    /**
+     * @var OrderStatusRepository
+     */
+    protected $orderStatusRepository;
+
+    /**
+     * @var DeliveryRepository
+     */
+    protected $deliveryRepository;
+
+    /**
+     * @var PaymentRepository
+     */
+    protected $paymentRepository;
+
+    /**
+     * @var DeviceTypeRepository
+     */
+    protected $deviceTypeRepository;
+
+    /**
+     * @var MobileDetector
+     */
+    protected $mobileDetector;
+
+    /**
+     * @var EntityManagerInterface
+     */
+    protected $entityManager;
+
     public function __construct(
         ContainerInterface $container,
         EntityManagerInterface $entityManager,