From 8f36157cae89483469d567710aaba1d728328dd1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Eisenf=C3=BChrer?= Date: Sat, 6 Oct 2018 16:57:46 +0200 Subject: [PATCH 1/4] fix issue 12399 --- .../Controller/Adminhtml/Promo/Catalog/Save.php | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/Save.php b/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/Save.php index bad1118e3ae72..4d3b36c7fe69c 100644 --- a/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/Save.php +++ b/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/Save.php @@ -61,6 +61,17 @@ public function execute() ['request' => $this->getRequest()] ); $data = $this->getRequest()->getPostValue(); + + $filterValues = ['from_date' => $this->_dateFilter]; + if ($this->getRequest()->getParam('to_date')) { + $filterValues['to_date'] = $this->_dateFilter; + } + $inputFilter = new \Zend_Filter_Input( + $filterValues, + [], + $data + ); + $data = $inputFilter->getUnescaped(); $id = $this->getRequest()->getParam('rule_id'); if ($id) { $model = $ruleRepository->get($id); From 0d97a1600e3ccb3b3cf5c024a971b6f7b3597a3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Eisenf=C3=BChrer?= Date: Sun, 7 Oct 2018 10:41:26 +0200 Subject: [PATCH 2/4] fix documentation for phpcs --- .../Controller/Adminhtml/Promo/Catalog/Save.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/Save.php b/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/Save.php index 4d3b36c7fe69c..b09598d4fd76f 100644 --- a/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/Save.php +++ b/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/Save.php @@ -14,7 +14,8 @@ use Magento\Framework\App\Request\DataPersistorInterface; /** - * @SuppressWarnings(PHPMD.CouplingBetweenObjects) + * Save action for catalog rule + * @package Magento\CatalogRule\Controller\Adminhtml\Promo\Catalog */ class Save extends \Magento\CatalogRule\Controller\Adminhtml\Promo\Catalog implements HttpPostActionInterface { @@ -40,7 +41,9 @@ public function __construct( } /** - * @return void + * Execute save action from catalog rule + * + * @return \Magento\Framework\App\ResponseInterface|\Magento\Framework\Controller\ResultInterface|void * @SuppressWarnings(PHPMD.CyclomaticComplexity) */ public function execute() From ba703d7d22923239c4519616b6c6ab21124ec8bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Eisenf=C3=BChrer?= Date: Sun, 7 Oct 2018 14:24:52 +0200 Subject: [PATCH 3/4] fix one line for static test --- .../CatalogRule/Controller/Adminhtml/Promo/Catalog/Save.php | 1 + 1 file changed, 1 insertion(+) diff --git a/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/Save.php b/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/Save.php index b09598d4fd76f..d770d674bb3e6 100644 --- a/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/Save.php +++ b/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/Save.php @@ -15,6 +15,7 @@ /** * Save action for catalog rule + * * @package Magento\CatalogRule\Controller\Adminhtml\Promo\Catalog */ class Save extends \Magento\CatalogRule\Controller\Adminhtml\Promo\Catalog implements HttpPostActionInterface From d11ef56535da099158cc302eff104c2b466f2af6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Eisenf=C3=BChrer?= Date: Mon, 8 Oct 2018 08:09:14 +0200 Subject: [PATCH 4/4] fix: add SuppressWarnings again --- .../CatalogRule/Controller/Adminhtml/Promo/Catalog/Save.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/Save.php b/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/Save.php index d770d674bb3e6..0ff12faf54cbf 100644 --- a/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/Save.php +++ b/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/Save.php @@ -15,8 +15,8 @@ /** * Save action for catalog rule - * - * @package Magento\CatalogRule\Controller\Adminhtml\Promo\Catalog + * + * @SuppressWarnings(PHPMD.CouplingBetweenObjects) */ class Save extends \Magento\CatalogRule\Controller\Adminhtml\Promo\Catalog implements HttpPostActionInterface {