Merge branch '2.4-develop' of https://github.com/magento-gl/magento2ce into L3_Arrows_PR_20220209

Author: nishant04412

app/code/Magento/AsynchronousOperations/Model/BulkManagement.php

@@ -104,14 +104,18 @@ public function __construct(
      */
     public function scheduleBulk($bulkUuid, array $operations, $description, $userId = null)
     {
-        $metadata = $this->metadataPool->getMetadata(BulkSummaryInterface::class);
-        $connection = $this->resourceConnection->getConnectionByName($metadata->getEntityConnectionName());
-        // save bulk summary and related operations
-        $connection->beginTransaction();
         $userType = $this->userContext->getUserType();
         if ($userType === null) {
             $userType = UserContextInterface::USER_TYPE_ADMIN;
         }
+        if ($userId === null && $userType === UserContextInterface::USER_TYPE_ADMIN) {
+            $userId = $this->userContext->getUserId();
+        }
+
+        $metadata = $this->metadataPool->getMetadata(BulkSummaryInterface::class);
+        $connection = $this->resourceConnection->getConnectionByName($metadata->getEntityConnectionName());
+        // save bulk summary and related operations
+        $connection->beginTransaction();
         try {
             /** @var BulkSummaryInterface $bulkSummary */
             $bulkSummary = $this->bulkSummaryFactory->create();

app/code/Magento/MessageQueue/Setup/ConfigOptionsList.php

@@ -62,8 +62,8 @@ public function getOptions()
                 self::INPUT_KEY_QUEUE_DEFAULT_CONNECTION,
                 TextConfigOption::FRONTEND_WIZARD_TEXT,
                 self::CONFIG_PATH_QUEUE_DEFAULT_CONNECTION,
-                'Message queues default connection. Can be db, amqp or a custom one.',
-                self::DEFAULT_QUEUE_CONNECTION
+                'Message queues default connection. Can be \'db\', \'amqp\' or a custom queue system.'
+                . 'The queue system must be installed and configured, otherwise messages won\'t be processed correctly.'
             ),
         ];
     }

composer.json

@@ -88,7 +88,7 @@
     "require-dev": {
         "allure-framework/allure-phpunit": "~1.5.0",
         "dealerdirect/phpcodesniffer-composer-installer": "^0.7.0",
-        "friendsofphp/php-cs-fixer": "~3.3.0",
+        "friendsofphp/php-cs-fixer": "~3.4.0",
         "lusitanian/oauth": "~0.8.10",
         "magento/magento-coding-standard": "*",
         "magento/magento2-functional-testing-framework": "^3.7",

composer.lock

@@ -12,7 +12,7 @@ return [
         'config' => [
             '--remote-storage-driver' => 'aws-s3',
             '--remote-storage-bucket' => 'myBucket',
-            '--remote-storage-region' => 'us-east-1'
+            '--remote-storage-region' => 'us-east-1',
         ]
     ]
     */

dev/tests/api-functional/config/post-install-setup-command-config.php.dist

@@ -0,0 +1,16 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+return [
+    \Magento\Framework\App\ResourceConnection::class,
+    \Magento\Framework\Config\Scope::class,
+    \Magento\Framework\ObjectManager\RelationsInterface::class,
+    \Magento\Framework\ObjectManager\ConfigInterface::class,
+    \Magento\Framework\Interception\DefinitionInterface::class,
+    \Magento\Framework\ObjectManager\DefinitionInterface::class,
+    \Magento\Framework\Session\Config::class,
+    \Magento\Framework\ObjectManager\Config\Mapper\Dom::class,
+];

dev/tests/integration/etc/di/persistedInstances/ce.php

@@ -23,4 +23,5 @@ return [
     'amqp-port' => '5672',
     'amqp-user' => 'guest',
     'amqp-password' => 'guest',
+    'consumers-wait-for-messages' => '0',
 ];

dev/tests/integration/etc/install-config-mysql.php.dist

@@ -6,15 +6,15 @@
 
 // List of bin/magento setup CLI commands to run after setup:install
 return [
-    /*
     [
         'command' => 'setup:config:set',
         'config' => [
+            '--queue-default-connection' => 'db'
+            /*
             '--remote-storage-driver' => 'aws-s3',
             '--remote-storage-bucket' => 'myBucket',
-            '--remote-storage-region' => 'us-east-1',
-            '--queue-default-connection' => 'db'
+            '--remote-storage-region' => 'us-east-1'
+            */
         ]
     ]
