Merge branch '2.4-develop' of https://github.com/magento-commerce/magento2ce into ACP2E-1120

Author: alzota

app/bootstrap.php

@@ -27,6 +27,7 @@
 </div>
 HTML;
     }
+    http_response_code(503);
     exit(1);
 }
 

app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing.php

@@ -390,6 +390,7 @@ protected function saveAndReplaceAdvancedPrices()
         $listSku = [];
         $tierPrices = [];
         while ($bunch = $this->_dataSourceModel->getNextBunch()) {
+            $bunchTierPrices = [];
             foreach ($bunch as $rowNum => $rowData) {
                 if (!$this->validateRow($rowData, $rowNum)) {
                     $this->addRowError(ValidatorInterface::ERROR_SKU_IS_EMPTY, $rowNum);
@@ -403,7 +404,7 @@ protected function saveAndReplaceAdvancedPrices()
                 $rowSku = $rowData[self::COL_SKU];
                 $listSku[] = $rowSku;
                 if (!empty($rowData[self::COL_TIER_PRICE_WEBSITE])) {
-                    $tierPrices[$rowSku][] = [
+                    $tierPrice = [
                         'all_groups' => $rowData[self::COL_TIER_PRICE_CUSTOMER_GROUP] == self::VALUE_ALL_GROUPS,
                         'customer_group_id' => $this->getCustomerGroupId(
                             $rowData[self::COL_TIER_PRICE_CUSTOMER_GROUP]
@@ -415,17 +416,26 @@ protected function saveAndReplaceAdvancedPrices()
                             ? $rowData[self::COL_TIER_PRICE] : null,
                         'website_id' => $this->getWebSiteId($rowData[self::COL_TIER_PRICE_WEBSITE])
                     ];
+                    if (\Magento\ImportExport\Model\Import::BEHAVIOR_APPEND == $behavior) {
+                         $bunchTierPrices[$rowSku][] = $tierPrice;
+                    }
+                    if (\Magento\ImportExport\Model\Import::BEHAVIOR_REPLACE == $behavior) {
+                        $tierPrices[$rowSku][] = $tierPrice;
+                    }
                 }
             }
 
             if (\Magento\ImportExport\Model\Import::BEHAVIOR_APPEND == $behavior) {
-                $this->processCountExistingPrices($tierPrices, self::TABLE_TIER_PRICE)
-                    ->processCountNewPrices($tierPrices);
+                $this->processCountExistingPrices($bunchTierPrices, self::TABLE_TIER_PRICE)
+                    ->processCountNewPrices($bunchTierPrices);
 
-                $this->saveProductPrices($tierPrices, self::TABLE_TIER_PRICE);
-                if ($listSku) {
-                    $this->setUpdatedAt($listSku);
-                }
+                $this->saveProductPrices($bunchTierPrices, self::TABLE_TIER_PRICE);
+            }
+        }
+
+        if (\Magento\ImportExport\Model\Import::BEHAVIOR_APPEND == $behavior) {
+            if ($listSku) {
+                $this->setUpdatedAt($listSku);
             }
         }
 

app/code/Magento/Authorization/Model/Acl/AclRetriever.php

@@ -21,8 +21,8 @@
  */
 class AclRetriever
 {
-    const PERMISSION_ANONYMOUS = 'anonymous';
-    const PERMISSION_SELF = 'self';
+    public const PERMISSION_ANONYMOUS = 'anonymous';
+    public const PERMISSION_SELF = 'self';
 
     /**
      * @var \Psr\Log\LoggerInterface
@@ -117,7 +117,7 @@ public function getAllowedResourcesByRole($roleId)
         /** @var \Magento\Authorization\Model\Rules $ruleItem */
         foreach ($rulesCollection->getItems() as $ruleItem) {
             $resourceId = $ruleItem->getResourceId();
-            if ($acl->has($resourceId) && $acl->isAllowed($roleId, $resourceId)) {
+            if ($acl->hasResource($resourceId) && $acl->isAllowed($roleId, $resourceId)) {
                 $allowedResources[] = $resourceId;
             }
         }

app/code/Magento/Authorization/Model/Acl/Loader/Rule.php

@@ -104,7 +104,7 @@ private function applyPermissionsAccordingToRules(Acl $acl): array
             $resource = $rule['resource_id'];
             $privileges = !empty($rule['privileges']) ? explode(',', $rule['privileges']) : null;
 
-            if ($acl->has($resource)) {
+            if ($acl->hasResource($resource)) {
                 $foundResources[$resource] = $resource;
                 if ($rule['permission'] == 'allow') {
                     if ($resource === $this->_rootResource->getId()) {

app/code/Magento/Authorization/Model/Acl/Role/Generic.php

@@ -5,9 +5,11 @@
  */
 namespace Magento\Authorization\Model\Acl\Role;
 
+use Laminas\Permissions\Acl\Role\GenericRole;
+
 /**
  * Generic acl role
  */
-class Generic extends \Zend_Acl_Role
+class Generic extends GenericRole
 {
 }

app/code/Magento/Authorization/README.md

@@ -4,7 +4,7 @@ The Magento_Authorization module enables management of access control list roles
 
 ## Installation details
 
-The Magento_AdminNotification module creates the following tables in the database:
+The Magento_Authorization module creates the following tables in the database using `db_schema.xml`:
 
 - `authorization_role`
 - `authorization_rule`

app/code/Magento/Authorization/Test/Unit/Model/Acl/AclRetrieverTest.php

@@ -165,9 +165,9 @@ protected function createAclRetriever()
         /**
          * @var Acl|MockObject $aclMock
          */
-        $aclMock = $this->createPartialMock(Acl::class, ['has', 'isAllowed']);
-        $aclMock->expects($this->any())->method('has')->willReturn(true);
-        $aclMock->expects($this->any())->method('isAllowed')->willReturn(true);
+        $aclMock = $this->createPartialMock(Acl::class, ['hasResource', 'isAllowed']);
+        $aclMock->method('hasResource')->willReturn(true);
+        $aclMock->method('isAllowed')->willReturn(true);
 
         /**
          * @var Builder|MockObject $aclBuilderMock

app/code/Magento/Authorization/Test/Unit/Model/Acl/Loader/RuleTest.php

@@ -114,7 +114,7 @@ public function testPopulateAclFromCache(): void
             );
 
         $aclMock = $this->createMock(Acl::class);
-        $aclMock->method('has')->willReturn(true);
+        $aclMock->method('hasResource')->willReturn(true);
         $aclMock
             ->method('allow')
             ->withConsecutive(

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

@@ -7,6 +7,7 @@
 namespace Magento\Backend\Controller\Adminhtml\System\Design;
 
 use Magento\Framework\App\Action\HttpPostActionInterface;
+use Magento\Framework\Filter\FilterInput;
 
 /**
  * Save design action.
@@ -21,13 +22,13 @@ class Save extends \Magento\Backend\Controller\Adminhtml\System\Design implement
      */
     protected function _filterPostData($data)
     {
-        $inputFilter = new \Zend_Filter_Input(
+        $inputFilter = new FilterInput(
             ['date_from' => $this->dateFilter, 'date_to' => $this->dateFilter],
             [],
             $data
         );
-        $data = $inputFilter->getUnescaped();
-        return $data;
+
+        return $inputFilter->getUnescaped();
     }
 
     /**

app/code/Magento/Backend/Model/Auth/Session.php

@@ -18,8 +18,6 @@
  * @api
  * @method \Magento\User\Model\User|null getUser()
  * @method \Magento\Backend\Model\Auth\Session setUser(\Magento\User\Model\User $value)
- * @method \Magento\Framework\Acl|null getAcl()
- * @method \Magento\Backend\Model\Auth\Session setAcl(\Magento\Framework\Acl $value)
  * @method int getUpdatedAt()
  * @method \Magento\Backend\Model\Auth\Session setUpdatedAt(int $value)
  *
@@ -62,6 +60,11 @@ class Session extends \Magento\Framework\Session\SessionManager implements \Mage
      */
     private $messageManager;
 
+    /**
+     * @var \Magento\Framework\Acl|null
+     */
+    private $acl = null;
+
     /**
      * @param \Magento\Framework\App\Request\Http $request
      * @param \Magento\Framework\Session\SidResolverInterface $sidResolver
@@ -152,7 +155,7 @@ public function isAllowed($resource, $privilege = null)
                 return $acl->isAllowed($user->getAclRole(), $resource, $privilege);
             } catch (\Exception $e) {
                 try {
-                    if (!$acl->has($resource)) {
+                    if (!$acl->hasResource($resource)) {
                         return $acl->isAllowed($user->getAclRole(), null, $privilege);
                     }
                 } catch (\Exception $e) {
@@ -284,4 +287,33 @@ public function isValidForPath($path)
     {
         return true;
     }
+
+    /**
+     * Set Acl model
+     *
+     * @return \Magento\Framework\Acl
+     */
+    public function getAcl()
+    {
+        return $this->acl;
+    }
+
+    /**
+     * Retrieve Acl
+     *
+     * @param \Magento\Framework\Acl $acl
+     * @return void
+     */
+    public function setAcl(\Magento\Framework\Acl $acl)
+    {
+        $this->acl = $acl;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getData($key = '', $clear = false)
+    {
+        return $key === 'acl' ? $this->getAcl() : parent::getData($key, $clear);
+    }
 }