ENGCOM-3730: Refactoring in Magento_SalesRule #19929

Author: sidolov

app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Generate.php

@@ -6,7 +6,6 @@
  */
 namespace Magento\SalesRule\Controller\Adminhtml\Promo\Quote;
 
-use Magento\Framework\App\ObjectManager;
 use Magento\SalesRule\Model\CouponGenerator;
 
 class Generate extends \Magento\SalesRule\Controller\Adminhtml\Promo\Quote

app/code/Magento/SalesRule/Model/CouponRepository.php

@@ -8,7 +8,6 @@
 
 use Magento\Framework\Api\Search\FilterGroup;
 use Magento\Framework\Api\SearchCriteria\CollectionProcessorInterface;
-use Magento\Framework\Api\SortOrder;
 use Magento\SalesRule\Model\ResourceModel\Coupon\Collection;
 
 /**
@@ -197,13 +196,13 @@ public function deleteById($couponId)
     /**
      * Helper function that adds a FilterGroup to the collection.
      *
-     * @param \Magento\Framework\Api\Search\FilterGroup $filterGroup
+     * @param FilterGroup $filterGroup
      * @param Collection $collection
      * @deprecated 100.2.0
      * @return void
      */
     protected function addFilterGroupToCollection(
-        \Magento\Framework\Api\Search\FilterGroup $filterGroup,
+        FilterGroup $filterGroup,
         Collection $collection
     ) {
         $fields = [];

app/code/Magento/SalesRule/Model/Data/Rule.php

@@ -16,8 +16,7 @@
  * @SuppressWarnings(PHPMD.ExcessivePublicCount)
  * @codeCoverageIgnore
  */
-class Rule extends \Magento\Framework\Api\AbstractExtensibleObject implements
-    \Magento\SalesRule\Api\Data\RuleInterface
+class Rule extends \Magento\Framework\Api\AbstractExtensibleObject implements RuleInterface
 {
     const KEY_RULE_ID = 'rule_id';
     const KEY_NAME = 'name';

app/code/Magento/SalesRule/Model/Plugin/QuoteConfigProductAttributes.php

@@ -5,8 +5,6 @@
  */
 namespace Magento\SalesRule\Model\Plugin;
 
-use Magento\Store\Model\StoreManagerInterface;
-use Magento\Customer\Model\Session;
 use Magento\SalesRule\Model\ResourceModel\Rule as RuleResource;
 
 class QuoteConfigProductAttributes

app/code/Magento/SalesRule/Model/ResourceModel/ReadHandler.php

@@ -5,7 +5,6 @@
  */
 namespace Magento\SalesRule\Model\ResourceModel;
 
-use Magento\SalesRule\Model\ResourceModel\Rule;
 use Magento\Framework\EntityManager\MetadataPool;
 use Magento\Framework\EntityManager\Operation\AttributeInterface;
 

app/code/Magento/SalesRule/Model/ResourceModel/SaveHandler.php

@@ -5,7 +5,6 @@
  */
 namespace Magento\SalesRule\Model\ResourceModel;
 
-use Magento\SalesRule\Model\ResourceModel\Rule;
 use Magento\Framework\EntityManager\MetadataPool;
 use Magento\Framework\EntityManager\Operation\AttributeInterface;
 

app/code/Magento/SalesRule/Model/Rule/Action/Discount/CartFixed.php

@@ -5,7 +5,6 @@
  */
 namespace Magento\SalesRule\Model\Rule\Action\Discount;
 
-use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Pricing\PriceCurrencyInterface;
 use Magento\SalesRule\Model\DeltaPriceRound;
 use Magento\SalesRule\Model\Validator;

app/code/Magento/SalesRule/Model/Rule/Metadata/ValueProvider.php

@@ -5,7 +5,6 @@
  */
 namespace Magento\SalesRule\Model\Rule\Metadata;
 
-use Magento\SalesRule\Model\ResourceModel\Rule\Collection;
 use Magento\SalesRule\Model\Rule;
 use Magento\Store\Model\System\Store;
 use Magento\Customer\Api\GroupRepositoryInterface;

app/code/Magento/SalesRule/Model/RuleRepository.php

@@ -8,7 +8,6 @@
 use Magento\Framework\Api\Search\FilterGroup;
 use Magento\Framework\Api\SearchCriteria\CollectionProcessorInterface;
 use Magento\Framework\Api\SearchCriteriaInterface;
-use Magento\Framework\Api\SortOrder;
 use Magento\SalesRule\Model\ResourceModel\Rule\Collection;
 
 /**
@@ -183,13 +182,13 @@ public function deleteById($id)
     /**
      * Helper function that adds a FilterGroup to the collection.
      *
-     * @param \Magento\Framework\Api\Search\FilterGroup $filterGroup
+     * @param FilterGroup $filterGroup
      * @param Collection $collection
      * @deprecated 100.2.0
      * @return void
      */
     protected function addFilterGroupToCollection(
-        \Magento\Framework\Api\Search\FilterGroup $filterGroup,
+        FilterGroup $filterGroup,
         Collection $collection
     ) {
         $fields = [];

app/code/Magento/SalesRule/Setup/Patch/Data/ConvertSerializedDataToJson.php

@@ -6,7 +6,6 @@
 
 namespace Magento\SalesRule\Setup\Patch\Data;
 
-use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\Setup\Patch\DataPatchInterface;
 use Magento\Framework\Setup\Patch\PatchVersionInterface;
 

app/code/Magento/SalesRule/Setup/Patch/Data/FillSalesRuleProductAttributeTable.php

@@ -6,7 +6,6 @@
 
 namespace Magento\SalesRule\Setup\Patch\Data;
 
-use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\App\State;
 use Magento\Framework\Setup\Patch\DataPatchInterface;
 use Magento\Framework\Setup\Patch\PatchVersionInterface;

app/code/Magento/SalesRule/Setup/Patch/Data/PrepareRuleModelSerializedData.php

@@ -7,7 +7,6 @@
 namespace Magento\SalesRule\Setup\Patch\Data;
 
 use Magento\Framework\Setup\ModuleDataSetupInterface;
-use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\Setup\Patch\DataPatchInterface;
 use Magento\Framework\Setup\Patch\PatchVersionInterface;
 
@@ -18,16 +17,16 @@
 class PrepareRuleModelSerializedData implements DataPatchInterface, PatchVersionInterface
 {
     /**
-     * @var \Magento\Framework\Setup\ModuleDataSetupInterface
+     * @var ModuleDataSetupInterface
      */
     private $moduleDataSetup;
 
     /**
      * PatchInitial constructor.
-     * @param \Magento\Framework\Setup\ModuleDataSetupInterface $moduleDataSetup
+     * @param ModuleDataSetupInterface $moduleDataSetup
      */
     public function __construct(
-        \Magento\Framework\Setup\ModuleDataSetupInterface $moduleDataSetup
+        ModuleDataSetupInterface $moduleDataSetup
     ) {
         $this->moduleDataSetup = $moduleDataSetup;
     }

app/code/Magento/SalesRule/Test/Unit/Block/Adminhtml/Promo/Quote/Edit/DeleteButtonTest.php

@@ -5,7 +5,6 @@
  */
 namespace Magento\SalesRule\Test\Unit\Block\Adminhtml\Promo\Quote\Edit;
 
-use Magento\SalesRule\Model\RegistryConstants;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 
 class DeleteButtonTest extends \PHPUnit\Framework\TestCase

app/code/Magento/SalesRule/Test/Unit/Model/ResourceModel/ReadHandlerTest.php

@@ -16,7 +16,7 @@
 class ReadHandlerTest extends \PHPUnit\Framework\TestCase
 {
     /**
-     * @var \Magento\SalesRule\Model\ResourceModel\ReadHandler
+     * @var ReadHandler
      */
     protected $model;
 
@@ -49,7 +49,7 @@ protected function setUp()
         $this->metadataPool = $this->createMock($className);
 
         $this->model = $this->objectManager->getObject(
-            \Magento\SalesRule\Model\ResourceModel\ReadHandler::class,
+            ReadHandler::class,
             [
                 'ruleResource' => $this->ruleResource,
                 'metadataPool' => $this->metadataPool,

app/code/Magento/SalesRule/Test/Unit/Model/ResourceModel/Rule/DateApplierTest.php

@@ -13,7 +13,7 @@
 class DateApplierTest extends \PHPUnit\Framework\TestCase
 {
     /**
-     * @var \Magento\SalesRule\Model\ResourceModel\Rule\DateApplier|\PHPUnit_Framework_MockObject_MockObject
+     * @var DateApplier|\PHPUnit_Framework_MockObject_MockObject
      */
     protected $model;
 
@@ -29,10 +29,7 @@ protected function setUp()
     {
         $this->objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
 
-        $this->model = $this->objectManager->getObject(
-            \Magento\SalesRule\Model\ResourceModel\Rule\DateApplier::class,
-            []
-        );
+        $this->model = $this->objectManager->getObject(DateApplier::class, []);
     }
 
     /**