Skip to content

Commit 9a960ca

Browse files
vpelipenkovpelipenko
committed
Merge pull request #533 from magento-south/MAGETWO-38563
[South] Customer New Grid
2 parents 5cc709f + 8b0ff1c commit 9a960ca

File tree

313 files changed

+8868
-1643
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

313 files changed

+8868
-1643
lines changed

‎app/code/Magento/AdvancedPricingImportExport/Model/Indexer/Product/Price/Plugin/Import.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public function afterDeleteAdvancedPricing(AdvancedPricing $subject)
4040
/**
4141
* Get price indexer
4242
*
43-
* @return \Magento\Indexer\Model\IndexerInterface
43+
* @return \Magento\Framework\Indexer\IndexerInterface
4444
*/
4545
protected function getPriceIndexer()
4646
{

‎app/code/Magento/AdvancedPricingImportExport/Test/Unit/Model/Indexer/Product/Price/Plugin/ImportTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
class ImportTest extends \PHPUnit_Framework_TestCase
1212
{
1313
/**
14-
* @var \Magento\Indexer\Model\IndexerInterface |\PHPUnit_Framework_MockObject_MockObject
14+
* @var \Magento\Framework\Indexer\IndexerInterface |\PHPUnit_Framework_MockObject_MockObject
1515
*/
1616
protected $indexer;
1717

@@ -27,7 +27,7 @@ class ImportTest extends \PHPUnit_Framework_TestCase
2727

2828
public function setUp()
2929
{
30-
$this->indexer = $this->getMockForAbstractClass('\Magento\Indexer\Model\IndexerInterface', [], '', false);
30+
$this->indexer = $this->getMockForAbstractClass('\Magento\Framework\Indexer\IndexerInterface', [], '', false);
3131
$this->import = $this->getMock(
3232
'\Magento\AdvancedPricingImportExport\Model\Indexer\Product\Price\Plugin\Import',
3333
['getPriceIndexer', 'invalidateIndexer'],

‎app/code/Magento/Catalog/Model/Category.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ class Category extends \Magento\Catalog\Model\AbstractModel implements
210210
/** @var UrlFinderInterface */
211211
protected $urlFinder;
212212

213-
/** @var \Magento\Indexer\Model\IndexerRegistry */
213+
/** @var \Magento\Framework\Indexer\IndexerRegistry */
214214
protected $indexerRegistry;
215215

216216
/**
@@ -240,7 +240,7 @@ class Category extends \Magento\Catalog\Model\AbstractModel implements
240240
* @param Indexer\Category\Flat\State $flatState
241241
* @param \Magento\CatalogUrlRewrite\Model\CategoryUrlPathGenerator $categoryUrlPathGenerator
242242
* @param UrlFinderInterface $urlFinder
243-
* @param \Magento\Indexer\Model\IndexerRegistry $indexerRegistry
243+
* @param \Magento\Framework\Indexer\IndexerRegistry $indexerRegistry
244244
* @param CategoryRepositoryInterface $categoryRepository
245245
* @param \Magento\Framework\Model\Resource\AbstractResource $resource
246246
* @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
@@ -264,7 +264,7 @@ public function __construct(
264264
Indexer\Category\Flat\State $flatState,
265265
\Magento\CatalogUrlRewrite\Model\CategoryUrlPathGenerator $categoryUrlPathGenerator,
266266
UrlFinderInterface $urlFinder,
267-
\Magento\Indexer\Model\IndexerRegistry $indexerRegistry,
267+
\Magento\Framework\Indexer\IndexerRegistry $indexerRegistry,
268268
CategoryRepositoryInterface $categoryRepository,
269269
\Magento\Framework\Model\Resource\AbstractResource $resource = null,
270270
\Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,

‎app/code/Magento/Catalog/Model/Indexer/AbstractFlatState.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,17 +29,17 @@ abstract class AbstractFlatState
2929
*/
3030
protected $isAvailable;
3131

32-
/** @var \Magento\Indexer\Model\IndexerRegistry */
32+
/** @var \Magento\Framework\Indexer\IndexerRegistry */
3333
protected $indexerRegistry;
3434

3535
/**
3636
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
37-
* @param \Magento\Indexer\Model\IndexerRegistry $indexerRegistry
37+
* @param \Magento\Framework\Indexer\IndexerRegistry $indexerRegistry
3838
* @param bool $isAvailable
3939
*/
4040
public function __construct(
4141
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
42-
\Magento\Indexer\Model\IndexerRegistry $indexerRegistry,
42+
\Magento\Framework\Indexer\IndexerRegistry $indexerRegistry,
4343
$isAvailable = false
4444
) {
4545
$this->scopeConfig = $scopeConfig;

‎app/code/Magento/Catalog/Model/Indexer/Category/AffectCache.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,26 +12,26 @@
1212
class AffectCache
1313
{
1414
/**
15-
* @var \Magento\Indexer\Model\CacheContext
15+
* @var \Magento\Framework\Indexer\CacheContext
1616
*/
1717
protected $context;
1818

1919
/**
20-
* @param \Magento\Indexer\Model\CacheContext $context
20+
* @param \Magento\Framework\Indexer\CacheContext $context
2121
*/
2222
public function __construct(
23-
\Magento\Indexer\Model\CacheContext $context
23+
\Magento\Framework\Indexer\CacheContext $context
2424
) {
2525
$this->context = $context;
2626
}
2727

2828
/**
29-
* @param \Magento\Indexer\Model\ActionInterface $subject
29+
* @param \Magento\Framework\Indexer\ActionInterface $subject
3030
* @param array $ids
3131
* @return array
3232
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
3333
*/
34-
public function beforeExecute(\Magento\Indexer\Model\ActionInterface $subject, $ids)
34+
public function beforeExecute(\Magento\Framework\Indexer\ActionInterface $subject, $ids)
3535
{
3636
$this->context->registerEntities(\Magento\Catalog\Model\Category::CACHE_TAG, $ids);
3737
return [$ids];

‎app/code/Magento/Catalog/Model/Indexer/Category/Flat.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
*/
66
namespace Magento\Catalog\Model\Indexer\Category;
77

8-
class Flat implements \Magento\Indexer\Model\ActionInterface, \Magento\Framework\Mview\ActionInterface
8+
class Flat implements \Magento\Framework\Indexer\ActionInterface, \Magento\Framework\Mview\ActionInterface
99
{
1010
/**
1111
* @var \Magento\Catalog\Model\Indexer\Category\Flat\Action\FullFactory
@@ -17,18 +17,18 @@ class Flat implements \Magento\Indexer\Model\ActionInterface, \Magento\Framework
1717
*/
1818
protected $rowsActionFactory;
1919

20-
/** @var \Magento\Indexer\Model\IndexerRegistry */
20+
/** @var \Magento\Framework\Indexer\IndexerRegistry */
2121
protected $indexerRegistry;
2222

2323
/**
2424
* @param Flat\Action\FullFactory $fullActionFactory
2525
* @param Flat\Action\RowsFactory $rowsActionFactory
26-
* @param \Magento\Indexer\Model\IndexerRegistry $indexerRegistry
26+
* @param \Magento\Framework\Indexer\IndexerRegistry $indexerRegistry
2727
*/
2828
public function __construct(
2929
Flat\Action\FullFactory $fullActionFactory,
3030
Flat\Action\RowsFactory $rowsActionFactory,
31-
\Magento\Indexer\Model\IndexerRegistry $indexerRegistry
31+
\Magento\Framework\Indexer\IndexerRegistry $indexerRegistry
3232
) {
3333
$this->fullActionFactory = $fullActionFactory;
3434
$this->rowsActionFactory = $rowsActionFactory;

‎app/code/Magento/Catalog/Model/Indexer/Category/Flat/Plugin/StoreGroup.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
class StoreGroup
99
{
10-
/** @var \Magento\Indexer\Model\IndexerRegistry */
10+
/** @var \Magento\Framework\Indexer\IndexerRegistry */
1111
protected $indexerRegistry;
1212

1313
/**
@@ -16,11 +16,11 @@ class StoreGroup
1616
protected $state;
1717

1818
/**
19-
* @param \Magento\Indexer\Model\IndexerRegistry $indexerRegistry
19+
* @param \Magento\Framework\Indexer\IndexerRegistry $indexerRegistry
2020
* @param \Magento\Catalog\Model\Indexer\Category\Flat\State $state
2121
*/
2222
public function __construct(
23-
\Magento\Indexer\Model\IndexerRegistry $indexerRegistry,
23+
\Magento\Framework\Indexer\IndexerRegistry $indexerRegistry,
2424
\Magento\Catalog\Model\Indexer\Category\Flat\State $state
2525
) {
2626
$this->indexerRegistry = $indexerRegistry;

‎app/code/Magento/Catalog/Model/Indexer/Category/Flat/System/Config/Mode.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@ class Mode extends \Magento\Framework\App\Config\Value
1313
/** @var \Magento\Indexer\Model\Indexer\State */
1414
protected $indexerState;
1515

16-
/** @var \Magento\Indexer\Model\IndexerRegistry */
16+
/** @var \Magento\Framework\Indexer\IndexerRegistry */
1717
protected $indexerRegistry;
1818

1919
/**
2020
* @param \Magento\Framework\Model\Context $context
2121
* @param \Magento\Framework\Registry $registry
2222
* @param \Magento\Framework\App\Config\ScopeConfigInterface $config
23-
* @param \Magento\Indexer\Model\IndexerRegistry $indexerRegistry
23+
* @param \Magento\Framework\Indexer\IndexerRegistry $indexerRegistry
2424
* @param \Magento\Indexer\Model\Indexer\State $indexerState
2525
* @param \Magento\Framework\Model\Resource\AbstractResource $resource
2626
* @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
@@ -30,7 +30,7 @@ public function __construct(
3030
\Magento\Framework\Model\Context $context,
3131
\Magento\Framework\Registry $registry,
3232
\Magento\Framework\App\Config\ScopeConfigInterface $config,
33-
\Magento\Indexer\Model\IndexerRegistry $indexerRegistry,
33+
\Magento\Framework\Indexer\IndexerRegistry $indexerRegistry,
3434
\Magento\Indexer\Model\Indexer\State $indexerState,
3535
\Magento\Framework\Model\Resource\AbstractResource $resource = null,
3636
\Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
@@ -62,7 +62,7 @@ public function processValue()
6262
if ((bool)$this->getValue() != (bool)$this->getOldValue()) {
6363
if ((bool)$this->getValue()) {
6464
$this->indexerState->loadByIndexer(\Magento\Catalog\Model\Indexer\Category\Flat\State::INDEXER_ID);
65-
$this->indexerState->setStatus(\Magento\Indexer\Model\Indexer\State::STATUS_INVALID);
65+
$this->indexerState->setStatus(\Magento\Framework\Indexer\StateInterface::STATUS_INVALID);
6666
$this->indexerState->save();
6767
} else {
6868
$this->indexerRegistry->get(\Magento\Catalog\Model\Indexer\Category\Flat\State::INDEXER_ID)

‎app/code/Magento/Catalog/Model/Indexer/Category/Product.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
*/
66
namespace Magento\Catalog\Model\Indexer\Category;
77

8-
class Product implements \Magento\Indexer\Model\ActionInterface, \Magento\Framework\Mview\ActionInterface
8+
class Product implements \Magento\Framework\Indexer\ActionInterface, \Magento\Framework\Mview\ActionInterface
99
{
1010
/**
1111
* Indexer ID in configuration
@@ -22,18 +22,18 @@ class Product implements \Magento\Indexer\Model\ActionInterface, \Magento\Framew
2222
*/
2323
protected $rowsActionFactory;
2424

25-
/** @var \Magento\Indexer\Model\IndexerRegistry */
25+
/** @var \Magento\Framework\Indexer\IndexerRegistry */
2626
protected $indexerRegistry;
2727

2828
/**
2929
* @param Product\Action\FullFactory $fullActionFactory
3030
* @param Product\Action\RowsFactory $rowsActionFactory
31-
* @param \Magento\Indexer\Model\IndexerRegistry $indexerRegistry
31+
* @param \Magento\Framework\Indexer\IndexerRegistry $indexerRegistry
3232
*/
3333
public function __construct(
3434
Product\Action\FullFactory $fullActionFactory,
3535
Product\Action\RowsFactory $rowsActionFactory,
36-
\Magento\Indexer\Model\IndexerRegistry $indexerRegistry
36+
\Magento\Framework\Indexer\IndexerRegistry $indexerRegistry
3737
) {
3838
$this->fullActionFactory = $fullActionFactory;
3939
$this->rowsActionFactory = $rowsActionFactory;

‎app/code/Magento/Catalog/Model/Indexer/Category/Product/Plugin/StoreGroup.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@
77

88
class StoreGroup
99
{
10-
/** @var \Magento\Indexer\Model\IndexerRegistry */
10+
/** @var \Magento\Framework\Indexer\IndexerRegistry */
1111
protected $indexerRegistry;
1212

1313
/**
14-
* @param \Magento\Indexer\Model\IndexerRegistry $indexerRegistry
14+
* @param \Magento\Framework\Indexer\IndexerRegistry $indexerRegistry
1515
*/
16-
public function __construct(\Magento\Indexer\Model\IndexerRegistry $indexerRegistry)
16+
public function __construct(\Magento\Framework\Indexer\IndexerRegistry $indexerRegistry)
1717
{
1818
$this->indexerRegistry = $indexerRegistry;
1919
}

‎app/code/Magento/Catalog/Model/Indexer/Category/Product/Processor.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
*/
66
namespace Magento\Catalog\Model\Indexer\Category\Product;
77

8-
class Processor extends \Magento\Indexer\Model\Indexer\AbstractProcessor
8+
class Processor extends \Magento\Framework\Indexer\AbstractProcessor
99
{
1010
/**
1111
* Indexer ID

‎app/code/Magento/Catalog/Model/Indexer/Product/AffectCache.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,26 +12,26 @@
1212
class AffectCache
1313
{
1414
/**
15-
* @var \Magento\Indexer\Model\CacheContext $context
15+
* @var \Magento\Framework\Indexer\CacheContext $context
1616
*/
1717
protected $context;
1818

1919
/**
20-
* @param \Magento\Indexer\Model\CacheContext $context
20+
* @param \Magento\Framework\Indexer\CacheContext $context
2121
*/
2222
public function __construct(
23-
\Magento\Indexer\Model\CacheContext $context
23+
\Magento\Framework\Indexer\CacheContext $context
2424
) {
2525
$this->context = $context;
2626
}
2727

2828
/**
29-
* @param \Magento\Indexer\Model\ActionInterface $subject
29+
* @param \Magento\Framework\Indexer\ActionInterface $subject
3030
* @param array $ids
3131
* @return array
3232
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
3333
*/
34-
public function beforeExecute(\Magento\Indexer\Model\ActionInterface $subject, $ids)
34+
public function beforeExecute(\Magento\Framework\Indexer\ActionInterface $subject, $ids)
3535
{
3636
$this->context->registerEntities(\Magento\Catalog\Model\Product::CACHE_TAG, $ids);
3737
return [$ids];

‎app/code/Magento/Catalog/Model/Indexer/Product/Category.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@ class Category extends \Magento\Catalog\Model\Indexer\Category\Product
1515
/**
1616
* @param \Magento\Catalog\Model\Indexer\Category\Product\Action\FullFactory $fullActionFactory
1717
* @param Category\Action\RowsFactory $rowsActionFactory
18-
* @param \Magento\Indexer\Model\IndexerRegistry $indexerRegistry
18+
* @param \Magento\Framework\Indexer\IndexerRegistry $indexerRegistry
1919
*/
2020
public function __construct(
2121
\Magento\Catalog\Model\Indexer\Category\Product\Action\FullFactory $fullActionFactory,
2222
Category\Action\RowsFactory $rowsActionFactory,
23-
\Magento\Indexer\Model\IndexerRegistry $indexerRegistry
23+
\Magento\Framework\Indexer\IndexerRegistry $indexerRegistry
2424
) {
2525
parent::__construct($fullActionFactory, $rowsActionFactory, $indexerRegistry);
2626
}

‎app/code/Magento/Catalog/Model/Indexer/Product/Category/Processor.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
*/
66
namespace Magento\Catalog\Model\Indexer\Product\Category;
77

8-
class Processor extends \Magento\Indexer\Model\Indexer\AbstractProcessor
8+
class Processor extends \Magento\Framework\Indexer\AbstractProcessor
99
{
1010
/**
1111
* Indexer ID

‎app/code/Magento/Catalog/Model/Indexer/Product/Eav.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
*/
66
namespace Magento\Catalog\Model\Indexer\Product;
77

8-
class Eav implements \Magento\Indexer\Model\ActionInterface, \Magento\Framework\Mview\ActionInterface
8+
class Eav implements \Magento\Framework\Indexer\ActionInterface, \Magento\Framework\Mview\ActionInterface
99
{
1010
/**
1111
* @var \Magento\Catalog\Model\Indexer\Product\Eav\Action\Row

‎app/code/Magento/Catalog/Model/Indexer/Product/Eav/Processor.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
*/
66
namespace Magento\Catalog\Model\Indexer\Product\Eav;
77

8-
class Processor extends \Magento\Indexer\Model\Indexer\AbstractProcessor
8+
class Processor extends \Magento\Framework\Indexer\AbstractProcessor
99
{
1010
/**
1111
* Indexer ID

‎app/code/Magento/Catalog/Model/Indexer/Product/Flat.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
*/
66
namespace Magento\Catalog\Model\Indexer\Product;
77

8-
class Flat implements \Magento\Indexer\Model\ActionInterface, \Magento\Framework\Mview\ActionInterface
8+
class Flat implements \Magento\Framework\Indexer\ActionInterface, \Magento\Framework\Mview\ActionInterface
99
{
1010
/**
1111
* @var \Magento\Catalog\Model\Indexer\Product\Flat\Action\Row

‎app/code/Magento/Catalog/Model/Indexer/Product/Flat/Processor.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
*/
66
namespace Magento\Catalog\Model\Indexer\Product\Flat;
77

8-
class Processor extends \Magento\Indexer\Model\Indexer\AbstractProcessor
8+
class Processor extends \Magento\Framework\Indexer\AbstractProcessor
99
{
1010
/**
1111
* Indexer ID
@@ -18,11 +18,11 @@ class Processor extends \Magento\Indexer\Model\Indexer\AbstractProcessor
1818
protected $_state;
1919

2020
/**
21-
* @param \Magento\Indexer\Model\IndexerRegistry $indexerRegistry
21+
* @param \Magento\Framework\Indexer\IndexerRegistry $indexerRegistry
2222
* @param State $state
2323
*/
2424
public function __construct(
25-
\Magento\Indexer\Model\IndexerRegistry $indexerRegistry,
25+
\Magento\Framework\Indexer\IndexerRegistry $indexerRegistry,
2626
\Magento\Catalog\Model\Indexer\Product\Flat\State $state
2727
) {
2828
parent::__construct($indexerRegistry);

‎app/code/Magento/Catalog/Model/Indexer/Product/Flat/State.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,13 @@ class State extends \Magento\Catalog\Model\Indexer\AbstractFlatState
2424

2525
/**
2626
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
27-
* @param \Magento\Indexer\Model\IndexerRegistry $indexerRegistry
27+
* @param \Magento\Framework\Indexer\IndexerRegistry $indexerRegistry
2828
* @param \Magento\Catalog\Helper\Product\Flat\Indexer $flatIndexerHelper
2929
* @param bool $isAvailable
3030
*/
3131
public function __construct(
3232
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
33-
\Magento\Indexer\Model\IndexerRegistry $indexerRegistry,
33+
\Magento\Framework\Indexer\IndexerRegistry $indexerRegistry,
3434
\Magento\Catalog\Helper\Product\Flat\Indexer $flatIndexerHelper,
3535
$isAvailable = false
3636
) {

‎app/code/Magento/Catalog/Model/Indexer/Product/Flat/System/Config/Mode.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ public function processValue()
6666
if ((bool)$this->getValue() != (bool)$this->getOldValue()) {
6767
if ((bool)$this->getValue()) {
6868
$this->indexerState->loadByIndexer(\Magento\Catalog\Model\Indexer\Product\Flat\Processor::INDEXER_ID);
69-
$this->indexerState->setStatus(\Magento\Indexer\Model\Indexer\State::STATUS_INVALID);
69+
$this->indexerState->setStatus(\Magento\Framework\Indexer\StateInterface::STATUS_INVALID);
7070
$this->indexerState->save();
7171
} else {
7272
$this->_productFlatIndexerProcessor->getIndexer()->setScheduled(false);

‎app/code/Magento/Catalog/Model/Indexer/Product/Price.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
*/
66
namespace Magento\Catalog\Model\Indexer\Product;
77

8-
class Price implements \Magento\Indexer\Model\ActionInterface, \Magento\Framework\Mview\ActionInterface
8+
class Price implements \Magento\Framework\Indexer\ActionInterface, \Magento\Framework\Mview\ActionInterface
99
{
1010
/**
1111
* @var \Magento\Catalog\Model\Indexer\Product\Price\Action\Row

0 commit comments

Comments
 (0)