Skip to content

Commit dd40340

Browse files
MC-32014: Remove google-shopping-ads module from core in 2.4.1
1 parent a17f6d2 commit dd40340

File tree

3 files changed

+17
-0
lines changed

3 files changed

+17
-0
lines changed

dev/tests/setup-integration/framework/bootstrap.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,8 @@
102102
/* Unset declared global variables to release the PHPUnit from maintaining their values between tests */
103103
unset($testsBaseDir, $logWriter, $settings, $shell, $application, $bootstrap);
104104
} catch (\Exception $e) {
105+
// phpcs:disable Magento2.Security.LanguageConstruct
105106
echo $e . PHP_EOL;
106107
exit(1);
108+
// phpcs:enable Magento2.Security.LanguageConstruct
107109
}

lib/internal/Magento/Framework/Mview/Test/Unit/View/CollectionTest.php

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,15 @@ function ($elem) {
143143
$indexers
144144
));
145145

146+
$this->mviewConfigMock
147+
->method('getView')
148+
->willReturnMap(array_map(
149+
function ($elem) {
150+
return [$elem, ['view_id' => $elem]];
151+
},
152+
$views
153+
));
154+
146155
$this->entityFactoryMock
147156
->method('create')
148157
->willReturnMap([

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -995,6 +995,7 @@ private function throwExceptionForNotWritablePaths(array $paths)
995995
private function handleDBSchemaData($setup, $type, array $request)
996996
{
997997
if (!($type === 'schema' || $type === 'data')) {
998+
// phpcs:ignore Magento2.Exceptions.DirectThrow
998999
throw new Exception("Unsupported operation type $type is requested");
9991000
}
10001001
$resource = new \Magento\Framework\Module\ModuleResource($this->context);
@@ -1117,6 +1118,7 @@ private function assertDbConfigExists()
11171118
{
11181119
$config = $this->deploymentConfig->get(ConfigOptionsListConstants::CONFIG_PATH_DB_CONNECTION_DEFAULT);
11191120
if (!$config) {
1121+
// phpcs:ignore Magento2.Exceptions.DirectThrow
11201122
throw new Exception(
11211123
"Can't run this operation: configuration for DB connection is absent."
11221124
);
@@ -1193,6 +1195,7 @@ protected function createSchemaDataHandler($className, $interfaceName)
11931195
{
11941196
if (class_exists($className)) {
11951197
if (!is_subclass_of($className, $interfaceName) && $className !== $interfaceName) {
1198+
// phpcs:ignore Magento2.Exceptions.DirectThrow
11961199
throw new Exception($className . ' must implement \\' . $interfaceName);
11971200
} else {
11981201
return $this->objectManagerProvider->get()->create($className);
@@ -1282,6 +1285,7 @@ public function updateModulesSequence($keepGeneratedFiles = false)
12821285
{
12831286
$config = $this->deploymentConfig->get(ConfigOptionsListConstants::KEY_MODULES);
12841287
if (!$config) {
1288+
// phpcs:ignore Magento2.Exceptions.DirectThrow
12851289
throw new Exception(
12861290
"Can't run this operation: deployment configuration is absent."
12871291
. " Run 'magento setup:config:set --help' for options."
@@ -1579,6 +1583,7 @@ private function getSchemaDataHandler($moduleName, $type)
15791583
$interface = self::DATA_INSTALL;
15801584
break;
15811585
default:
1586+
// phpcs:ignore Magento2.Exceptions.DirectThrow
15821587
throw new Exception("$className does not exist");
15831588
}
15841589

@@ -1602,6 +1607,7 @@ private function generateListOfModuleContext($resource, $type)
16021607
} elseif ($type === 'data-version') {
16031608
$dbVer = $resource->getDataVersion($moduleName);
16041609
} else {
1610+
// phpcs:ignore Magento2.Exceptions.DirectThrow
16051611
throw new Exception("Unsupported version type $type is requested");
16061612
}
16071613
if ($dbVer !== false) {

0 commit comments

Comments
 (0)