Skip to content

Commit 4148fc2

Browse files
committed
MC-32014: Remove google-shopping-ads module from core in 2.4.1
1 parent ee09909 commit 4148fc2

File tree

7 files changed

+106
-19
lines changed

7 files changed

+106
-19
lines changed

app/etc/di.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -209,6 +209,9 @@
209209
<preference for="Magento\Framework\MessageQueue\QueueFactoryInterface" type="Magento\Framework\MessageQueue\QueueFactory" />
210210
<preference for="Magento\Framework\Search\Request\IndexScopeResolverInterface" type="Magento\Framework\Indexer\ScopeResolver\IndexScopeResolver"/>
211211
<preference for="Magento\Framework\HTTP\ClientInterface" type="Magento\Framework\HTTP\Client\Curl" />
212+
<preference for="Magento\Framework\Mview\TriggerCleanerInterface" type="\Magento\Framework\Mview\TriggerCleaner"/>
213+
<preference for="Magento\Framework\Indexer\ConfigInterface" type="\Magento\Framework\Indexer\Config"/>
214+
<preference for="Magento\Framework\Mview\View\State\CollectionInterface" type="Magento\Framework\Mview\View\State\Collection" />
212215
<type name="Magento\Framework\Model\ResourceModel\Db\TransactionManager" shared="false" />
213216
<type name="Magento\Framework\Acl\Data\Cache">
214217
<arguments>
Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
<?php
2+
/**
3+
* Copyright © Magento, Inc. All rights reserved.
4+
* See COPYING.txt for license details.
5+
*/
6+
7+
namespace Magento\Framework\Indexer;
8+
9+
/**
10+
* Indexers configuration
11+
*/
12+
class Config implements ConfigInterface
13+
{
14+
/**
15+
* @inheritDoc
16+
*/
17+
public function getIndexers()
18+
{
19+
return [];
20+
}
21+
22+
/**
23+
* @inheritDoc
24+
*/
25+
public function getIndexer($indexerId)
26+
{
27+
return [];
28+
}
29+
}

