Skip to content

Commit 57889b5

Browse files
committed
Rename ChangeLogBatchWalker to ChangelogBatchWalker
1 parent 1e68187 commit 57889b5

File tree

9 files changed

+36
-37
lines changed

9 files changed

+36
-37
lines changed

lib/internal/Magento/Framework/Mview/Config/Converter.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
namespace Magento\Framework\Mview\Config;
77

88
use Magento\Framework\Mview\View\AdditionalColumnsProcessor\DefaultProcessor;
9-
use Magento\Framework\Mview\View\ChangeLogBatchWalker;
9+
use Magento\Framework\Mview\View\ChangelogBatchWalker;
1010
use Magento\Framework\Mview\View\SubscriptionInterface;
1111

1212
class Converter implements \Magento\Framework\Config\ConverterInterface
@@ -27,7 +27,7 @@ class Converter implements \Magento\Framework\Config\ConverterInterface
2727
*/
2828
public function __construct(
2929
string $defaultProcessor = DefaultProcessor::class,
30-
string $defaultIterator = ChangeLogBatchWalker::class
30+
string $defaultIterator = ChangelogBatchWalker::class
3131
) {
3232
$this->defaultProcessor = $defaultProcessor;
3333
$this->defaultIterator = $defaultIterator;

lib/internal/Magento/Framework/Mview/Test/Unit/ViewSubscribeTest.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
use Magento\Framework\Mview\ConfigInterface;
1313
use Magento\Framework\Mview\View;
1414
use Magento\Framework\Mview\View\Changelog;
15-
use Magento\Framework\Mview\View\ChangeLogBatchWalkerFactory;
16-
use Magento\Framework\Mview\View\ChangeLogBatchWalkerInterface;
15+
use Magento\Framework\Mview\View\ChangelogBatchWalkerFactory;
16+
use Magento\Framework\Mview\View\ChangelogBatchWalkerInterface;
1717
use Magento\Framework\Mview\View\StateInterface;
1818
use Magento\Framework\Mview\View\Subscription;
1919
use Magento\Framework\Mview\View\SubscriptionFactory;
@@ -56,7 +56,7 @@ class ViewSubscribeTest extends TestCase
5656
protected $subscriptionFactoryMock;
5757

5858
/**
59-
* @var MockObject|ChangeLogBatchWalkerInterface
59+
* @var MockObject|ChangelogBatchWalkerInterface
6060
*/
6161
private $iteratorMock;
6262

@@ -74,11 +74,11 @@ protected function setUp(): void
7474
true,
7575
['getView']
7676
);
77-
$this->iteratorMock = $this->getMockBuilder(ChangeLogBatchWalkerInterface::class)
77+
$this->iteratorMock = $this->getMockBuilder(ChangelogBatchWalkerInterface::class)
7878
->disableOriginalConstructor()
7979
->onlyMethods(['walk'])
8080
->getMockForAbstractClass();
81-
$changeLogBatchWalkerFactory = $this->getMockBuilder(ChangeLogBatchWalkerFactory::class)
81+
$changeLogBatchWalkerFactory = $this->getMockBuilder(ChangelogBatchWalkerFactory::class)
8282
->disableOriginalConstructor()
8383
->onlyMethods(['create'])
8484
->getMockForAbstractClass();
@@ -283,7 +283,7 @@ protected function getViewData()
283283
'action_class' => 'Some\Class\Name',
284284
'group' => 'some_group',
285285
'subscriptions' => ['some_entity' => ['name' => 'some_entity', 'column' => 'entity_id']],
286-
'walker' => ChangeLogBatchWalkerInterface::class
286+
'walker' => ChangelogBatchWalkerInterface::class
287287
];
288288
}
289289
}

lib/internal/Magento/Framework/Mview/Test/Unit/ViewTest.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
use Magento\Framework\Mview\ConfigInterface;
1414
use Magento\Framework\Mview\View;
1515
use Magento\Framework\Mview\View\Changelog;
16-
use Magento\Framework\Mview\View\ChangeLogBatchWalkerFactory;
17-
use Magento\Framework\Mview\View\ChangeLogBatchWalkerInterface;
16+
use Magento\Framework\Mview\View\ChangelogBatchWalkerFactory;
17+
use Magento\Framework\Mview\View\ChangelogBatchWalkerInterface;
1818
use Magento\Framework\Mview\View\StateInterface;
1919
use Magento\Framework\Mview\View\SubscriptionFactory;
2020
use Magento\Indexer\Model\Mview\View\State;
@@ -56,7 +56,7 @@ class ViewTest extends TestCase
5656
protected $subscriptionFactoryMock;
5757

