Merge pull request #11 from magento-commerce/develop

Merge develop into 1.0
magento · Jul 20, 2021 · 6dca123 · 6dca123
2 parents 86fc24f + 56b96f5
commit 6dca123
Show file tree

Hide file tree

Showing 10 changed files with 58 additions and 17 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -46,6 +46,9 @@ jobs:
       env:
         - TEST_SUITE=functional
 
+before_install:
+  # https://github.com/kylekatarnls/update-helper/issues/9
+  - if [ -n "${COMPOSER_VERSION}" ]; then travis_retry composer self-update ${COMPOSER_VERSION}; fi;
 
 install:
   - composer config github-oauth.github.com ${GITHUB_TOKEN}

diff --git a/Model/Cache/Evictor.php b/Model/Cache/Evictor.php
@@ -22,6 +22,9 @@ class Evictor
     const DEFAULT_SLEEP_TIMEOUT = 20000;
     const CONFIG_PATH_ENABLED = 'cache_evict/enabled';
     const CONFIG_PATH_LIMIT = 'cache_evict/limit';
+    const BACKEND_OPTION_KEY_SERVER = 'server';
+    const BACKEND_OPTION_KEY_PORT = 'port';
+    const BACKEND_OPTION_KEY_DATABASE = 'database';
 
     /**
      * @var DeploymentConfig
@@ -60,11 +63,8 @@ public function evict(): int
                 $name
             ));
 
-            if (!isset(
-                $cacheConfig['backend_options']['server'],
-                $cacheConfig['backend_options']['port'],
-                $cacheConfig['backend_options']['database']
-            )) {
+            $backendOptions = $this->getConfigBackendOptions((array)$cacheConfig);
+            if (!$this->validateBackendOptions($backendOptions)) {
                 $this->logger->debug(sprintf(
                     'Cache config for database "%s" config is not valid',
                     $name
@@ -74,9 +74,9 @@ public function evict(): int
             }
 
             $dbKeys = $this->run(
-                (string)$cacheConfig['backend_options']['server'],
-                (int)$cacheConfig['backend_options']['port'],
-                (int)$cacheConfig['backend_options']['database']
+                (string)$backendOptions[self::BACKEND_OPTION_KEY_SERVER],
+                (int)$backendOptions[self::BACKEND_OPTION_KEY_PORT],
+                (int)$backendOptions[self::BACKEND_OPTION_KEY_DATABASE]
             );
             $evictedKeys += $dbKeys;
 
@@ -86,6 +86,41 @@ public function evict(): int
         return $evictedKeys;
     }
 
+    /**
+     * Get Cache Config Value
+     *
+     * @param array $cacheConfig
+     * @return array
+     */
+    private function getConfigBackendOptions(array $cacheConfig): array
+    {
+        $backendOptions = [];
+        if (isset($cacheConfig['backend_options'])) {
+            $backendOptions = $cacheConfig['backend_options'];
+        }
+        if (isset($cacheConfig['backend_options']['remote_backend_options'])) {
+            $backendOptions = $cacheConfig['backend_options']['remote_backend_options'];
+        }
+        return (array)$backendOptions;
+    }
+
+    /**
+     * Validate Cache Configuration
+     *
+     * @param array $backendOptions
+     * @return bool
+     */
+    private function validateBackendOptions(array $backendOptions): bool
+    {
+        if (isset($backendOptions[self::BACKEND_OPTION_KEY_SERVER])
+            && isset($backendOptions[self::BACKEND_OPTION_KEY_PORT])
+            && isset($backendOptions[self::BACKEND_OPTION_KEY_DATABASE])
+        ) {
+            return true;
+        }
+        return false;
+    }
+
     /**
      * @param string $host
      * @param int $port

diff --git a/Model/Cache/InvalidateLogger.php b/Model/Cache/InvalidateLogger.php
@@ -54,6 +54,7 @@ class InvalidateLogger extends \Magento\Framework\Cache\InvalidateLogger
         'acl_cache',
         'reflection',
         'db_ddl',
+        'LOCKED_RECORD_INFO_SYSTEM_CONFIG',
         'all'
     ];
 

diff --git a/Model/Observer/CacheFlushAll.php b/Model/Observer/CacheFlushAll.php
@@ -34,6 +34,7 @@ public function __construct(InvalidateLogger $logger)
      * Log cache flush action to a file
      *
      * @param Observer $observer
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function execute(Observer $observer)
     {

diff --git a/Model/UrlFixer.php b/Model/UrlFixer.php
@@ -29,6 +29,6 @@ public function run(Store $store, $url): string
             return preg_replace('|/magento/|', '/', $url, 1);
         }
 
-        return $url;
+        return rtrim($url, '/');
     }
 }
diff --git a/Test/Functional/Acceptance/AcceptanceCest.php b/Test/Functional/Acceptance/AcceptanceCest.php
@@ -50,7 +50,7 @@ public function testPatches(\CliTester $I, \Codeception\Example $data): void
     {
         $this->prepareTemplate($I, $data['magentoVersion']);
         $this->removeESIfExists($I, $data['magentoVersion']);
-        $I->runEceDockerCommand('build:compose --mode=production');
+        $I->generateDockerCompose('--mode=production');
         $I->runDockerComposeCommand('run build cloud-build');
         $I->startEnvironment();
         $I->runDockerComposeCommand('run deploy cloud-deploy');

diff --git a/Test/Unit/Model/UrlFixerTest.php b/Test/Unit/Model/UrlFixerTest.php
@@ -74,17 +74,17 @@ public function runDataProvider(): array
         return [
             'rewrites enabled, url without "magento" part' => [
                 'http://example.com/',
-                'http://example.com/',
+                'http://example.com',
             ],
             'rewrites disabled, url without "magento" part' => [
                 'http://example.com/',
-                'http://example.com/',
+                'http://example.com',
                 true,
                 true,
             ],
             'rewrites enabled, url with "magento" part' => [
                 'http://example.com/magento/',
-                'http://example.com/magento/',
+                'http://example.com/magento',
                 false,
                 true,
             ],
@@ -108,13 +108,13 @@ public function runDataProvider(): array
             ],
             'rewrites disabled, url with "magento2" part' => [
                 'http://example.com/magento2/',
-                'http://example.com/magento2/',
+                'http://example.com/magento2',
                 true,
                 false,
             ],
             'rewrites disabled, with "magento" host' => [
                 'http://magento.com/magento2/',
-                'http://magento.com/magento2/',
+                'http://magento.com/magento2',
                 true,
                 false,
             ],

diff --git a/composer.json b/composer.json
@@ -2,7 +2,7 @@
   "name": "magento/magento-cloud-components",
   "description": "Cloud Components Module for Magento 2.x",
   "type": "magento2-module",
-  "version": "1.0.7",
+  "version": "1.0.8",
   "require": {
     "php": "^7.0",
     "ext-json": "*",

diff --git a/etc/di.xml b/etc/di.xml
@@ -66,6 +66,6 @@
         </arguments>
     </type>
     <type name="Magento\Framework\Indexer\ActionInterface">
-        <plugin name="cache_cleaner_after_reindex" type="Magento\CloudComponents\Model\Indexation\Logger" />
+        <plugin name="cache_logger_after_reindex" type="Magento\CloudComponents\Model\Indexation\Logger" />
     </type>
 </config>
diff --git a/travis.php.ini b/travis.php.ini
@@ -0,0 +1 @@
+memory_limit = 4G