Merge remote-tracking branch 'origin/2.4-develop' into PWA-2356-integration-test-failures

Author: cspruiell

app/code/Magento/Backend/App/DefaultPath.php

@@ -1,13 +1,13 @@
 <?php
 /**
- * Default application path for backend area
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento\Backend\App;
 
 /**
+ * Default application path for backend area
+ *
  * @api
  * @since 100.0.2
  */
@@ -24,7 +24,11 @@ class DefaultPath implements \Magento\Framework\App\DefaultPathInterface
      */
     public function __construct(\Magento\Backend\App\ConfigInterface $config)
     {
-        $pathParts = explode('/', $config->getValue('web/default/admin'));
+        $pathConfigValue = $config->getValue('web/default/admin') ?? '';
+        $pathParts  = [];
+        if ($pathConfigValue) {
+            $pathParts = explode('/', $pathConfigValue);
+        }
 
         $this->_parts = [
             'area' => isset($pathParts[0]) ? $pathParts[0] : '',

app/code/Magento/Backend/view/adminhtml/templates/widget/tabshoriz.phtml

@@ -19,7 +19,7 @@ use Magento\Framework\View\Helper\SecureHtmlRenderer;
     <?php foreach ($tabs as $_tab): ?>
         <?php $tabId = $block->getTabId($_tab) ?>
         <?php $_tabClass = 'tab-item-link ' . $block->getTabClass($_tab) . ' ' .
-            (preg_match('/\s?ajax\s?/', $_tab->getClass()) ? 'notloaded' : '') ?>
+            ($_tab->getClass() !== null ? (preg_match('/\s?ajax\s?/', $_tab->getClass()) ? 'notloaded' : '') : '') ?>
         <?php $_tabType = (!preg_match('/\s?ajax\s?/', $_tabClass) && $block->getTabUrl($_tab) != '#') ? 'link' : '' ?>
         <?php $_tabHref = $block->getTabUrl($_tab) == '#' ?
             '#' . $tabId . '_content' :

app/code/Magento/Deploy/Model/Plugin/ConfigChangeDetector.php

@@ -7,6 +7,7 @@
 namespace Magento\Deploy\Model\Plugin;
 
 use Magento\Deploy\Model\DeploymentConfig\ChangeDetector;
+use Magento\Framework\App\DeploymentConfig;
 use Magento\Framework\App\FrontControllerInterface;
 use Magento\Framework\App\RequestInterface;
 use Magento\Framework\Exception\LocalizedException;
@@ -20,19 +21,26 @@
  */
 class ConfigChangeDetector
 {
+    private const DEPLOYMENT_BLUE_GREEN_ENABLED = 'deployment/blue_green/enabled';
+
     /**
      * Configuration data changes detector.
      *
      * @var ChangeDetector
      */
     private $changeDetector;
 
+    /** @var DeploymentConfig  */
+    private $deploymentConfig;
+
     /**
-     * @param ChangeDetector $changeDetector configuration data changes detector
+     * @param ChangeDetector $changeDetector
+     * @param DeploymentConfig $deploymentConfig
      */
-    public function __construct(ChangeDetector $changeDetector)
+    public function __construct(ChangeDetector $changeDetector, DeploymentConfig $deploymentConfig)
     {
         $this->changeDetector = $changeDetector;
+        $this->deploymentConfig = $deploymentConfig;
     }
 
     /**
@@ -46,7 +54,9 @@ public function __construct(ChangeDetector $changeDetector)
      */
     public function beforeDispatch(FrontControllerInterface $subject, RequestInterface $request)
     {
-        if ($this->changeDetector->hasChanges()) {
+        if (!$this->deploymentConfig->get(self::DEPLOYMENT_BLUE_GREEN_ENABLED)
+            && $this->changeDetector->hasChanges()
+        ) {
             throw new LocalizedException(
                 __(
                     'The configuration file has changed.'

app/code/Magento/Deploy/Test/Unit/Model/Plugin/ConfigChangeDetectorTest.php

@@ -9,6 +9,7 @@
 
 use Magento\Deploy\Model\DeploymentConfig\ChangeDetector;
 use Magento\Deploy\Model\Plugin\ConfigChangeDetector;
+use Magento\Framework\App\DeploymentConfig;
 use Magento\Framework\App\FrontControllerInterface;
 use Magento\Framework\App\RequestInterface;
 use PHPUnit\Framework\MockObject\MockObject;
@@ -36,6 +37,11 @@ class ConfigChangeDetectorTest extends TestCase
      */
     private $requestMock;
 
+    /**
+     * @var DeploymentConfig|mixed|MockObject
+     */
+    private $deploymentConfig;
+
     /**
      * @return void
      */
@@ -48,8 +54,14 @@ protected function setUp(): void
             ->getMockForAbstractClass();
         $this->requestMock = $this->getMockBuilder(RequestInterface::class)
             ->getMockForAbstractClass();
+        $this->deploymentConfig =$this->getMockBuilder(DeploymentConfig::class)
+            ->disableOriginalConstructor()
+            ->getMock();
 
-        $this->configChangeDetectorPlugin = new ConfigChangeDetector($this->changeDetectorMock);
+        $this->configChangeDetectorPlugin = new ConfigChangeDetector(
+            $this->changeDetectorMock,
+            $this->deploymentConfig
+        );
     }
 
     /**
@@ -65,8 +77,6 @@ public function testBeforeDispatchWithoutException()
 
     /**
      * @return void
-     * @codingStandardsIgnoreStart
-     * @codingStandardsIgnoreEnd
      */
     public function testBeforeDispatchWithException()
     {
@@ -80,4 +90,13 @@ public function testBeforeDispatchWithException()
             ->willReturn(true);
         $this->configChangeDetectorPlugin->beforeDispatch($this->frontControllerMock, $this->requestMock);
     }
+
+    public function testBeforeDispatchWithBlueGreen()
+    {
+        $this->deploymentConfig->expects($this->atLeastOnce())
+            ->method('get')
+            ->with('deployment/blue_green/enabled')
+            ->willReturn(1);
+        $this->configChangeDetectorPlugin->beforeDispatch($this->frontControllerMock, $this->requestMock);
+    }
 }

app/code/Magento/Eav/Model/Entity/Type.php

@@ -303,7 +303,7 @@ public function getValueTablePrefix()
      */
     public function getEntityTablePrefix()
     {
-        $tablePrefix = trim($this->_data['value_table_prefix']);
+        $tablePrefix = isset($this->_data['value_table_prefix']) ? trim($this->_data['value_table_prefix']) : '';
 
         if (empty($tablePrefix)) {
             $tablePrefix = $this->getEntityTable();

composer.json

@@ -88,7 +88,6 @@
         "magento/magento-coding-standard": "*",
         "magento/magento2-functional-testing-framework": "^3.7",
         "pdepend/pdepend": "~2.10.0",
-        "phpcompatibility/php-compatibility": "^9.3",
         "phpmd/phpmd": "^2.9.1",
         "phpstan/phpstan": "~1.1.0",
         "phpunit/phpunit": "~9.5.0",

composer.lock

@@ -208,43 +208,6 @@ private function getFullWhitelist()
         }
     }
 
-    /**
-     * Retrieves the lowest and highest PHP version specified in <kbd>composer.json</var> of project.
-     *
-     * @return array
-     */
-    private function getTargetPhpVersions(): array
-    {
-        $composerJson = json_decode(file_get_contents(BP . '/composer.json'), true);
-        $versionsRange = [];
-
-        if (isset($composerJson['require']['php'])) {
-            $versions = explode('||', $composerJson['require']['php']);
-
-            //normalize version constraints
-            foreach ($versions as $key => $version) {
-                $version = ltrim($version, '^~');
-                $version = str_replace('*', '999', $version);
-
-                $versions[$key] = $version;
-            }
-
-            //sort versions
-            usort($versions, 'version_compare');
-
-            $versionsRange[] = array_shift($versions);
-            if (!empty($versions)) {
-                $versionsRange[] = array_pop($versions);
-            }
-            foreach ($versionsRange as $key => $version) {
-                $versionParts  = explode('.', $versionsRange[$key]);
-                $versionsRange[$key] = sprintf('%s.%s', $versionParts[0], $versionParts[1] ?? '0');
-            }
-        }
-
-        return $versionsRange;
-    }
-
     /**
      * Returns whether a full scan was requested.
      *
@@ -405,39 +368,6 @@ public function testStrictTypes()
         );
     }
 
-    /**
-     * Test for compatibility to lowest PHP version declared in <kbd>composer.json</kbd>.
-     */
-    public function testPhpCompatibility()
-    {
-        $targetVersions = $this->getTargetPhpVersions();
-        $this->assertNotEmpty($targetVersions, 'No supported versions information in composer.json');
-        $reportFile    = self::$reportDir . '/phpcompatibility_report.txt';
-        $rulesetDir    = __DIR__ . '/_files/PHPCompatibilityMagento';
-
-        if (!file_exists($reportFile)) {
-            touch($reportFile);
-        }
-
-        $codeSniffer = new PhpCompatibility($rulesetDir, $reportFile, new Wrapper());
-        if (count($targetVersions) > 1) {
-            $codeSniffer->setTestVersion($targetVersions[0] . '-' . $targetVersions[1]);
-        } else {
-            $codeSniffer->setTestVersion($targetVersions[0]);
-        }
-
-        $result = $codeSniffer->run(
-            $this->isFullScan() ? $this->getFullWhitelist() : self::getWhitelist(['php', 'phtml'])
-        );
-        $report = file_get_contents($reportFile);
-
-        $this->assertEquals(
-            0,
-            $result,
-            'PHP Compatibility detected violation(s):' . PHP_EOL . $report
-        );
-    }
-
     /**
      * Test code quality using PHPStan
      *