ENGCOM-4215: Static test fix.

magento · Feb 12, 2019 · bc92929 · bc92929
1 parent 1a69d43
commit bc92929
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 13 deletions.
diff --git a/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Save.php b/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Save.php
@@ -7,8 +7,8 @@
 namespace Magento\SalesRule\Controller\Adminhtml\Promo\Quote;
 
 use Magento\Framework\App\Action\HttpPostActionInterface;
-use Magento\Framework\Stdlib\DateTime\TimezoneInterface;
 use Magento\Framework\App\Request\DataPersistorInterface;
+use Magento\Framework\Stdlib\DateTime\TimezoneInterface;
 
 /**
  * SalesRule save controller
@@ -84,12 +84,8 @@ public function execute()
                     $data
                 );
                 $data = $inputFilter->getUnescaped();
-                $id = $this->getRequest()->getParam('rule_id');
-                if ($id) {
-                    $model->load($id);
-                    if ($id != $model->getId()) {
-                        throw new \Magento\Framework\Exception\LocalizedException(__('The wrong rule is specified.'));
-                    }
+                if (!$this->checkRuleExists($model)) {
+                    throw new \Magento\Framework\Exception\LocalizedException(__('The wrong rule is specified.'));
                 }
 
                 $session = $this->_objectManager->get(\Magento\Backend\Model\Session::class);
@@ -159,4 +155,22 @@ public function execute()
         }
         $this->_redirect('sales_rule/*/');
     }
+
+    /**
+     * Check if Cart Price Rule with provided id exists.
+     *
+     * @param \Magento\SalesRule\Model\Rule $model
+     * @return bool
+     */
+    private function checkRuleExists(\Magento\SalesRule\Model\Rule $model): bool
+    {
+        $id = $this->getRequest()->getParam('rule_id');
+        if ($id) {
+            $model->load($id);
+            if ($model->getId() != $id) {
+                return false;
+            }
+        }
+        return true;
+    }
 }
diff --git a/app/code/Magento/SalesRule/Model/Rule/DataProvider.php b/app/code/Magento/SalesRule/Model/Rule/DataProvider.php
@@ -5,10 +5,10 @@
  */
 namespace Magento\SalesRule\Model\Rule;
 
+use Magento\Framework\App\Request\DataPersistorInterface;
 use Magento\SalesRule\Model\ResourceModel\Rule\Collection;
 use Magento\SalesRule\Model\ResourceModel\Rule\CollectionFactory;
 use Magento\SalesRule\Model\Rule;
-use Magento\Framework\App\Request\DataPersistorInterface;
 
 /**
  * Class DataProvider
@@ -36,7 +36,7 @@ class DataProvider extends \Magento\Ui\DataProvider\AbstractDataProvider
      * @var \Magento\SalesRule\Model\Rule\Metadata\ValueProvider
      */
     protected $metadataValueProvider;
-    
+
     /**
      * @var DataPersistorInterface
      */
@@ -51,9 +51,9 @@ class DataProvider extends \Magento\Ui\DataProvider\AbstractDataProvider
      * @param CollectionFactory $collectionFactory
      * @param \Magento\Framework\Registry $registry
      * @param Metadata\ValueProvider $metadataValueProvider
-     * @param DataPersistorInterface $dataPersistor
      * @param array $meta
      * @param array $data
+     * @param DataPersistorInterface $dataPersistor
      */
     public function __construct(
         $name,
@@ -62,9 +62,9 @@ public function __construct(
         CollectionFactory $collectionFactory,
         \Magento\Framework\Registry $registry,
         \Magento\SalesRule\Model\Rule\Metadata\ValueProvider $metadataValueProvider,
-        DataPersistorInterface $dataPersistor = null,
         array $meta = [],
-        array $data = []
+        array $data = [],
+        DataPersistorInterface $dataPersistor = null
     ) {
         $this->collection = $collectionFactory->create();
         $this->coreRegistry = $registry;
@@ -88,7 +88,7 @@ protected function getMetadataValues()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getData()
     {