Merge pull request #262 from subscribepro/175-fix-phpstan-errors-level-1

#175 Fix phpstan errors level 1

Block/Adminhtml/Order/Create/Items/Grid.php

@@ -2,6 +2,7 @@
 
 namespace Swarming\SubscribePro\Block\Adminhtml\Order\Create\Items;
 
+use Magento\Backend\Model\Session\Quote;
 use Magento\Catalog\Api\Data\ProductInterface;
 use Magento\CatalogInventory\Api\StockRegistryInterface;
 use Magento\CatalogInventory\Api\StockStateInterface;
@@ -30,9 +31,14 @@ class Grid extends \Magento\Sales\Block\Adminhtml\Order\Create\Items\Grid
      */
     protected $platformProductManager;
 
+    /**
+     * @var Quote
+     */
+    protected Quote $sessionQuote;
+
     /**
      * @param \Magento\Backend\Block\Template\Context $context
-     * @param \Magento\Backend\Model\Session\Quote $sessionQuote
+     * @param Quote $sessionQuote
      * @param \Magento\Sales\Model\AdminOrder\Create $orderCreate
      * @param PriceCurrencyInterface $priceCurrency
      * @param \Magento\Wishlist\Model\WishlistFactory $wishlistFactory
@@ -50,7 +56,7 @@ class Grid extends \Magento\Sales\Block\Adminhtml\Order\Create\Items\Grid
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
-        \Magento\Backend\Model\Session\Quote $sessionQuote,
+        Quote $sessionQuote,
         \Magento\Sales\Model\AdminOrder\Create $orderCreate,
         PriceCurrencyInterface $priceCurrency,
         \Magento\Wishlist\Model\WishlistFactory $wishlistFactory,

Block/Adminhtml/System/Config/TestConnection.php

@@ -11,6 +11,11 @@ class TestConnection extends PlatformField
      */
     protected $_template = 'system/config/test_connection.phtml';
 
+    /**
+     * @var string
+     */
+    protected string $_htmlId;
+
     /**
      * @param \Magento\Framework\Data\Form\Element\AbstractElement $element
      * @return string
@@ -80,4 +85,15 @@ public function getWebsiteCode()
     {
         return $this->getRequest()->getParam('website', '');
     }
+
+    /**
+     * Set html id
+     *
+     * @param string $htmlId
+     * @return void
+     */
+    public function setHtmlId(string $htmlId): void
+    {
+        $this->_htmlId = $htmlId;
+    }
 }

Block/Customer/SubscriptionsDirectoryDataProcessor.php

@@ -2,9 +2,10 @@
 
 namespace Swarming\SubscribePro\Block\Customer;
 
+use Magento\Checkout\Block\Checkout\LayoutProcessorInterface;
 use Magento\Directory\Helper\Data as DirectoryHelper;
+use Magento\Directory\Model\ResourceModel\Region\CollectionFactory;
 use Magento\Framework\App\ObjectManager;
-use Magento\Store\Api\StoreResolverInterface;
 use Magento\Store\Model\StoreManagerInterface;
 
 /**
@@ -13,7 +14,7 @@
  * This class adds various country and region dictionaries to checkout page.
  * This data can be used by other UI components during checkout flow.
  */
