Merge pull request #151 from magebitcom/feature/LMM-101

LMM-101 Php 8.4 adjustments

Author: IlvarsSvanda

Block/Installment/Pricing/Render/DefaultPriceBox.php

@@ -77,8 +77,8 @@ public function __construct(
         InstallmentProductRepositoryInterface $productRepository,
         SearchCriteriaBuilderFactory $criteriaBuilderFactory,
         array $data = [],
-        SalableResolverInterface $salableResolver = null,
-        MinimalPriceCalculatorInterface $minimalPriceCalculator = null
+        ?SalableResolverInterface $salableResolver = null,
+        ?MinimalPriceCalculatorInterface $minimalPriceCalculator = null
     ) {
         $this->productRepo = $productRepository;
         $this->searchCriteria = $criteriaBuilderFactory->create();

Console/Import.php

@@ -29,7 +29,7 @@ class Import extends Command
     public function __construct(
         SyncInstallments $installments,
         AppState $appState,
-        string $name = null
+        ?string $name = null
     ) {
         $this->installments = $installments;
         $this->appState = $appState;

Console/RemoveExpiredPromotionsCommand.php

@@ -25,7 +25,7 @@ class RemoveExpiredPromotionsCommand extends Command
     public function __construct(
         AppState $appState,
         RemoveExpiredPromotions $removeExpiredPromotions,
-        string $name = null
+        ?string $name = null
     ) {
         $this->appState = $appState;
         $this->removeExpiredPromotions = $removeExpiredPromotions;

Helper/Data.php

@@ -587,7 +587,7 @@ public function getLeanpayPromosVendorCode(): string
         return $this->getLeanpayPromosMFPName($storeId);
     }
 
-    public function getProductPromoCode(ProductInterface $product = null)
+    public function getProductPromoCode(?ProductInterface $product = null)
     {
         if (!$product) {
             return '';

Model/Config/Backend/Cron.php

@@ -37,8 +37,8 @@ public function __construct(
         \Magento\Framework\App\Config\ScopeConfigInterface $config,
         \Magento\Framework\App\Cache\TypeListInterface $cacheTypeList,
         \Magento\Framework\App\Config\ValueFactory $configValueFactory,
-        \Magento\Framework\Model\ResourceModel\AbstractResource $resource = null,
-        \Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
+        ?\Magento\Framework\Model\ResourceModel\AbstractResource $resource = null,
+        ?\Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
         array $data = []
     ) {
         $this->configWriter = $configWriter;

Model/InstallmentProductRepository.php

@@ -61,7 +61,7 @@ public function __construct(
         InstallmentProductInterfaceFactory                 $modelFactory,
         SearchCriteriaBuilderFactory                       $criteriaBuilderFactory,
         InstallmentProductSearchResultsInterfaceFactory    $searchResultsFactory,
-        SearchCriteria                                     $collectionProcessor = null
+        ?SearchCriteria                                     $collectionProcessor = null
     ) {
         $this->modelFactory = $modelFactory;
         $this->resourceModel = $resourceModel;

Model/InstallmentRepository.php

@@ -53,7 +53,7 @@ public function __construct(
         ResourceModel\Installment\CollectionFactory $collectionFactory,
         InstallmentInterfaceFactory $modelFactory,
         InstallmentSearchResultsInterfaceFactory $searchResultsFactory,
-        CollectionProcessorInterface $collectionProcessor = null
+        ?CollectionProcessorInterface $collectionProcessor = null
     ) {
         $this->modelFactory = $modelFactory;
         $this->resourceModel = $resourceModel;

Model/Method/Leanpay.php

@@ -168,10 +168,10 @@ public function __construct(
         Session                    $checkoutSession,
         Request                    $request,
         OrderRepositoryInterface   $orderRepository,
-        AbstractResource           $resource = null,
-        AbstractDb                 $resourceCollection = null,
+        ?AbstractResource           $resource = null,
+        ?AbstractDb                 $resourceCollection = null,
         array                      $data = [],
-        DirectoryHelper            $directory = null
+        ?DirectoryHelper            $directory = null
     ) {
         parent::__construct(
             $context,
@@ -204,7 +204,7 @@ public function __construct(
      * @return bool
      * @throws NoSuchEntityException|LocalizedException
      */
-    public function isAvailable(CartInterface $quote = null)
+    public function isAvailable(?CartInterface $quote = null)
     {
         $isActive = parent::isAvailable($quote);
 
@@ -277,7 +277,7 @@ public function initialize($paymentAction, $stateObject)
 
         $state = Order::STATE_CANCELED;
 
-        if (!$leanpayTokenData['error']) {
+        if (isset($leanpayTokenData['error']) && !$leanpayTokenData['error'] && isset($leanpayTokenData['token'])) {
             $state = Order::STATE_NEW;
             $this->checkoutSession->setToken($leanpayTokenData['token']);
         }

Model/Request.php

@@ -74,7 +74,7 @@ public function getLeanpayToken(array $additionalData = []): array
             $this->curl->post($this->helper->getTokenUrl(), $jsonData);
             $response = json_decode($this->curl->getBody(), true);
 
-            $response = array_filter($response, static function($var){return $var !== null;} );
+            $response = is_array($response) ? array_filter($response, static function($var){return $var !== null;}) : [];
 
             return array_merge($response, [
                 'error' => false

Plugin/Block/Product/ProductsListPlugin.php

@@ -28,7 +28,7 @@ public function aroundGetProductPriceHtml(
         ProductsList $subject,
         callable $proceed,
         Product $product,
-        $priceType = null,
+        ?string $priceType = null,
         $renderZone = Render::ZONE_ITEM_LIST,
         array $arguments = []
     ) {