MC-36110: Remove google-shopping-ads clean cache fails

krissyhiserote · krissyhiserote · commit 7d0579d4e9dd · 2020-07-24T15:10:24.000-05:00
diff --git a/setup/src/Magento/Setup/Model/Installer.php b/setup/src/Magento/Setup/Model/Installer.php
@@ -1411,9 +1411,7 @@ private function flushCaches($types = [])
     {
         /** @var Manager $cacheManager */
         $cacheManager = $this->objectManagerProvider->get()->get(Manager::class);
-        if (empty($types)) {
-            $types = $cacheManager->getAvailableTypes();
-        }
+        $types = empty($types) ? $cacheManager->getAvailableTypes() : $types;
         $cacheManager->flush($types);
         $this->log->log('Cache types ' . implode(',', $types) . ' flushed successfully');
     }

Original file line number	Diff line number	Diff line change
`@@ -1411,9 +1411,7 @@ private function flushCaches($types = [])`
`1411`	`1411`	`{`
`1412`	`1412`	`/** @var Manager $cacheManager */`
`1413`	`1413`	`$cacheManager = $this->objectManagerProvider->get()->get(Manager::class);`
`1414`		`- if (empty($types)) {`
`1415`		`- $types = $cacheManager->getAvailableTypes();`
`1416`		`- }`
	`1414`	`+ $types = empty($types) ? $cacheManager->getAvailableTypes() : $types;`
`1417`	`1415`	`$cacheManager->flush($types);`
`1418`	`1416`	`$this->log->log('Cache types ' . implode(',', $types) . ' flushed successfully');`
`1419`	`1417`	`}`