-class SubscriptionsDirectoryDataProcessor implements \Magento\Checkout\Block\Checkout\LayoutProcessorInterface
+class SubscriptionsDirectoryDataProcessor implements LayoutProcessorInterface
 {
     /**
      * @var array
@@ -26,12 +27,12 @@ class SubscriptionsDirectoryDataProcessor implements \Magento\Checkout\Block\Che
     protected $regionOptions;
 
     /**
-     * @var \Magento\Directory\Model\ResourceModel\Region\CollectionFactory
+     * @var CollectionFactory
      */
     protected $regionCollectionFactory;
 
     /**
-     * @var \Magento\Directory\Model\ResourceModel\Region\CollectionFactory
+     * @var CollectionFactory
      */
     protected $countryCollectionFactory;
 
@@ -47,16 +48,14 @@ class SubscriptionsDirectoryDataProcessor implements \Magento\Checkout\Block\Che
 
     /**
      * @param \Magento\Directory\Model\ResourceModel\Country\CollectionFactory $countryCollection
-     * @param \Magento\Directory\Model\ResourceModel\Region\CollectionFactory $regionCollection
-     * @param StoreResolverInterface $storeResolver @deprecated
+     * @param CollectionFactory $regionCollection
      * @param DirectoryHelper $directoryHelper
-     * @param StoreManagerInterface $storeManager
+     * @param StoreManagerInterface|null $storeManager
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function __construct(
         \Magento\Directory\Model\ResourceModel\Country\CollectionFactory $countryCollection,
-        \Magento\Directory\Model\ResourceModel\Region\CollectionFactory $regionCollection,
-        StoreResolverInterface $storeResolver,
+        CollectionFactory $regionCollection,
         DirectoryHelper $directoryHelper,
         StoreManagerInterface $storeManager = null
     ) {

Block/Product/Subscription.php

@@ -64,7 +64,6 @@ class Subscription extends \Magento\Catalog\Block\Product\AbstractProduct
      * @param \Magento\Tax\Api\TaxCalculationInterface $taxCalculation
      * @param \Swarming\SubscribePro\Ui\ConfigProvider\PriceConfig $priceConfigProvider
      * @param \Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency
-     * @param \Magento\Framework\Locale\FormatInterface $localeFormat
      * @param \Swarming\SubscribePro\Helper\Product $productHelper
      * @param \Magento\Checkout\Model\Cart $cart
      * @param \Swarming\SubscribePro\Helper\QuoteItem $quoteItemHelper
@@ -78,7 +77,6 @@ public function __construct(
         \Magento\Tax\Api\TaxCalculationInterface $taxCalculation,
         \Swarming\SubscribePro\Ui\ConfigProvider\PriceConfig $priceConfigProvider,
         \Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency,
-        \Magento\Framework\Locale\FormatInterface $localeFormat,
         \Swarming\SubscribePro\Helper\Product $productHelper,
         \Magento\Checkout\Model\Cart $cart,
         \Swarming\SubscribePro\Helper\QuoteItem $quoteItemHelper,

Block/Vault/Edit/CardExpiration.php

@@ -2,7 +2,9 @@
 
 namespace Swarming\SubscribePro\Block\Vault\Edit;
 
-class CardExpiration extends \Swarming\SubscribePro\Block\Vault\CardRenderer
+use Swarming\SubscribePro\Block\Vault\CardRenderer;
+
+class CardExpiration extends CardRenderer
 {
     /**
      * @return string
@@ -14,7 +16,7 @@ public function getJsLayout()
     }
 
     /**
-     * @return string[]
+     * @return void
      */
     protected function updateJsLayout()
     {

Controller/Applepay/PaymentAuthorized.php

@@ -96,9 +96,6 @@ public function execute()
         try {
             $this->implementExecute($result);
         } catch (LocalizedException $e) {
-            if (isset($quoteId)) {
-                $this->logger->error('QuoteId: ' . $quoteId);
-            }
             $this->logger->error($e->getMessage());
 
             $response = [

Controller/Applepay/ShippingList.php

@@ -154,7 +154,7 @@ public function execute()
         // Build response
         $response = [
             'success' => true,
-            'newShippingMethods'    => ($shippingMethodsForApplePay)?? [],
+            'newShippingMethods'    => $shippingMethodsForApplePay ?: [],
             'newTotal'              => $grandTotalForApplePay,
             'newLineItems'          => $rowItemsApplePay,
         ];

Gateway/Config/ApplePayConfigProvider.php

@@ -47,6 +47,6 @@ public function getApiBaseUrl($websiteCode = null): string
     {
         $value = $this->generalConfig->getBaseUrl($websiteCode);
 
-        return ($value)?? '';
+        return $value ?: '';
     }
 }

Helper/OrderItem.php

@@ -130,7 +130,7 @@ protected function getAdditionalOptions($orderItem)
     /**
      * @param \Magento\Sales\Model\Order\Item $orderItem
      * @param array $additionalOptions
-     * @return array
+     * @return void
      */
     protected function setAdditionalOptions($orderItem, $additionalOptions)
     {

Helper/QuoteItem.php

@@ -154,15 +154,13 @@ public function getSubscriptionParams($item)
     {
         $buyRequest = $item->getOptionByCode('info_buyRequest');
         $buyRequest = $buyRequest ? json_decode($buyRequest->getValue(), true) : [];
-        return isset($buyRequest[OptionProcessor::KEY_SUBSCRIPTION_OPTION])
-            ? $buyRequest[OptionProcessor::KEY_SUBSCRIPTION_OPTION]
-            : [];
+        return $buyRequest[OptionProcessor::KEY_SUBSCRIPTION_OPTION] ?? [];
     }
 
     /**
      * @param \Magento\Quote\Model\Quote\Item\AbstractItem $item
      * @param array $params
-     * @return array
+     * @return void
      */
     protected function setSubscriptionParams($item, $params)
     {

Model/ApplePay/PaymentRequestConfig.php

@@ -295,7 +295,7 @@ public function getAccessToken()
         } catch (LocalizedException $e) {
             $this->logger->error('QuoteId: ' . $quote->getId());
             $this->logger->error('WebsiteId: ' . $websiteId);
-            if ($subscriberProCustomerId) {
+            if ($customerId && $subscriberProCustomerId) {
                 $this->logger->error('SubscriberProCustomerId: ' . $subscriberProCustomerId);
             }
             $this->logger->error($e->getMessage());

Model/Rule/Condition/Base.php

@@ -27,6 +27,11 @@ class Base extends \Magento\Rule\Model\Condition\AbstractCondition
      */
     protected $discountRuleHelper;
 
+    /**
+     * @var array
+     */
+    protected array $attribute_option;
+
     /**
      * Constructor
      * @param Context $context
@@ -155,4 +160,13 @@ protected function subscriptionOptionsAreFalse(\Magento\Framework\Model\Abstract
             $this->quoteItemHelper->getSubscriptionParams($model)
         );
     }
+
+    /**
+     * @param array $attributes
+     * @return void
+     */
+    protected function setAttributeOption(array $attributes): void
+    {
+        $this->attribute_option = $attributes;
+    }
 }

Model/Rule/Condition/Interval.php

@@ -24,6 +24,6 @@ public function loadAttributeOptions()
     public function validate(\Magento\Framework\Model\AbstractModel $model)
     {
         $interval = $this->discountRuleHelper->validateInterval($this->quoteItemHelper->getSubscriptionParams($model));
-        return false === $interval ? false : $this->validateAttribute($interval);
+        return !(false === $interval) && $this->validateAttribute($interval);
     }
 }

Plugin/ShipperHQ/ShipperMapperPlugin.php

@@ -34,7 +34,7 @@ public function __construct(
      * @return array
      */
     public function aroundPopulateAttributes(
-        \ShipperHQ\Shipper\Model\Carrier\Processor\ShipperMapper $mapper,
+        \ShipperHQ\Shipper\Model\Carrier\Processor\ShipperMapper $mapper, /* @phpstan-ignore-line */
         callable $proceed,
         $reqdAttributeNames,
         $item
@@ -43,6 +43,7 @@ public function aroundPopulateAttributes(
 
         if ($recurringShippingCode = $this->determineSubscriptionCode($item)) {
             $shippingGroup = '';
+            $shippingKey = '';
             $shippingGroupSet = false;
 
             if (is_array($attributes)) {
@@ -55,7 +56,7 @@ public function aroundPopulateAttributes(
                 }
                 if (!$shippingGroupSet) {
                     $attributes[] = ['name' => 'shipperhq_shipping_group', 'value' => $recurringShippingCode];
-                } else {
+                } else{
                     $attributes[$shippingKey] = ['name' => 'shipperhq_shipping_group', 'value' => $shippingGroup];
                 }
             }