Merge remote-tracking branch 'origin/MC-29402' into 2.4-develop-pr97

Author: zakdma

app/code/Magento/Catalog/Test/Unit/Model/Plugin/ProductRepository/TransactionWrapperTest.php

@@ -62,7 +62,7 @@ protected function setUp(): void
         $this->closureMock = function () use ($productMock) {
             return $productMock;
         };
-        $this->rollbackClosureMock = function () use ($productMock) {
+        $this->rollbackClosureMock = function () {
             throw new \Exception(self::ERROR_MSG);
         };
 

app/code/Magento/CatalogCustomerGraphQl/Model/Resolver/TierPrices.php

@@ -87,7 +87,7 @@ public function resolve(
         $this->tiers->addProductFilter($productId);
 
         return $this->valueFactory->create(
-            function () use ($productId, $context) {
+            function () use ($productId) {
                 $tierPrices = $this->tiers->getProductTierPrices($productId);
 
                 return $tierPrices ?? [];

app/code/Magento/Customer/Controller/Adminhtml/Index.php

@@ -289,9 +289,8 @@ protected function prepareDefaultCustomerTitle(\Magento\Backend\Model\View\Resul
     protected function _addSessionErrorMessages($messages)
     {
         $messages = (array)$messages;
-        $session = $this->_getSession();
 
-        $callback = function ($error) use ($session) {
+        $callback = function ($error) {
             if (!$error instanceof Error) {
                 $error = new Error($error);
             }

app/code/Magento/Customer/Test/Unit/Model/Plugin/CustomerRepository/TransactionWrapperTest.php

@@ -62,7 +62,7 @@ protected function setUp(): void
         $this->closureMock = function () use ($customerMock) {
             return $customerMock;
         };
-        $this->rollbackClosureMock = function () use ($customerMock) {
+        $this->rollbackClosureMock = function () {
             throw new \Exception(self::ERROR_MSG);
         };
 

dev/tests/integration/testsuite/Magento/Swatches/Model/AttributeCreateTest.php

@@ -52,7 +52,7 @@ function ($values, $index) use ($optionsPerAttribute) {
         );
         $data['optionvisual']['value'] = array_reduce(
             range(1, $optionsPerAttribute),
-            function ($values, $index) use ($optionsPerAttribute) {
+            function ($values, $index) {
                 $values['option_' . $index] = ['option ' . $index];
                 return $values;
             },
@@ -61,7 +61,7 @@ function ($values, $index) use ($optionsPerAttribute) {
 
         $data['options']['option'] = array_reduce(
             range(1, $optionsPerAttribute),
-            function ($values, $index) use ($optionsPerAttribute) {
+            function ($values, $index) {
                 $values[] = [
                     'label' => 'option ' . $index,
                     'value' => 'option_' . $index

dev/tests/integration/testsuite/Magento/Swatches/Model/SwatchAttributeOptionAddTest.php

@@ -40,7 +40,7 @@ public function testSwatchOptionAdd()
 
         $data['options']['option'] = array_reduce(
             range(10, $optionsPerAttribute),
-            function ($values, $index) use ($optionsPerAttribute) {
+            function ($values, $index) {
                 $values[] = [
                     'label' => 'option ' . $index,
                     'value' => 'option_' . $index

lib/internal/Magento/Framework/Setup/ExternalFKSetup.php

@@ -92,10 +92,10 @@ protected function execute()
     /**
      * Get foreign keys for tables and columns
      *
-     * @param string $refTable
-     * @param string $refColumn
      * @param string $targetTable
      * @param string $targetColumn
+     * @param string $refTable
+     * @param string $refColumn
      * @return array
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
@@ -110,7 +110,7 @@ protected function getForeignKeys(
         );
         $foreignKeys = array_filter(
             $foreignKeys,
-            function ($key) use ($targetColumn, $refTable, $refColumn) {
+            function ($key) use ($targetColumn, $refTable) {
                 return $key['COLUMN_NAME'] == $targetColumn
                 && $key['REF_TABLE_NAME'] == $refTable;
             }

setup/src/Magento/Setup/Console/Command/AdminUserCreateCommand.php

@@ -7,6 +7,7 @@
 namespace Magento\Setup\Console\Command;
 
 use Magento\Framework\Setup\ConsoleLogger;
+use Magento\Framework\Validation\ValidationException;
 use Magento\Setup\Model\AdminAccount;
 use Magento\Setup\Model\InstallerFactory;
 use Magento\User\Model\UserValidationRules;
@@ -81,7 +82,7 @@ protected function interact(InputInterface $input, OutputInterface $output)
             $question = new Question('<question>Admin password:</question> ', '');
             $question->setHidden(true);
 
-            $question->setValidator(function ($value) use ($output) {
+            $question->setValidator(function ($value) {
                 $user = new \Magento\Framework\DataObject();
                 $user->setPassword($value);
 
@@ -90,7 +91,7 @@ protected function interact(InputInterface $input, OutputInterface $output)
 
                 $validator->isValid($user);
                 foreach ($validator->getMessages() as $message) {
-                    throw new \Exception($message);
+                    throw new ValidationException(__($message));
                 }
 
                 return $value;
@@ -143,7 +144,7 @@ private function addNotEmptyValidator(Question $question)
     {
         $question->setValidator(function ($value) {
             if (trim($value) == '') {
-                throw new \Exception('The value cannot be empty');
+                throw new ValidationException(__('The value cannot be empty'));
             }
 
             return $value;

setup/src/Magento/Setup/Console/Command/RollbackCommand.php

@@ -80,7 +80,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritDoc
      */
     protected function configure()
     {
@@ -111,7 +111,7 @@ protected function configure()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritDoc
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
@@ -122,8 +122,9 @@ protected function execute(InputInterface $input, OutputInterface $output)
             // we must have an exit code higher than zero to indicate something was wrong
             return \Magento\Framework\Console\Cli::RETURN_FAILURE;
         }
-        $returnValue = $this->maintenanceModeEnabler->executeInMaintenanceMode(
-            function () use ($input, $output, &$returnValue) {
+
+        return $this->maintenanceModeEnabler->executeInMaintenanceMode(
+            function () use ($input, $output) {
                 try {
                     $helper = $this->getHelper('question');
                     $question = new ConfirmationQuestion(
@@ -152,7 +153,6 @@ function () use ($input, $output, &$returnValue) {
             $output,
             false
         );
-        return $returnValue;
     }
 
     /**

setup/src/Magento/Setup/Fixtures/AttributeSet/SwatchesGenerator.php

@@ -91,7 +91,7 @@ function ($values, $index) use ($optionCount, $data, $type) {
         );
         $attribute['optionvisual']['value'] = array_reduce(
             range(1, $optionCount),
-            function ($values, $index) use ($optionCount) {
+            function ($values, $index) {
                 $values['option_' . $index] = ['option ' . $index];
                 return $values;
             },
@@ -129,6 +129,7 @@ private function generateSwatchImage($data)
             $this->imagesGenerator = $this->imagesGeneratorFactory->create();
         }
 
+        // phpcs:ignore Magento2.Security.InsecureFunction
         $imageName = md5($data) . '.jpg';
         $this->imagesGenerator->generate([
             'image-width' => self::GENERATED_SWATCH_WIDTH,