5858
/**
59-
* @var MockObject|ChangeLogBatchWalkerInterface
59+
* @var MockObject|ChangelogBatchWalkerInterface
6060
*/
6161
private $iteratorMock;
6262

@@ -74,11 +74,11 @@ protected function setUp(): void
7474
true,
7575
['getView']
7676
);
77-
$this->iteratorMock = $this->getMockBuilder(ChangeLogBatchWalkerInterface::class)
77+
$this->iteratorMock = $this->getMockBuilder(ChangelogBatchWalkerInterface::class)
7878
->disableOriginalConstructor()
7979
->onlyMethods(['walk'])
8080
->getMockForAbstractClass();
81-
$changeLogBatchWalkerFactory = $this->getMockBuilder(ChangeLogBatchWalkerFactory::class)
81+
$changeLogBatchWalkerFactory = $this->getMockBuilder(ChangelogBatchWalkerFactory::class)
8282
->disableOriginalConstructor()
8383
->onlyMethods(['create'])
8484
->getMockForAbstractClass();
@@ -676,7 +676,7 @@ protected function getViewData()
676676
'action_class' => 'Some\Class\Name',
677677
'group' => 'some_group',
678678
'subscriptions' => ['some_entity' => ['name' => 'some_entity', 'column' => 'entity_id']],
679-
'walker' => ChangeLogBatchWalkerInterface::class
679+
'walker' => ChangelogBatchWalkerInterface::class
680680
];
681681
}
682682
}

lib/internal/Magento/Framework/Mview/Test/Unit/_files/mview_config.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
'processor' => \Magento\Framework\Mview\View\AdditionalColumnsProcessor\DefaultProcessor::class
3333
],
3434
],
35-
'walker' => \Magento\Framework\Mview\View\ChangeLogBatchWalker::class
35+
'walker' => \Magento\Framework\Mview\View\ChangelogBatchWalker::class
3636
],
3737
]
3838
];

lib/internal/Magento/Framework/Mview/View.php

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
use InvalidArgumentException;
1212
use Magento\Framework\App\ObjectManager;
1313
use Magento\Framework\DataObject;
14-
use Magento\Framework\Mview\View\ChangeLogBatchWalkerFactory;
15-
use Magento\Framework\Mview\View\ChangeLogBatchWalkerInterface;
14+
use Magento\Framework\Mview\View\ChangelogBatchWalkerFactory;
15+
use Magento\Framework\Mview\View\ChangelogBatchWalkerInterface;
1616
use Magento\Framework\Mview\View\ChangelogTableNotExistsException;
1717
use Magento\Framework\Mview\View\SubscriptionFactory;
1818
use Exception;
@@ -66,9 +66,9 @@ class View extends DataObject implements ViewInterface, ViewSubscriptionInterfac
6666
private $changelogBatchSize;
6767

6868
/**
69-
* @var ChangeLogBatchWalkerFactory
69+
* @var ChangelogBatchWalkerFactory
7070
*/
71-
private $changeLogBatchWalkerFactory;
71+
private $changelogBatchWalkerFactory;
7272

