EC-580 : Deprecated version of PHP (#56)

* EC-580 : Deprecated version of PHP * EC-580 : Deprecated version of PHP * EC-580 : Deprecated version of PHP * EC-580 : Deprecated version of PHP * EC-580 : Updated version for Release
Ometria · Mar 14, 2024 · de58b18 · de58b18
1 parent 5587b6b
commit de58b18
Show file tree

Hide file tree

Showing 29 changed files with 51 additions and 14 deletions.
diff --git a/app/code/Ometria/AbandonedCarts/etc/module.xml b/app/code/Ometria/AbandonedCarts/etc/module.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0"?>
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Ometria_AbandonedCarts" setup_version="2.6.4"/>
+    <module name="Ometria_AbandonedCarts" setup_version="2.6.5"/>
 </config>
diff --git a/app/code/Ometria/Api/Controller/V1/Attribute/Types.php b/app/code/Ometria/Api/Controller/V1/Attribute/Types.php
@@ -13,6 +13,7 @@ class Types extends Base
 {
     protected $resultJsonFactory;
     protected $attributeCollectionFactory;
+    protected $context;
 
     public function __construct(
         Context $context,

diff --git a/app/code/Ometria/Api/Controller/V1/Attributes.php b/app/code/Ometria/Api/Controller/V1/Attributes.php
@@ -6,7 +6,8 @@ class Attributes extends Base
 {
     protected $resultJsonFactory;
     protected $attributes;
-
+    protected $context;
+
 	public function __construct(
 		\Magento\Framework\App\Action\Context $context,
 		\Magento\Framework\Controller\Result\JsonFactory $resultJsonFactory,

diff --git a/app/code/Ometria/Api/Controller/V1/Categories.php b/app/code/Ometria/Api/Controller/V1/Categories.php
@@ -13,6 +13,8 @@
 class Categories extends Base
 {
     protected $resultJsonFactory;
+    protected $treeFactory;
+    protected $context;
 
     public function __construct(
         Context $context,

diff --git a/app/code/Ometria/Api/Controller/V1/Customers.php b/app/code/Ometria/Api/Controller/V1/Customers.php
@@ -49,6 +49,9 @@ class Customers extends Base
 
     /** @var array */
     private $genderOptions;
+    private $apiHelperServiceFilterable;
+    private $customerRepository;
+    protected $context;
 
     public function __construct(
         Context $context,

diff --git a/app/code/Ometria/Api/Controller/V1/Get/Settings.php b/app/code/Ometria/Api/Controller/V1/Get/Settings.php
@@ -7,6 +7,8 @@ class Settings extends Base
     protected $resultJsonFactory;    
     protected $helperConfig;
     protected $resourceConfig;
+    protected $cacheTypeList;
+    protected $context;
 	public function __construct(
 		\Magento\Framework\App\Action\Context $context,
 		\Magento\Framework\Controller\Result\JsonFactory $resultJsonFactory,

diff --git a/app/code/Ometria/Api/Controller/V1/Magento/Info.php b/app/code/Ometria/Api/Controller/V1/Magento/Info.php
@@ -13,6 +13,7 @@ class Info extends Base
     protected $scopeConfig;
     protected $app;
     protected $helperMetadata;
+    protected $context;
 
     public function __construct(
         \Magento\Framework\App\Action\Context $context,

diff --git a/app/code/Ometria/Api/Controller/V1/OrderIds.php b/app/code/Ometria/Api/Controller/V1/OrderIds.php
@@ -34,6 +34,7 @@ class OrderIds extends Base
 
     /** @var JsonFactory */
     private $resultJsonFactory;
+    protected $context;
 
     /**
      * @param Context $context

diff --git a/app/code/Ometria/Api/Controller/V1/Orders.php b/app/code/Ometria/Api/Controller/V1/Orders.php
@@ -46,6 +46,10 @@ class Orders extends Base
     /** @var Config */
     protected $helperConfig;
 
+    /** @var OrderRepositoryInterface */
+    protected $orderRepository;
+    protected $context;
+
     /**
      * @param Context $context
      * @param JsonFactory $resultJsonFactory

diff --git a/app/code/Ometria/Api/Controller/V1/Products.php b/app/code/Ometria/Api/Controller/V1/Products.php
@@ -60,6 +60,7 @@ class Products extends Base
     */
     protected $needsVisibilityJoin;
     protected $productTypeNames;
+    protected $metadataServiceInterface;
 
     /**
      * Cache of child:parent relationships
@@ -68,6 +69,7 @@ class Products extends Base
     protected $childParentConfigurableProductIds = [];
     protected $childParentBundleProductIds = [];
     protected $childParentGroupedProductIds = [];
+    protected $context;
 
     public function __construct(
 		\Magento\Framework\App\Action\Context $context,

diff --git a/app/code/Ometria/Api/Controller/V1/Salesrules/Items.php b/app/code/Ometria/Api/Controller/V1/Salesrules/Items.php
@@ -7,7 +7,8 @@ class Items extends Base
     protected $resultJsonFactory;
     protected $ruleRepository;
     protected $apiHelperServiceFilterable;
-
+    protected $context;
+
 	public function __construct(
 		\Magento\Framework\App\Action\Context $context,
 		\Magento\Framework\Controller\Result\JsonFactory $resultJsonFactory,

diff --git a/app/code/Ometria/Api/Controller/V1/Salesrules/Items/Coupons.php b/app/code/Ometria/Api/Controller/V1/Salesrules/Items/Coupons.php
@@ -6,6 +6,8 @@ class Coupons extends Base
 {
     protected $resultJsonFactory;
     protected $couponRepository;
+    protected $context;
+    protected $apiHelperServiceFilterable;
 	public function __construct(
 		\Magento\Framework\App\Action\Context $context,
 		\Magento\SalesRule\Model\CouponRepository $couponRepository,		

diff --git a/app/code/Ometria/Api/Controller/V1/Stores.php b/app/code/Ometria/Api/Controller/V1/Stores.php
@@ -6,6 +6,8 @@ class Stores extends Base
 {
     protected $resultJsonFactory;
     protected $storeFactory;
+    protected $scopeConfig;
+    protected $context;
 	public function __construct(
 		\Magento\Framework\App\Action\Context $context,
 		\Magento\Framework\Controller\Result\JsonFactory $resultJsonFactory,

diff --git a/app/code/Ometria/Api/Controller/V1/Subscribers.php b/app/code/Ometria/Api/Controller/V1/Subscribers.php
@@ -11,6 +11,7 @@ class Subscribers extends Base
     protected $searchCriteria;
     protected $customerCollection;
     protected $customerDataHelper;
+    protected $context;
 
 	public function __construct(
 		\Magento\Framework\App\Action\Context $context,

diff --git a/app/code/Ometria/Api/Controller/V1/Version.php b/app/code/Ometria/Api/Controller/V1/Version.php
@@ -7,6 +7,7 @@ class Version extends Base
 {
     protected $resultJsonFactory;
     protected $moduleResource;
+    protected $context;
     const VERSION_STRING = 'Ometria_Magento2_Extension';
 	public function __construct(
 		\Magento\Framework\App\Action\Context $context,

diff --git a/app/code/Ometria/Api/Helper/Filter/V1/Service.php b/app/code/Ometria/Api/Helper/Filter/V1/Service.php
@@ -9,6 +9,7 @@ class Service
     protected $searchCriteriaBuilder;
     protected $filterBuilder;
     protected $filterGroupBuilder;
+    protected $request;
 
     public function __construct(
         \Magento\Framework\Api\SearchCriteriaBuilder $searchCriteriaBuilder,

diff --git a/app/code/Ometria/Api/Helper/Service/Filterable/Service.php b/app/code/Ometria/Api/Helper/Service/Filterable/Service.php
@@ -5,16 +5,16 @@ class Service
 {
     protected $searchCriteria;
     protected $dataObjectProcessor;
+    protected $helperOmetriaApiFilter;
 
     public function __construct(
-		\Magento\Framework\Api\SearchCriteriaInterface $searchCriteria,
-		\Ometria\Api\Helper\Filter\V1\Service $helperOmetriaApiFilter,
-		\Magento\Framework\Reflection\DataObjectProcessor $dataObjectProcessor
-    )
-    {
-		$this->searchCriteria         = $searchCriteria;
-		$this->helperOmetriaApiFilter = $helperOmetriaApiFilter;
-		$this->dataObjectProcessor    = $dataObjectProcessor;
+        \Magento\Framework\Api\SearchCriteriaInterface $searchCriteria,
+        \Ometria\Api\Helper\Filter\V1\Service $helperOmetriaApiFilter,
+        \Magento\Framework\Reflection\DataObjectProcessor $dataObjectProcessor
+    ) {
+        $this->searchCriteria         = $searchCriteria;
+        $this->helperOmetriaApiFilter = $helperOmetriaApiFilter;
+        $this->dataObjectProcessor    = $dataObjectProcessor;
     }
 
     /**

diff --git a/app/code/Ometria/Api/Helper/Service/Filterable/Service/Product.php b/app/code/Ometria/Api/Helper/Service/Filterable/Service/Product.php
@@ -7,6 +7,9 @@ class Product extends \Ometria\Api\Helper\Service\Filterable\Service
 {
     protected $urlModel;
     protected $storeUrlHelper;
+    protected $dataObjectProcessor;
+    protected $helperOmetriaApiFilter;
+    protected $searchCriteria;
 
     /** @var ProductHelper */
     private $productHelper;

diff --git a/app/code/Ometria/Api/Model/ResourceModel/Product.php b/app/code/Ometria/Api/Model/ResourceModel/Product.php
@@ -10,6 +10,7 @@ class Product extends AbstractDb
 {
     /** @var MetadataPool */
     private $metadataPool;
+    protected $context;
 
     /**
      * @param Context $context

diff --git a/app/code/Ometria/Api/etc/module.xml b/app/code/Ometria/Api/etc/module.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0"?>
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Ometria_Api" setup_version="2.6.4"/>
+    <module name="Ometria_Api" setup_version="2.6.5"/>
 </config>
diff --git a/app/code/Ometria/Core/Block/Head.php b/app/code/Ometria/Core/Block/Head.php
@@ -46,6 +46,8 @@ class Head extends Template
     private $salesModelOrder;
     private $query;
     private $inventoryService;
+    private $coreHelperProduct;
+    private $salesModelOrderFactory;
 
     /**
      * @param Context $context

diff --git a/app/code/Ometria/Core/Helper/Config.php b/app/code/Ometria/Core/Helper/Config.php
@@ -11,6 +11,7 @@ class Config extends AbstractHelper
     /** @var MageConfig */
     private $coreHelperMageConfig;
     protected $logger;
+    protected $context;
 
     public function __construct(
         Context $context,

diff --git a/app/code/Ometria/Core/Helper/Cookiechannel.php b/app/code/Ometria/Core/Helper/Cookiechannel.php
@@ -20,6 +20,7 @@ class Cookiechannel extends AbstractHelper
 
     /** @var bool */
     private $cookieDidChange = false;
+    protected $context;
 
     /**
      * @param Context $context

diff --git a/app/code/Ometria/Core/Helper/Ping.php b/app/code/Ometria/Core/Helper/Ping.php
@@ -11,6 +11,7 @@ class Ping extends AbstractHelper
     const API_SOCKET_TIMEOUT = 2;
 
     protected $helperConfig;
+    protected $context;
     public function __construct(
         Context $context,
         \Ometria\Core\Helper\Config $helperConfig       

diff --git a/app/code/Ometria/Core/Helper/Product.php b/app/code/Ometria/Core/Helper/Product.php
@@ -21,6 +21,7 @@ class Product extends AbstractHelper
 
     /** @var SearchCriteriaBuilder */
     private $searchCriteriaBuilder;
+    protected $context;
 
     /**
      * @param Context $context

diff --git a/app/code/Ometria/Core/Model/Observer/Cart.php b/app/code/Ometria/Core/Model/Observer/Cart.php
@@ -13,6 +13,7 @@ class Cart
     protected $helperPing;
     protected $helperSession;
     protected $helperConfig;
+    protected $productFactory;
 
     public function __construct(
         \Ometria\Core\Helper\Product $helperProduct,

diff --git a/app/code/Ometria/Core/Model/Observer/Product.php b/app/code/Ometria/Core/Model/Observer/Product.php
@@ -15,6 +15,7 @@ class Product {
     protected $helperPing;
     protected $helperProduct;
     protected $helperRequest;
+    protected $request;
 
     /** @var ConfigurableType */
     private $configurableType;

diff --git a/app/code/Ometria/Core/etc/module.xml b/app/code/Ometria/Core/etc/module.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0"?>
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Ometria_Core" setup_version="2.6.4"/>
+    <module name="Ometria_Core" setup_version="2.6.5"/>
 </config>
diff --git a/composer.json b/composer.json
@@ -1,7 +1,7 @@
 {
     "name": "ometria/magento2",
     "type": "magento2-module",
-    "version": "2.6.4",
+    "version": "2.6.5",
     "description": "Dev composer package for Ometria Extension",
     "authors": [
         {