Merge remote-tracking branch 'mainline/2.3-develop' into MC-19440

Author: Oleksandr Dubovyk

app/code/Magento/AmqpStore/Plugin/Framework/Amqp/Bulk/Exchange.php

@@ -91,7 +91,6 @@ public function beforeEnqueue(SubjectExchange $subject, $topic, array $envelopes
                 if ($headers instanceof AMQPTable) {
                     try {
                         $headers->set('store_id', $storeId);
-                    // phpcs:ignore Magento2.Exceptions.ThrowCatch
                     } catch (AMQPInvalidArgumentException $ea) {
                         $errorMessage = sprintf("Can't set storeId to amqp message. Error %s.", $ea->getMessage());
                         $this->logger->error($errorMessage);

app/code/Magento/Backup/Controller/Adminhtml/Index/Rollback.php

@@ -127,7 +127,6 @@ public function execute()
             $adminSession->destroy();
 
             $response->setRedirectUrl($this->getUrl('*'));
-            // phpcs:disable Magento2.Exceptions.ThrowCatch
         } catch (\Magento\Framework\Backup\Exception\CantLoadSnapshot $e) {
             $errorMsg = __('We can\'t find the backup file.');
         } catch (\Magento\Framework\Backup\Exception\FtpConnectionFailed $e) {

app/code/Magento/Catalog/Model/Product/Gallery/GalleryManagement.php

@@ -71,10 +71,8 @@ public function create($sku, ProductAttributeMediaGalleryEntryInterface $entry)
         $product->setMediaGalleryEntries($existingMediaGalleryEntries);
         try {
             $product = $this->productRepository->save($product);
-            // phpcs:ignore Magento2.Exceptions.ThrowCatch
         } catch (InputException $inputException) {
             throw $inputException;
-            // phpcs:ignore Magento2.Exceptions.ThrowCatch
         } catch (\Exception $e) {
             throw new StateException(__("The product can't be saved."));
         }

app/code/Magento/Catalog/Model/ProductRepository.php

@@ -735,7 +735,7 @@ private function getCollectionProcessor()
     {
         if (!$this->collectionProcessor) {
             $this->collectionProcessor = \Magento\Framework\App\ObjectManager::getInstance()->get(
-                'Magento\Catalog\Model\Api\SearchCriteria\ProductCollectionProcessor'
+                \Magento\Catalog\Model\Api\SearchCriteria\ProductCollectionProcessor::class
             );
         }
         return $this->collectionProcessor;
@@ -845,7 +845,6 @@ private function saveProduct($product): void
             throw new CouldNotSaveException(__($e->getMessage()));
         } catch (LocalizedException $e) {
             throw $e;
-            // phpcs:disable Magento2.Exceptions.ThrowCatch
         } catch (\Exception $e) {
             throw new CouldNotSaveException(
                 __('The product was unable to be saved. Please try again.'),

app/code/Magento/Catalog/Model/ResourceModel/Eav/Attribute.php

@@ -193,7 +193,6 @@ public function beforeSave()
             if ($this->_data[self::KEY_IS_GLOBAL] != $this->_origData[self::KEY_IS_GLOBAL]) {
                 try {
                     $this->attrLockValidator->validate($this);
-                    // phpcs:ignore Magento2.Exceptions.ThrowCatch
                 } catch (\Magento\Framework\Exception\LocalizedException $exception) {
                     throw new \Magento\Framework\Exception\LocalizedException(
                         __('Do not change the scope. %1', $exception->getMessage())

app/code/Magento/Cms/Model/Wysiwyg/Images/Storage.php

@@ -447,7 +447,6 @@ public function createDirectory($name, $path)
                 'id' => $this->_cmsWysiwygImages->convertPathToId($newPath),
             ];
             return $result;
-            // phpcs:ignore Magento2.Exceptions.ThrowCatch
         } catch (\Magento\Framework\Exception\FileSystemException $e) {
             throw new \Magento\Framework\Exception\LocalizedException(__('We cannot create a new directory.'));
         }
@@ -474,7 +473,6 @@ public function deleteDirectory($path)
             $this->_deleteByPath($path);
             $path = $this->getThumbnailRoot() . $this->_getRelativePathToRoot($path);
             $this->_deleteByPath($path);
-            // phpcs:ignore Magento2.Exceptions.ThrowCatch
         } catch (\Magento\Framework\Exception\FileSystemException $e) {
             throw new \Magento\Framework\Exception\LocalizedException(
                 __('We cannot delete directory %1.', $this->_getRelativePathToRoot($path))

app/code/Magento/Cms/view/adminhtml/ui_component/cms_block_form.xml

@@ -111,7 +111,7 @@
                 <dataScope>identifier</dataScope>
             </settings>
         </field>
-        <field name="storeviews" formElement="multiselect">
+        <field name="storeviews" formElement="multiselect" class="Magento\Store\Ui\Component\Form\Field\StoreView">
             <argument name="data" xsi:type="array">
                 <item name="config" xsi:type="array">
                     <item name="source" xsi:type="string">block</item>

app/code/Magento/Customer/Model/AccountManagement.php

@@ -66,49 +66,65 @@
 class AccountManagement implements AccountManagementInterface
 {
     /**
-     * Configuration paths for email templates and identities
+     * Configuration paths for create account email template
      *
      * @deprecated
      */
     const XML_PATH_REGISTER_EMAIL_TEMPLATE = 'customer/create_account/email_template';
 
     /**
+     * Configuration paths for register no password email template
+     *
      * @deprecated
      */
     const XML_PATH_REGISTER_NO_PASSWORD_EMAIL_TEMPLATE = 'customer/create_account/email_no_password_template';
 
     /**
+     * Configuration paths for remind email identity
+     *
      * @deprecated
      */
     const XML_PATH_REGISTER_EMAIL_IDENTITY = 'customer/create_account/email_identity';
 
     /**
+     * Configuration paths for remind email template
+     *
      * @deprecated
      */
     const XML_PATH_REMIND_EMAIL_TEMPLATE = 'customer/password/remind_email_template';
 
     /**
+     * Configuration paths for forgot email email template
+     *
      * @deprecated
      */
     const XML_PATH_FORGOT_EMAIL_TEMPLATE = 'customer/password/forgot_email_template';
 
     /**
+     * Configuration paths for forgot email identity
+     *
      * @deprecated
      */
     const XML_PATH_FORGOT_EMAIL_IDENTITY = 'customer/password/forgot_email_identity';
 
     /**
+     * Configuration paths for account confirmation required
+     *
      * @deprecated
      * @see AccountConfirmation::XML_PATH_IS_CONFIRM
      */
     const XML_PATH_IS_CONFIRM = 'customer/create_account/confirm';
 
     /**
+     * Configuration paths for account confirmation email template
+     *
      * @deprecated
      */
     const XML_PATH_CONFIRM_EMAIL_TEMPLATE = 'customer/create_account/email_confirmation_template';
 
     /**
+     * Configuration paths for confirmation confirmed email template
+     *
      * @deprecated
      */
     const XML_PATH_CONFIRMED_EMAIL_TEMPLATE = 'customer/create_account/email_confirmed_template';
@@ -161,11 +177,15 @@ class AccountManagement implements AccountManagementInterface
     const XML_PATH_REQUIRED_CHARACTER_CLASSES_NUMBER = 'customer/password/required_character_classes_number';
 
     /**
+     * Configuration path to customer reset password email template
+     *
      * @deprecated
      */
     const XML_PATH_RESET_PASSWORD_TEMPLATE = 'customer/password/reset_password_template';
 
     /**
+     * Minimum password length
+     *
      * @deprecated
      */
     const MIN_PASSWORD_LENGTH = 6;
@@ -579,7 +599,6 @@ public function authenticate($username, $password)
         }
         try {
             $this->getAuthentication()->authenticate($customerId, $password);
-            // phpcs:ignore Magento2.Exceptions.ThrowCatch
         } catch (InvalidEmailOrPasswordException $e) {
             throw new InvalidEmailOrPasswordException(__('Invalid login or password.'));
         }
@@ -890,7 +909,6 @@ public function createAccountWithPasswordHash(CustomerInterface $customer, $hash
             throw new InputMismatchException(
                 __('A customer with the same email address already exists in an associated website.')
             );
-            // phpcs:ignore Magento2.Exceptions.ThrowCatch
         } catch (LocalizedException $e) {
             throw $e;
         }
@@ -910,7 +928,6 @@ public function createAccountWithPasswordHash(CustomerInterface $customer, $hash
                 }
             }
             $this->customerRegistry->remove($customer->getId());
-            // phpcs:ignore Magento2.Exceptions.ThrowCatch
         } catch (InputException $e) {
             $this->customerRepository->delete($customer);
             throw $e;
@@ -1017,7 +1034,6 @@ private function changePasswordForCustomer($customer, $currentPassword, $newPass
     {
         try {
             $this->getAuthentication()->authenticate($customer->getId(), $currentPassword);
-            // phpcs:ignore Magento2.Exceptions.ThrowCatch
         } catch (InvalidEmailOrPasswordException $e) {
             throw new InvalidEmailOrPasswordException(
                 __("The password doesn't match this account. Verify the password and try again.")

app/code/Magento/Email/Model/Template/Filter.php

@@ -956,7 +956,6 @@ public function getCssFilesContent(array $files)
             }
         } catch (ContentProcessorException $exception) {
             $css = $exception->getMessage();
-            // phpcs:disable Magento2.Exceptions.ThrowCatch
         } catch (\Magento\Framework\View\Asset\File\NotFoundException $exception) {
             $css = '';
         }

app/code/Magento/EncryptionKey/Block/Adminhtml/Crypt/Key/Form.php

@@ -45,7 +45,7 @@ protected function _prepareForm()
                 'name' => 'generate_random',
                 'label' => __('Auto-generate a Key'),
                 'options' => [0 => __('No'), 1 => __('Yes')],
-                'onclick' => "var cryptKey = jQuery('#crypt_key'); var cryptKeyBlock = cryptKey.parent().parent(); ".
+                'onchange' => "var cryptKey = jQuery('#crypt_key'); var cryptKeyBlock = cryptKey.parent().parent(); ".
                     "cryptKey.prop('disabled', this.value === '1'); " .
                     "if (cryptKey.prop('disabled')) { cryptKeyBlock.hide() } " .
                     "else { cryptKeyBlock.show() }",