ACPT-1052: Some Luma Storefront Scenarios Are Broken

 - fix  failed tests

Author: andimov

app/code/Magento/Catalog/Model/Indexer/Category/Product/AbstractAction.php

@@ -23,9 +23,8 @@
  * @api
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * phpcs:disable Magento2.Classes.AbstractApi
- * phpcs:disable Magento2.Annotation.MethodAnnotationStructure
  * @since 100.0.2
+ * phpcs:disable Magento2.Classes.AbstractApi
  */
 abstract class AbstractAction implements ResetAfterRequestInterface
 {
@@ -46,7 +45,8 @@ abstract class AbstractAction implements ResetAfterRequestInterface
 
     /**
      * Suffix for table to show it is temporary
-     * @deprecated see getIndexTable
+     * @deprecated
+     * @see getIndexTable
      */
     public const TEMPORARY_TABLE_SUFFIX = '_tmp';
 

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

@@ -633,7 +633,7 @@ public function getUpdatedAt()
      * @param bool $calculate
      * @return void
      * @deprecated 102.0.4
-     * @see  we don't recommend this approach anymore
+     * @see we don't recommend this approach anymore
      */
     public function setPriceCalculation($calculate = true)
     {

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

@@ -38,11 +38,10 @@
 /**
  * @inheritdoc
  *
- * phpcs:disable Magento2.Annotation.ClassPropertyPHPDocFormatting
- * phpcs:disable Magento2.Annotation.MethodAnnotationStructure
  * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @SuppressWarnings(PHPMD.TooManyFields)
+ * phpcs:disable Magento2.Annotation.ClassPropertyPHPDocFormatting
  */
 class ProductRepository implements \Magento\Catalog\Api\ProductRepositoryInterface, ResetAfterRequestInterface
 {
@@ -797,6 +796,7 @@ private function getMediaGalleryProcessor()
     /**
      * Retrieve collection processor
      *
+     * phpcs:disable Magento2.Annotation.MethodAnnotationStructure
      * @deprecated 102.0.0
      * @return CollectionProcessorInterface
      */

app/code/Magento/Customer/Helper/Address.php

@@ -20,7 +20,6 @@
  * @api
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @since 100.0.2
- * phpcs:disable Magento2.Annotation.ClassPropertyPHPDocFormatting
  * phpcs:disable Generic.CodeAnalysis.EmptyStatement.DetectedFunction
  */
 class Address extends \Magento\Framework\App\Helper\AbstractHelper implements ResetAfterRequestInterface
@@ -86,6 +85,7 @@ class Address extends \Magento\Framework\App\Helper\AbstractHelper implements Re
      * @var CustomerMetadataInterface
      *
      * @deprecated 101.0.0
+     * phpcs:disable Magento2.Annotation.ClassPropertyPHPDocFormatting
      */
     protected $_customerMetadataService;
 
@@ -285,7 +285,7 @@ public function getAttributeValidationClass($attributeCode)
                 : $this->_addressMetadataService->getAttributeMetadata($attributeCode);
 
             $class = $attribute ? $attribute->getFrontendClass() : '';
-        } catch (NoSuchEntityException $e) { // phpcs:ignore Generic.CodeAnalysis.EmptyStatement.DetectedCATCH
+        } catch (NoSuchEntityException $e) { // phpcs:ignore Generic.CodeAnalysis.EmptyStatement.DetectedCatch
             // the attribute does not exist so just return an empty string
         }