Merge pull request #8092 from magento-gl/comm_78764_36529

[Bluetooth] Community Pull Requests delivery - 2.4-develop

Author: sidolov

app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/ExtractDataFromCategoryTree.php

@@ -70,6 +70,10 @@ private function sortTree(array &$tree): array
             } elseif (isset($node['children_count'])) {
                 $node['children_count'] = 0;
             }
+            // redirect_code null will not return , so it will be 0 when there is no redirect error.
+            if (!isset($node['redirect_code'])) {
+                $node['redirect_code'] = 0;
+            }
         }
 
         return $tree;

app/code/Magento/ConfigurableProduct/Model/Plugin/ProductIdentitiesExtender.php

@@ -7,6 +7,7 @@
 
 namespace Magento\ConfigurableProduct\Model\Plugin;
 
+use Magento\Catalog\Model\Product\Type as ProductTypes;
 use Magento\ConfigurableProduct\Model\Product\Type\Configurable as ConfigurableType;
 use Magento\Catalog\Api\ProductRepositoryInterface;
 use Magento\Catalog\Model\Product;
@@ -51,7 +52,7 @@ public function __construct(ConfigurableType $configurableType, ProductRepositor
      */
     public function afterGetIdentities(Product $subject, array $identities): array
     {
-        if ($subject->getTypeId() !== ConfigurableType::TYPE_CODE) {
+        if ($subject->getTypeId() !== ProductTypes::TYPE_SIMPLE) {
             return $identities;
         }
         $parentProductsIdentities = [];

app/code/Magento/ConfigurableProduct/Test/Unit/Model/Plugin/ProductIdentitiesExtenderTest.php

@@ -9,6 +9,7 @@
 
 use Magento\Catalog\Api\ProductRepositoryInterface;
 use Magento\Catalog\Model\Product;
+use Magento\Catalog\Model\Product\Type;
 use Magento\ConfigurableProduct\Model\Plugin\ProductIdentitiesExtender;
 use Magento\ConfigurableProduct\Model\Product\Type\Configurable;
 use PHPUnit\Framework\MockObject\MockObject;
@@ -71,7 +72,7 @@ public function testAfterGetIdentities()
             ->willReturn($productId);
         $productMock->expects($this->exactly(2))
             ->method('getTypeId')
-            ->willReturn(Configurable::TYPE_CODE);
+            ->willReturn(Type::TYPE_SIMPLE);
         $this->configurableTypeMock->expects($this->once())
             ->method('getParentIdsByChild')
             ->with($productId)

app/code/Magento/Customer/Test/Unit/Ui/Component/Listing/ColumnsTest.php

@@ -160,7 +160,7 @@ public function testPrepareWithAddColumn(): void
     public function testPrepareWithUpdateColumn(): void
     {
         $attributeCode = 'billing_attribute_code';
-        $backendType = 'backend-type';
+        $frontendInput = 'text';
         $attributeData = [
             'attribute_code' => 'billing_attribute_code',
             'frontend_input' => 'text',
@@ -211,7 +211,7 @@ public function testPrepareWithUpdateColumn(): void
                     'config',
                     [
                         'name' => $attributeCode,
-                        'dataType' => $backendType,
+                        'dataType' => $frontendInput,
                         'filter' => [
                             'filterType' => 'text',
                             'conditionType' => 'like',

app/code/Magento/Customer/Ui/Component/Listing/Columns.php

@@ -171,7 +171,7 @@ public function updateColumn(array $attributeData, $newAttributeCode)
                     $component->getData('config'),
                     [
                         'name' => $newAttributeCode,
-                        'dataType' => $attributeData[AttributeMetadata::BACKEND_TYPE],
+                        'dataType' => $attributeData[AttributeMetadata::FRONTEND_INPUT],
                         'visible' => (bool)$attributeData[AttributeMetadata::IS_VISIBLE_IN_GRID]
                     ]
                 );

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

@@ -525,7 +525,7 @@ public function cleanup()
          * @see \Magento\Setup\Mvc\Bootstrap\InitParamListener::BOOTSTRAP_PARAM
          */
         $this->_shell->execute(
-            PHP_BINARY . ' -f %s setup:uninstall -vvv -n --magento-init-params=%s',
+            PHP_BINARY . ' -f %s setup:uninstall --no-interaction -vvv -n --magento-init-params=%s',
             [BP . '/bin/magento', $this->getInitParamsQuery()]
         );
     }
@@ -551,6 +551,7 @@ public function install($cleanup)
         $this->copyGlobalConfigFile();
 
         $installParams = $this->getInstallCliParams();
+        $installParams['--no-interaction'] = true;
 
         // performance optimization: restore DB from last good dump to make installation on top of it (much faster)
         // do not restore from the database if the cleanup option is set to ensure we have a clean DB to test on
@@ -609,7 +610,9 @@ protected function runPostInstallCommands()
             $command = $postInstallSetupCommand['command'];
             $argumentsAndOptions = $postInstallSetupCommand['config'];
 
-            $argumentsAndOptionsPlaceholders = [];
+            $argumentsAndOptionsPlaceholders = [
+                '--no-interaction'
+            ];
 
             foreach (array_keys($argumentsAndOptions) as $key) {
                 $isArgument = is_numeric($key);

dev/tests/integration/framework/tests/unit/testsuite/Magento/Test/ApplicationTest.php

@@ -183,7 +183,7 @@ public function installDataProvider()
         $installShellCommandExpectation = [
             PHP_BINARY . ' -f %s setup:install -vvv ' .
             '--db-host=%s --db-user=%s --db-password=%s --db-name=%s --db-prefix=%s ' .
-            '--use-secure=%s --use-secure-admin=%s --magento-init-params=%s',
+            '--use-secure=%s --use-secure-admin=%s --magento-init-params=%s --no-interaction',
             [
                 BP . '/bin/magento',
                 '/tmp/mysql.sock',
@@ -194,6 +194,7 @@ public function installDataProvider()
                 '0',
                 '0',
                 $this->getInitParamsQuery(sys_get_temp_dir()),
+                true
             ]
         ];
 
@@ -213,7 +214,7 @@ public function installDataProvider()
                 [
                     $installShellCommandExpectation,
                     [
-                        PHP_BINARY . ' -f %s %s -vvv ' .
+                        PHP_BINARY . ' -f %s %s -vvv --no-interaction ' .
                         '--host=%s --dbname=%s --username=%s --password=%s --magento-init-params=%s',
                         [
                             BP . '/bin/magento',
@@ -234,7 +235,7 @@ public function installDataProvider()
                 [
                     $installShellCommandExpectation,
                     [
-                        PHP_BINARY . ' -f %s %s -vvv %s %s --option1=%s -option2=%s --magento-init-params=%s',
+                        PHP_BINARY . ' -f %s %s -vvv --no-interaction %s %s --option1=%s -option2=%s --magento-init-params=%s', // phpcs:ignore
                         [
                             BP . '/bin/magento',
                             'fake:command',