20.53.0 SHQ23-531 Add support for PHP8.2

Author: wsajosh

CHANGELOG-PUBLIC.md

@@ -756,3 +756,7 @@ SHQ23-55 Auto renew auth token for uShip / Shipping Insights if its about to exp
 SHQ23-429 Resolve issue with store price using incorrect value when coupon code entered and non base currency selected
 
 
+## 20.53.0 (2023-05-11)
+SHQ23-531 Add support for PHP8.2
+
+

CHANGELOG.MD

@@ -756,3 +756,7 @@ SHQ23-55 Auto renew auth token for uShip / Shipping Insights if its about to exp
 SHQ23-429 Resolve issue with store price using incorrect value when coupon code entered and non base currency selected
 
 
+## 20.53.0 (2023-05-11)
+SHQ23-531 Add support for PHP8.2
+
+

composer.json

@@ -2,7 +2,7 @@
   "name": "shipperhq/module-shipper",
   "description": "Magento Shipping integration with ShipperHQ",
   "type": "magento2-module",
-  "version": "20.52.1",
+  "version": "20.53.0",
   "license": [
     "OSL-3.0",
     "AFL-3.0"

src/Helper/Data.php

@@ -81,7 +81,7 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
     private $baseCurrencyRate;
     private $storeId;
     /**
-     * @var Mage_Sales_Model_Quote
+     * @var \Magento\Quote\Model\Quote
      */
     private $quote;
     /**
@@ -123,7 +123,6 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
     private $checkoutHelper;
 
     public function __construct(
-        Config $shipperConfig,
         \Magento\Eav\Model\Config $eavConfig,
         \Magento\Framework\Registry $registry,
         \Magento\Framework\App\Helper\Context $context,
@@ -136,7 +135,6 @@ public function __construct(
         \Magento\Checkout\Helper\Data $checkoutHelper
     ) {
         parent::__construct($context);
-        $this->shipperConfig = $shipperConfig;
         $this->eavConfig = $eavConfig;
         $this->registry = $registry;
         $this->storeManager = $storeManager;

src/Helper/PostOrder.php

@@ -31,6 +31,7 @@
 use ShipperHQ\Shipper\Model\Carrier\Processor\ShipperMapper;
 use ShipperHQ\WS\Client\WebServiceClientFactory;
 use ShipperHQ\WS\PostOrder\Placeorder\Request\PlaceOrderRequestFactory;
+use ShipperHQ\WS\Shared\BasicAddress;
 use ShipperHQ\WS\Shared\BasicAddressFactory;
 use ShipperHQ\Shipper\Helper\CarrierGroup;
 
@@ -43,27 +44,42 @@ class PostOrder
      * @var LogAssist
      */
     private $shipperLogger;
+
     /**
-     * @var Client\WebServiceClientFactory
+     * @var \ShipperHQ\WS\Client\WebServiceClientFactory
      */
     private $shipperWSClientFactory;
+
     /**
-     * @var ShipperHQ\WS\PostOrder\Placeorder\Request
+     * @var \ShipperHQ\WS\PostOrder\Placeorder\Request\PlaceOrderRequestFactory
      */
     private $placeOrderRequestFactory;
+
     /**
      * @var Data
      */
     private $shipperDataHelper;
+
     /**
      * @var \ShipperHQ\Shipper\Helper\CarrierGroup
      */
     private $carrierGroupHelper;
+
     /**
-     * @var WS\Shared\BasicAddressFactory
+     * @var \ShipperHQ\WS\Shared\BasicAddressFactory
      */
     private $basicAddressFactory;
 
+    /**
+     * @var \ShipperHQ\Shipper\Helper\Rest
+     */
+    private $restHelper;
+
+    /**
+     * @var \ShipperHQ\Shipper\Model\Carrier\Processor\ShipperMapper
+     */
+    private $shipperMapper;
+
     /**
      * PostOrder constructor.
      *
@@ -74,6 +90,7 @@ class PostOrder
      * @param ShipperMapper            $shipperMapper
      * @param Data                     $shipperDataHelper
      * @param BasicAddressFactory      $basicAddressFactory
+     * @param CarrierGroup             $carrierGroupHelper
      */
     public function __construct(
         LogAssist                $shipperLogger,
@@ -202,9 +219,9 @@ private function getPlaceorderRequest($order, $rate)
     /**
      * Get values for recipient
      *
-     * @param $request
+     * @param $shippingAddress
      *
-     * @return array
+     * @return BasicAddress
      */
     private function getRecipient($shippingAddress)
     {

src/Helper/Rest.php

@@ -1,31 +1,24 @@
 <?php
 /**
- *
  * ShipperHQ Shipping Module
- *
  * NOTICE OF LICENSE
- *
  * This source file is subject to the Open Software License (OSL 3.0)
  * that is bundled with this package in the file LICENSE.txt.
  * It is also available through the world-wide-web at this URL:
  * http://opensource.org/licenses/osl-3.0.php
  * If you did not receive a copy of the license and are unable to
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
- *
  * DISCLAIMER
- *
  * Do not edit or add to this file if you wish to upgrade Magento to newer
  * versions in the future. If you wish to customize Magento for your
  * needs please refer to http://www.magentocommerce.com for more information.
- *
  * Shipper HQ Shipping
- *
- * @category ShipperHQ
- * @package ShipperHQ_Shipping_Carrier
+ * @category  ShipperHQ
+ * @package   ShipperHQ_Shipping_Carrier
  * @copyright Copyright (c) 2015 Zowta LLC (http://www.ShipperHQ.com)
- * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
- * @author ShipperHQ Team sales@shipperhq.com
+ * @license   http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ * @author    ShipperHQ Team sales@shipperhq.com
  */
 
 /**
@@ -36,29 +29,31 @@
 namespace ShipperHQ\Shipper\Helper;
 
 use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Store\Model\ScopeInterface;
 
 /**
  * Shipping data helper
  */
 class Rest
 {
+    /**
+     * @var string
+     */
     private static $wsTimeout;
 
     /**
      * @var \ShipperHQ\Lib\Helper\Rest
      */
     private $restHelper;
+
     /**
      * @var ScopeConfigInterface
      */
     private $config;
-    /**
-     * @var Data $shipperHelperData
-     */
 
     /**
      * @param \ShipperHQ\Lib\Helper\Rest $restHelper
-     * @param ScopeConfigInterface $config
+     * @param ScopeConfigInterface       $config
      */
     public function __construct(
         \ShipperHQ\Lib\Helper\Rest $restHelper,
@@ -78,29 +73,28 @@ private function getGatewayUrl()
     {
         $live = $this->cleanUpUrl($this->config->getValue(
             'carriers/shipper/live_url',
-            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+            ScopeInterface::SCOPE_STORE
         ));
-
         $test = $this->cleanUpUrl($this->config->getValue(
             'carriers/shipper/url',
-            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+            ScopeInterface::SCOPE_STORE
         ));
+
         return $this->config->isSetFlag(
             'carriers/shipper/sandbox_mode',
-            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+            ScopeInterface::SCOPE_STORE
         ) ? $test : $live;
     }
 
     /**
      * Returns place order endpoint
-     *
      * @return string
      */
     private function getPostOrderGatewayUrl()
     {
         return $this->cleanUpUrl($this->config->getValue(
             'carriers/shipper/postorder_rest_url',
-            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+            ScopeInterface::SCOPE_STORE
         ));
     }
 
@@ -111,6 +105,7 @@ private function cleanUpUrl($urlStart)
         if ($lastChar != '/') {
             $url .= '/';
         }
+
         return $url;
     }
 
@@ -144,7 +139,6 @@ public function getPlaceorderGatewayUrl()
     /*
      * Retrieve configured timeout for webservice
      */
-
     public function getAttributeGatewayUrl()
     {
         return $this->restHelper->getAttributeGatewayUrl();
@@ -160,13 +154,14 @@ public function getWebserviceTimeout()
         if (self::$wsTimeout == null) {
             $timeout = $this->config->getValue(
                 'carriers/shipper/ws_timeout',
-                \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+                ScopeInterface::SCOPE_STORE
             );
             if (!is_numeric($timeout)) {
                 $timeout = 30;
             }
             self::$wsTimeout = $timeout;
         }
+
         return self::$wsTimeout;
     }
 }

src/Model/Carrier/Processor/CarrierConfigHandler.php

@@ -30,23 +30,32 @@
 
 namespace ShipperHQ\Shipper\Model\Carrier\Processor;
 
+use Magento\Backend\Block\Template\Context;
+use Magento\Config\Model\ResourceModel\Config;
+use ShipperHQ\Shipper\Helper\Data;
+
 class CarrierConfigHandler
 {
     /**
-     * @var \ShipperHQ\Shipper\Helper\Data
+     * @var Data
      */
     private $shipperDataHelper;
 
     /**
-     * @var \Magento\Config\Model\ResourceModel\Config
+     * @var Config
      */
     private $resourceConfig;
 
+    /**
+     * @var \Magento\Store\Model\StoreManagerInterface
+     */
+    private $storeManager;
+
 
     public function __construct(
-        \Magento\Config\Model\ResourceModel\Config $resourceConfig,
-        \Magento\Backend\Block\Template\Context $context,
-        \ShipperHQ\Shipper\Helper\Data $shipperDataHelper
+        Config $resourceConfig,
+        Context $context,
+        Data $shipperDataHelper
     ) {
         $this->shipperDataHelper = $shipperDataHelper;
         $this->storeManager = $context->getStoreManager();
@@ -56,7 +65,7 @@ public function __construct(
     public function saveCarrierResponseDetails($carrierRate, $carrierGroupDetail = null)
     {
         $carrierCode = $carrierRate['carrierCode'];
-        $sort = isset($carrierRate['sortOrder']) ? $carrierRate['sortOrder'] : false;
+        $sort = $carrierRate['sortOrder'] ?? false;
         $this->dynamicCarrierConfig($carrierCode, $carrierRate['carrierTitle'], $sort);
 
         $this->populateCarrierLevelDetails((array)$carrierRate, $carrierGroupDetail);

src/Model/Carrier/Processor/ListingMapper.php

@@ -70,6 +70,11 @@ class ListingMapper
      */
     private $mediaDirectory;
 
+    /**
+     * @var \Magento\Store\Model\StoreManagerInterface
+     */
+    private $storeManager;
+
     private static $dim_height = 'ship_height';
     private static $dim_width = 'ship_width';
     private static $dim_length = 'ship_length';

src/Model/Carrier/Shipper.php

@@ -185,6 +185,11 @@ class Shipper extends AbstractCarrier implements CarrierInterface
      */
     private $directoryHelper;
 
+    /**
+     * @var \ShipperHQ\Shipper\Model\Carrier\Processor\ShipperMapper
+     */
+    private $shipperMapper;
+
     /**
      * @param \ShipperHQ\Shipper\Helper\Data                              $shipperDataHelper
      * @param \ShipperHQ\Shipper\Helper\Rest                              $restHelper

src/Setup/Patch/Data/InstallAvailabilityDateAttribute.php

@@ -26,6 +26,11 @@ class InstallAvailabilityDateAttribute implements DataPatchInterface, PatchRever
      */
     private $moduleDataSetup;
 
+    /**
+     * @var \Magento\Catalog\Setup\CategorySetup
+     */
+    private $categorySetupFactory;
+
     /**
      * @param ModuleDataSetupInterface $moduleDataSetup
      */

src/Setup/Patch/Data/UpdateMagentoVersionInConfig.php

@@ -25,6 +25,11 @@ class UpdateMagentoVersionInConfig implements DataPatchInterface, PatchRevertabl
      */
     private $configStorageWriter;
 
+    /**
+     * @var ProductMetadata
+     */
+    private $productMetadata;
+
     /**
      * @param ModuleDataSetupInterface $moduleDataSetup
      */

src/Setup/Patch/Schema/AddUniqueIndexToDetailGrid.php

@@ -26,9 +26,9 @@ class AddUniqueIndexToDetailGrid implements SchemaPatchInterface
     private static $connectionName = 'sales';
 
     /**
-     * @var ModuleDataSetupInterface $moduleDataSetup
+     * @var SchemaSetupInterface
      */
-    private $moduleDataSetup;
+    private $schemaSetup;
 
     /**
      * @param ModuleDataSetupInterface $moduleDataSetup

src/composer.json

@@ -2,7 +2,7 @@
   "name": "shipperhq/module-shipper",
   "description": "Magento Shipping integration with ShipperHQ",
   "type": "magento2-module",
-  "version": "20.52.1",
+  "version": "20.53.0",
   "license": [
     "OSL-3.0",
     "AFL-3.0"

src/etc/config.xml

@@ -67,7 +67,7 @@
                 <ws_timeout>30</ws_timeout>
                 <use_cache>0</use_cache>
                 <always_use_cache>1</always_use_cache>
-                <extension_version>20.52.1</extension_version>
+                <extension_version>20.53.0</extension_version>
                 <allowed_methods></allowed_methods>
                 <magento_version></magento_version>
                 <cache_timeout>300</cache_timeout>