7373
/**
7474
* @param ConfigInterface $config
@@ -78,7 +78,7 @@ class View extends DataObject implements ViewInterface, ViewSubscriptionInterfac
7878
* @param SubscriptionFactory $subscriptionFactory
7979
* @param array $data
8080
* @param array $changelogBatchSize
81-
* @param ChangeLogBatchWalkerFactory $changeLogBatchWalkerFactory
81+
* @param ChangelogBatchWalkerFactory $changelogBatchWalkerFactory
8282
*/
8383
public function __construct(
8484
ConfigInterface $config,
@@ -88,7 +88,7 @@ public function __construct(
8888
SubscriptionFactory $subscriptionFactory,
8989
array $data = [],
9090
array $changelogBatchSize = [],
91-
ChangeLogBatchWalkerFactory $changeLogBatchWalkerFactory = null
91+
ChangelogBatchWalkerFactory $changelogBatchWalkerFactory = null
9292
) {
9393
$this->config = $config;
9494
$this->actionFactory = $actionFactory;
@@ -97,8 +97,8 @@ public function __construct(
9797
$this->subscriptionFactory = $subscriptionFactory;
9898
$this->changelogBatchSize = $changelogBatchSize;
9999
parent::__construct($data);
100-
$this->changeLogBatchWalkerFactory = $changeLogBatchWalkerFactory ?:
101-
ObjectManager::getInstance()->get(ChangeLogBatchWalkerFactory::class);
100+
$this->changelogBatchWalkerFactory = $changelogBatchWalkerFactory ?:
101+
ObjectManager::getInstance()->get(ChangelogBatchWalkerFactory::class);
102102
}
103103

104104
/**
@@ -312,14 +312,13 @@ private function executeAction(ActionInterface $action, int $lastVersionId, int
312312
/**
313313
* Create and validate walker class for changelog
314314
*
315-
* @return ChangeLogBatchWalkerInterface|mixed
316-
* @throws Exception
315+
* @return \Magento\Framework\Mview\View\ChangelogBatchWalkerInterface
317316
*/
318-
private function getWalker(): ChangeLogBatchWalkerInterface
317+
private function getWalker(): ChangelogBatchWalkerInterface
319318
{
320319
$config = $this->config->getView($this->changelog->getViewId());
321320
$walkerClass = $config['walker'];
322-
return $this->changeLogBatchWalkerFactory->create($walkerClass);
321+
return $this->changelogBatchWalkerFactory->create($walkerClass);
323322
}
324323

325324
/**

lib/internal/Magento/Framework/Mview/View/ChangeLogBatchWalker.php renamed to lib/internal/Magento/Framework/Mview/View/ChangelogBatchWalker.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@
1818
use Magento\Framework\Phrase;
1919

2020
/**
21-
* Interface \Magento\Framework\Mview\View\ChangeLogBatchWalkerInterface
21+
* Interface \Magento\Framework\Mview\View\ChangelogBatchWalkerInterface
2222
*
2323
*/
24-
class ChangeLogBatchWalker implements ChangeLogBatchWalkerInterface
24+
class ChangelogBatchWalker implements ChangelogBatchWalkerInterface
2525
{
2626
/**
2727
* @var \Magento\Framework\App\ResourceConnection

lib/internal/Magento/Framework/Mview/View/ChangeLogBatchWalkerFactory.php renamed to lib/internal/Magento/Framework/Mview/View/ChangelogBatchWalkerFactory.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@
88

99
use Magento\Framework\ObjectManagerInterface;
1010

11-
class ChangeLogBatchWalkerFactory
11+
class ChangelogBatchWalkerFactory
1212
{
1313
/**
1414
* @var ObjectManagerInterface
1515
*/
16-
private $objectManager;
16+
private ObjectManagerInterface $objectManager;
1717

1818
/**
19-
* ChangeLogBatchWalkerFactory constructor.
19+
* ChangelogBatchWalkerFactory constructor.
2020
* @param ObjectManagerInterface $objectManager
2121
*/
2222
public function __construct(ObjectManagerInterface $objectManager)
@@ -28,9 +28,9 @@ public function __construct(ObjectManagerInterface $objectManager)
2828
* Instantiate BatchWalker interface
2929
*
3030
* @param string $batchWalkerClassName
31-
* @return ChangeLogBatchWalkerInterface
31+
* @return ChangelogBatchWalkerInterface
3232
*/
33-
public function create(string $batchWalkerClassName): ChangeLogBatchWalkerInterface
33+
public function create(string $batchWalkerClassName): ChangelogBatchWalkerInterface
3434
{
3535
return $this->objectManager->create($batchWalkerClassName);
3636
}

lib/internal/Magento/Framework/Mview/View/ChangeLogBatchWalkerInterface.php renamed to lib/internal/Magento/Framework/Mview/View/ChangelogBatchWalkerInterface.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77
namespace Magento\Framework\Mview\View;
88

99
/**
10-
* Interface \Magento\Framework\Mview\View\ChangeLogBatchWalkerInterface
10+
* Interface \Magento\Framework\Mview\View\ChangelogBatchWalkerInterface
1111
*
1212
*/
13-
interface ChangeLogBatchWalkerInterface
13+
interface ChangelogBatchWalkerInterface
1414
{
1515
/**
1616
* Walk through batches

lib/internal/Magento/Framework/Mview/etc/mview.xsd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
<xs:attribute name="id" type="xs:string" use="required" />
4747
<xs:attribute name="class" type="classType" use="required" />
4848
<xs:attribute name="group" type="xs:string" use="required" />
49-
<xs:attribute name="walker" type="classType" default="Magento\Framework\Mview\View\ChangeLogBatchWalker" />
49+
<xs:attribute name="walker" type="classType" default="Magento\Framework\Mview\View\ChangelogBatchWalker" />
5050
</xs:complexType>
5151

5252
<xs:simpleType name="classType">

0 commit comments

Comments
 (0)