From 56202a4f2223befd91523657ac1e0ed3590c2950 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Pi=C4=85tek?= Date: Fri, 27 Sep 2024 08:30:07 +0200 Subject: [PATCH 1/2] remove unused Output class, update php version dependency in composer.json --- composer.json | 2 +- src/Model/Output.php | 45 -------------------------------------------- src/Model/Stores.php | 8 -------- src/etc/di.xml | 5 ----- 4 files changed, 1 insertion(+), 59 deletions(-) delete mode 100755 src/Model/Output.php diff --git a/composer.json b/composer.json index 4840fed..469bb0c 100755 --- a/composer.json +++ b/composer.json @@ -15,7 +15,7 @@ } ], "require": { - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0|~7.2.0|~7.3.10|~7.4.0|~8.1.0", + "php": ">=7.0.2", "magento/product-community-edition": "^2.1.0" }, "autoload": { diff --git a/src/Model/Output.php b/src/Model/Output.php deleted file mode 100755 index 09c492e..0000000 --- a/src/Model/Output.php +++ /dev/null @@ -1,45 +0,0 @@ -templateProcessor = $templateProcessor; - } - - /** - * @param $string - * @return string - */ - public function filterOutput($string) - { - return $this->templateProcessor->filter($string); - } -} diff --git a/src/Model/Stores.php b/src/Model/Stores.php index 08c9f47..5b94c43 100755 --- a/src/Model/Stores.php +++ b/src/Model/Stores.php @@ -85,11 +85,6 @@ class Stores extends AbstractExtensibleModel implements StockistInterface, Routa */ public $uploaderPool; - /** - * @var \Limesharp\Stockists\Model\Output - */ - public $outputProcessor; - /** * @var AbstractSource[] */ @@ -105,7 +100,6 @@ class Stores extends AbstractExtensibleModel implements StockistInterface, Routa * @param Registry $registry * @param ExtensionAttributesFactory $extensionFactory * @param AttributeValueFactory $customAttributeFactory - * @param Output $outputProcessor * @param UploaderPool $uploaderPool * @param FilterManager $filter * @param Url $urlModel @@ -119,7 +113,6 @@ public function __construct( Registry $registry, ExtensionAttributesFactory $extensionFactory, AttributeValueFactory $customAttributeFactory, - Output $outputProcessor, UploaderPool $uploaderPool, FilterManager $filter, Url $urlModel, @@ -128,7 +121,6 @@ public function __construct( AbstractResource $resource = null, AbstractDb $resourceCollection = null ) { - $this->outputProcessor = $outputProcessor; $this->uploaderPool = $uploaderPool; $this->filter = $filter; $this->urlModel = $urlModel; diff --git a/src/etc/di.xml b/src/etc/di.xml index 479d6d9..2307773 100755 --- a/src/etc/di.xml +++ b/src/etc/di.xml @@ -92,11 +92,6 @@ LimesharpStockistsStoresImageUploader - - - Magento\Widget\Model\Template\Filter - - From 60c744a865052eaf081a9f64b4ab70dd324f8a65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Pi=C4=85tek?= Date: Tue, 15 Oct 2024 09:05:01 +0200 Subject: [PATCH 2/2] update php version dependency --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 469bb0c..e324802 100755 --- a/composer.json +++ b/composer.json @@ -15,7 +15,7 @@ } ], "require": { - "php": ">=7.0.2", + "php": "7.0.2|7.0.4|~7.0.6|~7.1.0|~7.2.0|~7.3.10|~7.4.0|~8.1.0|~8.3.0", "magento/product-community-edition": "^2.1.0" }, "autoload": {