Merge pull request #7327 from magento-gl/beta-sync

Beta to develop sync

Author: xmav

app/code/Magento/Catalog/Setup/Patch/Data/UpdateMultiselectAttributesBackendTypes.php

@@ -59,9 +59,10 @@ public function getAliases()
     public function apply()
     {
         $this->dataSetup->startSetup();
+        $setup = $this->dataSetup;
+        $connection = $setup->getConnection();
 
-        $connection = $this->dataSetup->getConnection();
-        $attributeTable = $connection->getTableName('eav_attribute');
+        $attributeTable = $setup->getTable('eav_attribute');
         /** @var EavSetup $eavSetup */
         $eavSetup = $this->eavSetupFactory->create(['setup' => $this->dataSetup]);
         $entityTypeId = $eavSetup->getEntityTypeId(Product::ENTITY);
@@ -74,8 +75,8 @@ public function apply()
                 ->where('frontend_input = ?', 'multiselect')
         );
 
-        $varcharTable = $connection->getTableName('catalog_product_entity_varchar');
-        $textTable = $connection->getTableName('catalog_product_entity_text');
+        $varcharTable = $setup->getTable('catalog_product_entity_varchar');
+        $textTable = $setup->getTable('catalog_product_entity_text');
         $varcharTableDataSql = $connection
             ->select()
             ->from($varcharTable)

app/code/Magento/MessageQueue/Test/Unit/Console/StartConsumerCommandTest.php

@@ -102,12 +102,12 @@ protected function setUp(): void
      */
     public function testExecute(
         ?string $pidFilePath,
-        bool    $singleThread,
-        ?int    $multiProcess,
-        int     $lockExpects,
-        bool    $isLocked,
-        int     $unlockExpects,
-        int     $runProcessExpects,
+        bool $singleThread,
+        ?int $multiProcess,
+        int $lockExpects,
+        bool $isLocked,
+        int $unlockExpects,
+        int $runProcessExpects,
         int $expectedReturn
     ): void {
         $areaCode = 'area_code';