ACQE-8184: Backordered quantity is visible on order item level in backend

- Resolved conflicts

Author: glo74186

app/bootstrap.php

@@ -13,9 +13,8 @@
 }
 #ini_set('display_errors', 1);
 
-/* PHP version validation */
-if (!defined('PHP_VERSION_ID') || PHP_VERSION_ID < 80100) {
-    if (PHP_SAPI == 'cli') {
+if (PHP_VERSION_ID < 80100) {
+    if (PHP_SAPI === 'cli') {
         echo 'Magento supports PHP 8.1.0 or later. ' .
             'Please read https://experienceleague.adobe.com/docs/commerce-operations/installation-guide/system-requirements.html';
     } else {
@@ -31,16 +30,6 @@
     exit(1);
 }
 
-// PHP 8 compatibility. Define constants that are not present in PHP < 8.0
-if (!defined('PHP_VERSION_ID') || PHP_VERSION_ID < 80000) {
-    if (!defined('T_NAME_QUALIFIED')) {
-        define('T_NAME_QUALIFIED', 24001);
-    }
-    if (!defined('T_NAME_FULLY_QUALIFIED')) {
-        define('T_NAME_FULLY_QUALIFIED', 24002);
-    }
-}
-
 require_once __DIR__ . '/autoload.php';
 // Sets default autoload mappings, may be overridden in Bootstrap::create
 \Magento\Framework\App\Bootstrap::populateAutoloader(BP, []);
@@ -50,17 +39,6 @@
 $mask = file_exists($umaskFile) ? octdec(file_get_contents($umaskFile)) : 002;
 umask($mask);
 
-if (empty($_SERVER['ENABLE_IIS_REWRITES']) || ($_SERVER['ENABLE_IIS_REWRITES'] != 1)) {
-    /*
-     * Unset headers used by IIS URL rewrites.
-     */
-    unset($_SERVER['HTTP_X_REWRITE_URL']);
-    unset($_SERVER['HTTP_X_ORIGINAL_URL']);
-    unset($_SERVER['IIS_WasUrlRewritten']);
-    unset($_SERVER['UNENCODED_URL']);
-    unset($_SERVER['ORIG_PATH_INFO']);
-}
-
 if (
     (!empty($_SERVER['MAGE_PROFILER']) || file_exists(BP . '/var/profiler.flag'))
     && isset($_SERVER['HTTP_ACCEPT'])

app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/Index.php

@@ -6,6 +6,7 @@
 namespace Magento\AdminNotification\Controller\Adminhtml\Notification;
 
 use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
+use Magento\Framework\View\Result\Page;
 
 class Index extends \Magento\AdminNotification\Controller\Adminhtml\Notification implements HttpGetActionInterface
 {
@@ -14,14 +15,14 @@ class Index extends \Magento\AdminNotification\Controller\Adminhtml\Notification
      */
     public function execute()
     {
-        $this->_view->loadLayout();
-        $this->_setActiveMenu(
-            'Magento_AdminNotification::system_adminnotification'
-        )->_addBreadcrumb(
+        /** @var Page $resultPage */
+        $resultPage = $this->resultFactory->create(\Magento\Framework\Controller\ResultFactory::TYPE_PAGE);
+        $resultPage->setActiveMenu('Magento_AdminNotification::system_adminnotification');
+        $resultPage->addBreadcrumb(
             __('Messages Inbox'),
             __('Messages Inbox')
         );
-        $this->_view->getPage()->getConfig()->getTitle()->prepend(__('Notifications'));
-        return $this->_view->renderLayout();
+        $resultPage->getConfig()->getTitle()->prepend(__('Notifications'));
+        return $resultPage;
     }
 }

app/code/Magento/AdvancedSearch/Model/Client/ClientException.php

@@ -0,0 +1,13 @@
+<?php
+/**
+ * Copyright 2025 Adobe
+ * All Rights Reserved.
+ */
+declare(strict_types=1);
+
+namespace Magento\AdvancedSearch\Model\Client;
+
+class ClientException extends \Exception
+{
+
+}

app/code/Magento/AwsS3/Driver/AwsS3.php

@@ -188,7 +188,9 @@ private function createDirectoryRecursively(string $path): bool
         $parentDir = dirname($path);
 
         while (!$this->isDirectory($parentDir)) {
-            $this->createDirectoryRecursively($parentDir);
+            if (!$this->createDirectoryRecursively($parentDir)) {
+                return false;
+            }
         }
 
         if (!$this->isDirectory($path)) {

app/code/Magento/AwsS3/Test/Unit/Driver/AwsS3Test.php

@@ -18,6 +18,7 @@
 
 /**
  * @see AwsS3
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class AwsS3Test extends TestCase
 {
@@ -497,6 +498,23 @@ public function testCreateDirectory(): void
         self::assertTrue($this->driver->createDirectory(self::URL . 'test/test2/'));
     }
 
+    /**
+     * This test ensures that the method does not loop infinitely in case of an exception
+     *
+     * @return void
+     * @throws FileSystemException
+     * @throws \PHPUnit\Framework\MockObject\Exception
+     */
+    public function testShouldFailSafelyIfUnableToCreateDirectory(): void
+    {
+        $this->adapterMock->expects(self::once())
+            ->method('createDirectory')
+            ->willThrowException($this->createMock(\League\Flysystem\FilesystemException::class))
+            ->with('test');
+
+        self::assertFalse($this->driver->createDirectory(self::URL . 'test/test2/'));
+    }
+
     public function testRename(): void
     {
         $this->adapterMock->expects(self::once())

app/code/Magento/Backend/Block/Store/Switcher.php

@@ -457,6 +457,15 @@ public function getCurrentSelectionName()
         if ($this->getCurrentWebsiteName() !== '') {
             return $this->getCurrentWebsiteName();
         }
+
+        if (!$this->hasDefaultOption()) {
+            $websites = $this->getWebsites();
+            if (!empty($websites)) {
+                $websiteArray = array_values($websites);
+                return $websiteArray[0]->getName();
+            }
+        }
+
         return $this->getDefaultSelectionName();
     }
 

app/code/Magento/Backend/Block/Template.php

@@ -80,7 +80,9 @@ public function __construct(
         $this->formKey = $context->getFormKey();
         $this->nameBuilder = $context->getNameBuilder();
         $data['jsonHelper'] = $jsonHelper ?? ObjectManager::getInstance()->get(JsonHelper::class);
-        $data['directoryHelper']= $directoryHelper ?? ObjectManager::getInstance()->get(DirectoryHelper::class);
+        if (empty($data['directoryHelper'])) {
+            $data['directoryHelper'] = $directoryHelper ?? ObjectManager::getInstance()->get(DirectoryHelper::class);
+        }
         parent::__construct($context, $data);
     }
 
@@ -107,6 +109,7 @@ public function getFormKey()
      * not be used in future development. Module design should explicitly state dependencies to avoid requiring output
      * disabling. This functionality will temporarily be kept in Magento core, as there are unresolved modularity
      * issues that will be addressed in future releases.
+     * @see no alternatives
      */
     public function isOutputEnabled($moduleName = null)
     {

app/code/Magento/Backend/Controller/Adminhtml/System/Store/Save.php

@@ -5,6 +5,12 @@
  */
 namespace Magento\Backend\Controller\Adminhtml\System\Store;
 
+use Magento\Backend\App\Action\Context;
+use Magento\Backend\Model\View\Result\ForwardFactory;
+use Magento\Framework\App\Cache\TypeListInterface;
+use Magento\Framework\Filter\FilterManager;
+use Magento\Framework\Registry;
+use Magento\Framework\View\Result\PageFactory;
 use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
 use Magento\Store\Model\Group as StoreGroup;
 use Magento\Store\Model\Store;
@@ -17,6 +23,32 @@
  */
 class Save extends \Magento\Backend\Controller\Adminhtml\System\Store implements HttpPostActionInterface
 {
+    /**
+     * @var TypeListInterface
+     */
+    private $cacheTypeList;
+
+    /**
+     * Constructor
+     *
+     * @param Context $context
+     * @param Registry $coreRegistry
+     * @param FilterManager $filterManager
+     * @param ForwardFactory $resultForwardFactory
+     * @param PageFactory $resultPageFactory
+     * @param TypeListInterface $cacheTypeList
+     */
+    public function __construct(
+        Context $context,
+        Registry $coreRegistry,
+        FilterManager $filterManager,
+        ForwardFactory $resultForwardFactory,
+        PageFactory $resultPageFactory,
+        TypeListInterface $cacheTypeList,
+    ) {
+        parent::__construct($context, $coreRegistry, $filterManager, $resultForwardFactory, $resultPageFactory);
+        $this->cacheTypeList = $cacheTypeList;
+    }
     /**
      * Process Website model save
      *
@@ -67,6 +99,8 @@ private function processStoreSave($postData)
         if ($postData['store']['store_id']) {
             $storeModel->load($postData['store']['store_id']);
         }
+        $originalCode = $storeModel->getCode();
+        $newCode = $postData['store']['code'] ?? null;
         $storeModel->setData($postData['store']);
         if ($postData['store']['store_id'] == '') {
             $storeModel->setId(null);
@@ -84,7 +118,9 @@ private function processStoreSave($postData)
         }
         $storeModel->save();
         $this->messageManager->addSuccessMessage(__('You saved the store view.'));
-
+        if ($originalCode !== $newCode) {
+            $this->cacheTypeList->cleanType('config');
+        }
         return $postData;
     }
 
@@ -120,7 +156,10 @@ private function processGroupSave($postData)
     }
 
     /**
+     * Saving edited store information
+     *
      * @return \Magento\Backend\Model\View\Result\Redirect
+     *
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
     public function execute()

app/code/Magento/Backend/Test/Mftf/ActionGroup/AdminDisableViewProductReportActionGroup.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright 2025 Adobe
+ * All Rights Reserved.
+ */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="AdminDisableViewProductReportActionGroup">
+        <annotations>
+            <description>Admin disables most view products report in configuration</description>
+        </annotations>
+        <magentoCLI command="config:set {{AdminDisableReportConfigData.path}} {{AdminDisableReportConfigData.value}}" stepKey="setReportAsDisable"/>
+    </actionGroup>
+</actionGroups>

app/code/Magento/Backend/Test/Mftf/ActionGroup/AdminEnableViewProductReportActionGroup.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright 2025 Adobe
+ * All Rights Reserved.
+ */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="AdminEnableViewProductReportActionGroup">
+        <annotations>
+            <description>Admin enables most view products report in configuration</description>
+        </annotations>
+        <magentoCLI command="config:set {{AdminEnableReportConfigData.path}} {{AdminEnableReportConfigData.value}}" stepKey="setReportAsEnable"/>
+    </actionGroup>
+</actionGroups>