lib/internal/Magento/Framework/Mview/OldViews.php renamed to lib/internal/Magento/Framework/Mview/TriggerCleaner.php

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
/**
1515
* Class for removing old triggers that were created by mview
1616
*/
17-
class OldViews
17+
class TriggerCleaner implements TriggerCleanerInterface
1818
{
1919
/**
2020
* @var CollectionFactory
@@ -47,16 +47,16 @@ public function __construct(
4747
}
4848

4949
/**
50-
* Unsubscribe old views by existing triggers
50+
* @inheritDoc
51+
* @throws \Exception
5152
*/
52-
public function unsubscribe(): void
53+
public function unsubscribe(): bool
5354
{
5455
$viewCollection = $this->viewCollectionFactory->create();
5556
$viewList = $viewCollection->getViewsByStateMode(StateInterface::MODE_ENABLED);
5657

5758
// Unsubscribe mviews
5859
foreach ($viewList as $view) {
59-
/** @var ViewInterface $view */
6060
$view->unsubscribe();
6161
}
6262

@@ -70,9 +70,10 @@ public function unsubscribe(): void
7070

7171
// Re-subscribe mviews
7272
foreach ($viewList as $view) {
73-
/** @var ViewInterface $view */
7473
$view->subscribe();
7574
}
75+
76+
return true;
7677
}
7778

7879
/**
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
<?php
2+
/**
3+
* Copyright © Magento, Inc. All rights reserved.
4+
* See COPYING.txt for license details.
5+
*/
6+
7+
namespace Magento\Framework\Mview;
8+
9+
/**
10+
* Service for processing of DB triggers
11+
*/
12+
interface TriggerCleanerInterface
13+
{
14+
/**
15+
* Remove the outdated trigger from the system
16+
*
17+
* @return bool
18+
*/
19+
public function unsubscribe(): bool;
20+
}
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
<?php
2+
/**
3+
* Copyright © Magento, Inc. All rights reserved.
4+
* See COPYING.txt for license details.
5+
*/
6+
7+
namespace Magento\Framework\Mview\View\State;
8+
9+
/**
10+
* View state collection
11+
*/
12+
class Collection implements CollectionInterface
13+
{
14+
/**
15+
* @inheritDoc
16+
*/
17+
public function getItems()
18+
{
19+
return [];
20+
}
21+
}

setup/config/di.config.php

Lines changed: 22 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,33 @@
44
* See COPYING.txt for license details.
55
*/
66

7+
use Laminas\EventManager\EventManagerInterface;
8+
use Laminas\ServiceManager\ServiceLocatorInterface;
9+
use Laminas\ServiceManager\ServiceManager;
10+
use Magento\Framework\Component\ComponentRegistrar;
11+
use Magento\Framework\Component\ComponentRegistrarInterface;
12+
use Magento\Framework\DB\Logger\Quiet;
13+
use Magento\Framework\DB\LoggerInterface;
14+
use Magento\Framework\Filesystem\DriverInterface;
15+
use Magento\Framework\Locale\Config;
16+
use Magento\Framework\Locale\ConfigInterface;
17+
use Magento\Framework\Mview\TriggerCleaner;
18+
use Magento\Framework\Mview\TriggerCleanerInterface;
19+
use Magento\Framework\Setup\Declaration\Schema\SchemaConfig;
20+
721
return [
822
'di' => [
923
'instance' => [
1024
'preference' => [
11-
\Laminas\EventManager\EventManagerInterface::class => 'EventManager',
12-
\Laminas\ServiceManager\ServiceLocatorInterface::class => \Laminas\ServiceManager\ServiceManager::class,
13-
\Magento\Framework\DB\LoggerInterface::class => \Magento\Framework\DB\Logger\Quiet::class,
14-
\Magento\Framework\Locale\ConfigInterface::class => \Magento\Framework\Locale\Config::class,
15-
\Magento\Framework\Filesystem\DriverInterface::class =>
16-
\Magento\Framework\Filesystem\Driver\File::class,
17-
\Magento\Framework\Component\ComponentRegistrarInterface::class =>
18-
\Magento\Framework\Component\ComponentRegistrar::class,
25+
EventManagerInterface::class => 'EventManager',
26+
ServiceLocatorInterface::class => ServiceManager::class,
27+
LoggerInterface::class => Quiet::class,
28+
ConfigInterface::class => Config::class,
29+
DriverInterface::class => \Magento\Framework\Filesystem\Driver\File::class,
30+
ComponentRegistrarInterface::class => ComponentRegistrar::class,
31+
TriggerCleanerInterface::class => TriggerCleaner::class,
1932
],
20-
\Magento\Framework\Setup\Declaration\Schema\SchemaConfig::class => [
33+
SchemaConfig::class => [
2134
'parameters' => [
2235
'connectionScopes' => [
2336
'default',

setup/src/Magento/Setup/Model/Installer.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
use Magento\Framework\Model\ResourceModel\Db\Context;
2626
use Magento\Framework\Module\ModuleList\Loader as ModuleLoader;
2727
use Magento\Framework\Module\ModuleListInterface;
28-
use Magento\Framework\Mview\OldViews;
28+
use Magento\Framework\Mview\TriggerCleanerInterface;
2929
use Magento\Framework\Setup\Declaration\Schema\DryRunLogger;
3030
use Magento\Framework\Setup\FilePermissions;
3131
use Magento\Framework\Setup\InstallDataInterface;
@@ -249,9 +249,9 @@ class Installer
249249
private $patchApplierFactory;
250250

251251
/**
252-
* @var OldViews
252+
* @var TriggerCleanerInterface
253253
*/
254-
private $oldViews;
254+
private $triggerCleaner;
255255

256256
/**
257257
* Constructor
@@ -326,7 +326,7 @@ public function __construct(
326326
$this->componentRegistrar = $componentRegistrar;
327327
$this->phpReadinessCheck = $phpReadinessCheck;
328328
$this->schemaPersistor = $this->objectManagerProvider->get()->get(SchemaPersistor::class);
329-
$this->oldViews = $this->objectManagerProvider->get()->get(OldViews::class);
329+
$this->triggerCleaner = $this->objectManagerProvider->get()->get(TriggerCleanerInterface::class);
330330
}
331331

332332
/**
@@ -1659,6 +1659,6 @@ private function updateColumnType(
16591659
*/
16601660
public function removeUnusedTriggers(): void
16611661
{
1662-
$this->oldViews->unsubscribe();
1662+
$this->triggerCleaner->unsubscribe();
16631663
}
16641664
}

0 commit comments

Comments
 (0)