-    */
 ];

dev/tests/integration/etc/post-install-setup-command-config.php.dist

@@ -23,16 +23,17 @@ class ObjectManager extends \Magento\Framework\App\ObjectManager
     /**
      * @var array
      */
-    protected $persistedInstances = [
-        \Magento\Framework\App\ResourceConnection::class,
-        \Magento\Framework\Config\Scope::class,
-        \Magento\Framework\ObjectManager\RelationsInterface::class,
-        \Magento\Framework\ObjectManager\ConfigInterface::class,
-        \Magento\Framework\Interception\DefinitionInterface::class,
-        \Magento\Framework\ObjectManager\DefinitionInterface::class,
-        \Magento\Framework\Session\Config::class,
-        \Magento\Framework\ObjectManager\Config\Mapper\Dom::class,
-    ];
+    protected $persistedInstances = [];
+
+    /**
+     * Set list of instances that should be persistent.
+     *
+     * @param array $persistedInstances
+     */
+    public function setPersistedInstances(array $persistedInstances): void
+    {
+        $this->persistedInstances = $persistedInstances;
+    }
 
     /**
      * Clear InstanceManager cache.

dev/tests/integration/framework/Magento/TestFramework/ObjectManager.php

@@ -23,15 +23,11 @@
 class ObjectManagerFactory extends \Magento\Framework\App\ObjectManagerFactory
 {
     /**
-     * Locator class name
-     *
      * @var string
      */
     protected $_locatorClassName = ObjectManager::class;
 
     /**
-     * Config class name
-     *
      * @var string
      */
     protected $_configClassName = \Magento\TestFramework\ObjectManager\Config::class;
@@ -80,6 +76,30 @@ public function restore(ObjectManager $objectManager, $directoryList, array $arg
         return $objectManager;
     }
 
+    /**
+     * Read config from provided directory
+     *
+     * @param string $directory
+     * @return array
+     * @throws LocalizedException
+     */
+    private function readCustomConfig(string $directory): array
+    {
+        $path = __DIR__ . '/../../../etc/di/' . $directory . '/';
+        $files = glob($path . '*.php');
+
+        $data = [];
+        foreach ($files as $file) {
+            if (!is_readable($file)) {
+                throw new LocalizedException(__("'%1' is not readable file.", $file));
+            }
+            $data[] = include $file;
+        }
+        $data = array_merge([], ...$data);
+
+        return $data;
+    }
+
     /**
      * Load primary config
      *
@@ -98,23 +118,25 @@ protected function _loadPrimaryConfig(DirectoryList $directoryList, $driverPool,
                     'default_setup' => ['type' => ConnectionAdapter::class]
                 ]
             );
-            $diPreferences = [];
-            $diPreferencesPath = __DIR__ . '/../../../etc/di/preferences/';
-
-            $preferenceFiles = glob($diPreferencesPath . '*.php');
-
-            foreach ($preferenceFiles as $file) {
-                if (!is_readable($file)) {
-                    throw new LocalizedException(__("'%1' is not readable file.", $file));
-                }
-                $diPreferences = array_replace($diPreferences, include $file);
-            }
-
+            $diPreferences = $this->readCustomConfig('preferences');
             $this->_primaryConfigData['preferences'] = array_replace(
                 $this->_primaryConfigData['preferences'],
                 $diPreferences
             );
         }
         return $this->_primaryConfigData;
     }
+
+    /**
+     * @inheritdoc
+     */
+    public function create(array $arguments)
+    {
+        /** @var \Magento\TestFramework\ObjectManager $objectManager */
+        $objectManager = parent::create($arguments);
+        $persistedInstances = $this->readCustomConfig('persistedInstances');
+        $objectManager->setPersistedInstances($persistedInstances);
+
+        return $objectManager;
+    }
 }