[TASK] Raise phpstan level to 4, fix a finding

extcode · Oct 16, 2024 · 2509493 · 2509493
1 parent 7964f81
commit 2509493
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 22 deletions.
diff --git a/Build/phpstan.neon b/Build/phpstan.neon
@@ -1,7 +1,7 @@
 includes:
   - phpstan-baseline.neon
 parameters:
-  level: 3
+  level: 4
   paths:
     - ../Classes
     - ../Configuration

diff --git a/Classes/Controller/Backend/ActionController.php b/Classes/Controller/Backend/ActionController.php
@@ -26,7 +26,7 @@ protected function initializeAction(): void
                 ConfigurationManager::CONFIGURATION_TYPE_FRAMEWORK
             );
 
-        $pageId = (int)$this->request->getQueryParams()['id'] ?? 1;
+        $pageId = (int)($this->request->getQueryParams()['id'] ?? 1);
 
         BackendUtility::readPageAccess(
             $pageId,

diff --git a/Classes/Controller/Cart/CartController.php b/Classes/Controller/Cart/CartController.php
@@ -130,7 +130,6 @@ public function showAction(
 
         $currentStepHasError = false;
         if ($extbaseAttribute instanceof ExtbaseRequestParameters
-            && $extbaseAttribute->getOriginalRequestMappingResults()
             && $extbaseAttribute->getOriginalRequestMappingResults()->hasErrors()
         ) {
             $currentStepHasError = true;

diff --git a/Classes/Domain/Model/Cart/BeVariant.php b/Classes/Domain/Model/Cart/BeVariant.php
@@ -11,12 +11,8 @@
  * LICENSE file that was distributed with this source code.
  */
 
-use Psr\EventDispatcher\EventDispatcherInterface;
-
 class BeVariant
 {
-    private ?EventDispatcherInterface $eventDispatcher = null;
-
     protected ?Product $product = null;
 
     protected ?BeVariant $parentBeVariant = null;

diff --git a/Classes/Domain/Model/Cart/Cart.php b/Classes/Domain/Model/Cart/Cart.php
@@ -573,7 +573,7 @@ public function addCoupon(CartCouponInterface $coupon): int
 
     public function removeCoupon(string $couponCode): int
     {
-        if (!$this->coupons[$couponCode]) {
+        if (!isset($this->coupons[$couponCode])) {
             return -1;
         }
 
@@ -715,7 +715,7 @@ public function changeProductsQuantity(array $productQuantityArray): void
         foreach ($productQuantityArray as $productPuid => $quantity) {
             $product = $this->products[$productPuid];
 
-            if ($product) {
+            if ($product instanceof Product) {
                 if (is_array($quantity)) {
                     $this->subCount($product->getQuantity());
                     $this->subGross($product->getGross());
@@ -760,11 +760,7 @@ public function removeProductByIds(array $products): bool
         }
 
         $product = $this->products[$productId];
-        if ($product) {
-            $this->removeProduct($product, $products[$productId]);
-        } else {
-            return false;
-        }
+        $this->removeProduct($product, $products[$productId]);
 
         $this->updateServiceAttributes();
 

diff --git a/Tests/Unit/Domain/Model/Cart/BeVariantTest.php b/Tests/Unit/Domain/Model/Cart/BeVariantTest.php
@@ -526,10 +526,6 @@ protected function getAccessibleMock(
         bool $callOriginalClone = true,
         bool $callAutoload = true
     ) {
-        if ($originalClassName === '') {
-            throw new \InvalidArgumentException('$originalClassName must not be empty.', 1334701880);
-        }
-
         $mockBuilder = $this->getMockBuilder($this->buildAccessibleProxy($originalClassName))
             ->onlyMethods($methods)
             ->setConstructorArgs($arguments)

diff --git a/Tests/Unit/Domain/Model/Order/AbstractAddressTest.php b/Tests/Unit/Domain/Model/Order/AbstractAddressTest.php
@@ -660,10 +660,6 @@ protected function getAccessibleMock(
         bool $callOriginalClone = true,
         bool $callAutoload = true
     ): MockObject {
-        if ($originalClassName === '') {
-            throw new \InvalidArgumentException('$originalClassName must not be empty.', 1334701880);
-        }
-
         $mockBuilder = $this->getMockBuilder($this->buildAccessibleProxy($originalClassName))
             ->addMethods($methods)
             ->setConstructorArgs($arguments)