Merge branch '2.4-develop' into B2B-2053

Author: danmooney2

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/Checkout/Model/GuestPaymentInformationManagement.php

@@ -176,6 +176,10 @@ public function savePaymentInformation(
         }
         $this->limitShippingCarrier($quote);
 
+        if (!(int)$quote->getItemsQty()) {
+            throw new CouldNotSaveException(__('Some of the products are disabled.'));
+        }
+
         $this->paymentMethodManagement->set($cartId, $paymentMethod);
         return true;
     }

app/code/Magento/Checkout/Test/Unit/Model/GuestPaymentInformationManagementTest.php

@@ -180,6 +180,7 @@ public function testSavePaymentInformationWithoutBillingAddress()
         $paymentMock = $this->getMockForAbstractClass(PaymentInterface::class);
         $billingAddressMock = $this->getMockForAbstractClass(AddressInterface::class);
         $quoteMock = $this->createMock(Quote::class);
+        $quoteMock->expects($this->any())->method('getItemsQty')->willReturn(1);
 
         $billingAddressMock->expects($this->once())->method('setEmail')->with($email)->willReturnSelf();
 
@@ -210,6 +211,7 @@ public function testSavePaymentInformationAndPlaceOrderWithLocalizedException()
 
         $quoteMock = $this->createMock(Quote::class);
         $quoteMock->method('getBillingAddress')->willReturn($billingAddressMock);
+        $quoteMock->expects($this->any())->method('getItemsQty')->willReturn(1);
         $this->cartRepositoryMock->method('getActive')->with($cartId)->willReturn($quoteMock);
 
         $quoteIdMask = $this->getMockBuilder(QuoteIdMask::class)
@@ -231,6 +233,35 @@ public function testSavePaymentInformationAndPlaceOrderWithLocalizedException()
         $this->model->savePaymentInformationAndPlaceOrder($cartId, $email, $paymentMock, $billingAddressMock);
     }
 
+    public function testSavePaymentInformationAndPlaceOrderWithDisabledProduct()
+    {
+        $this->expectException('Magento\Framework\Exception\CouldNotSaveException');
+        $this->expectExceptionMessage('Some of the products are disabled.');
+        $cartId = 100;
+        $email = 'email@magento.com';
+        $paymentMock = $this->getMockForAbstractClass(PaymentInterface::class);
+        $billingAddressMock = $this->getMockForAbstractClass(AddressInterface::class);
+
+        $quoteMock = $this->createMock(Quote::class);
+        $quoteMock->method('getBillingAddress')->willReturn($billingAddressMock);
+        $quoteMock->expects($this->any())->method('getItemsQty')->willReturn(0);
+        $this->cartRepositoryMock->method('getActive')->with($cartId)->willReturn($quoteMock);
+
+        $quoteIdMask = $this->getMockBuilder(QuoteIdMask::class)
+            ->addMethods(['getQuoteId'])
+            ->onlyMethods(['load'])
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->quoteIdMaskFactoryMock->method('create')->willReturn($quoteIdMask);
+        $quoteIdMask->method('load')->with($cartId, 'masked_id')->willReturnSelf();
+        $quoteIdMask->method('getQuoteId')->willReturn($cartId);
+
+        $billingAddressMock->expects($this->once())->method('setEmail')->with($email)->willReturnSelf();
+
+        $this->paymentMethodManagementMock->expects($this->never())->method('set')->with($cartId, $paymentMock);
+        $this->model->savePaymentInformationAndPlaceOrder($cartId, $email, $paymentMock, $billingAddressMock);
+    }
+
     /**
      * @param int $cartId
      * @param MockObject $billingAddressMock
@@ -266,6 +297,9 @@ private function getMockForAssignBillingAddress(
         $this->cartRepositoryMock->method('getActive')
             ->with($cartId)
             ->willReturn($quote);
+        $quote->expects($this->any())
+            ->method('getItemsQty')
+            ->willReturn(1);
         $quote->expects($this->any())
             ->method('getBillingAddress')
             ->willReturn($quoteBillingAddress);

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",