ACPT-1052: Some Luma Storefront Scenarios Are Broken

andimov · andimov · commit c72785664504 · 2023-05-13T21:50:26.000-05:00
- fix  failed tests
diff --git a/app/code/Magento/Catalog/Model/Indexer/Category/Product/AbstractAction.php b/app/code/Magento/Catalog/Model/Indexer/Category/Product/AbstractAction.php
@@ -17,14 +17,15 @@
 use Magento\Store\Api\Data\StoreInterface;
 use Magento\Store\Model\Store;
 
+// phpcs:disable Magento2.Classes.AbstractApi
 /**
  * Class AbstractAction
  *
  * @api
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @since 100.0.2
- * phpcs:disable Magento2.Classes.AbstractApi
+ * phpcs:disable Magento2.Annotation.MethodAnnotationStructure.InvalidDeprecatedTagUsage
  */
 abstract class AbstractAction implements ResetAfterRequestInterface
 {
diff --git a/app/code/Magento/Catalog/Model/ProductRepository.php b/app/code/Magento/Catalog/Model/ProductRepository.php
@@ -41,7 +41,8 @@
  * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @SuppressWarnings(PHPMD.TooManyFields)
- * phpcs:disable Magento2.Annotation.ClassPropertyPHPDocFormatting
+ * phpcs:disable Magento2.Commenting.ClassPropertyPHPDocFormatting
+ * phpcs:disable Magento2.Annotation.MethodAnnotationStructure.InvalidDeprecatedTagUsage
  */
 class ProductRepository implements \Magento\Catalog\Api\ProductRepositoryInterface, ResetAfterRequestInterface
 {
diff --git a/app/code/Magento/Customer/Helper/Address.php b/app/code/Magento/Customer/Helper/Address.php
@@ -20,7 +20,8 @@
  * @api
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @since 100.0.2
- * phpcs:disable Generic.CodeAnalysis.EmptyStatement.DetectedFunction
+ * phpcs:disable Magento2.CodeAnalysis.EmptyBlock
+ * phpcs:disable Magento2.Commenting.ClassPropertyPHPDocFormatting
  */
 class Address extends \Magento\Framework\App\Helper\AbstractHelper implements ResetAfterRequestInterface
 {
diff --git a/lib/internal/Magento/Framework/Url.php b/lib/internal/Magento/Framework/Url.php
@@ -11,6 +11,7 @@
 use Magento\Framework\Serialize\Serializer\Json;
 use Magento\Framework\Url\HostChecker;
 
+// phpcs:disable Magento2.Annotation
 /**
  * URL
  *
@@ -64,7 +65,6 @@
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @SuppressWarnings(PHPMD.TooManyFields)
  * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
- * phpcs:disable Magento2.Annotation.MethodAnnotationStructure
  */
 class Url extends \Magento\Framework\DataObject implements \Magento\Framework\UrlInterface, ResetAfterRequestInterface
 {
@@ -1010,6 +1010,7 @@ public function getRebuiltUrl($url)
      * @param string $value
      * @return string
      * @deprecated 101.0.0
+     * @see \Magento\Framework\Escaper::escapeUrl
      */
     public function escape($value)
     {
@@ -1161,6 +1162,7 @@ protected function getRouteParamsResolver()
      *
      * @return \Magento\Framework\Url\ModifierInterface
      * @deprecated 101.0.0
+     * @see \Magento\Framework\Url\ModifierInterface
      */
     private function getUrlModifier()
     {
@@ -1178,6 +1180,7 @@ private function getUrlModifier()
      *
      * @return Escaper
      * @deprecated 101.0.0
+     * @see \Magento\Framework\Escaper
      */
     private function getEscaper()
     {
diff --git a/lib/internal/Magento/Framework/View/Asset/Repository.php b/lib/internal/Magento/Framework/View/Asset/Repository.php
@@ -19,7 +19,7 @@
  *
  * @api
  * @since 100.0.2
- * phpcs:disable Magento2.Annotation.MethodAnnotationStructure
+ * phpcs:disable Magento2.Commenting.ClassPropertyPHPDocFormatting
  */
 class Repository implements ResetAfterRequestInterface
 {

Original file line number	Diff line number	Diff line change
`@@ -17,14 +17,15 @@`
`17`	`17`	`use Magento\Store\Api\Data\StoreInterface;`
`18`	`18`	`use Magento\Store\Model\Store;`
`19`	`19`
	`20`	`+// phpcs:disable Magento2.Classes.AbstractApi`
`20`	`21`	`/**`
`21`	`22`	`* Class AbstractAction`
`22`	`23`	`*`
`23`	`24`	`* @api`
`24`	`25`	`*`
`25`	`26`	`* @SuppressWarnings(PHPMD.CouplingBetweenObjects)`
`26`	`27`	`* @since 100.0.2`
`27`		`- * phpcs:disable Magento2.Classes.AbstractApi`
	`28`	`+ * phpcs:disable Magento2.Annotation.MethodAnnotationStructure.InvalidDeprecatedTagUsage`
`28`	`29`	`*/`
`29`	`30`	`abstract class AbstractAction implements ResetAfterRequestInterface`
`30`	`31`	`{`
Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@`
`11`	`11`	`use Magento\Framework\Serialize\Serializer\Json;`
`12`	`12`	`use Magento\Framework\Url\HostChecker;`
`13`	`13`
	`14`	`+// phpcs:disable Magento2.Annotation`
`14`	`15`	`/**`
`15`	`16`	`* URL`
`16`	`17`	`*`
`@@ -64,7 +65,6 @@`
`64`	`65`	`* @SuppressWarnings(PHPMD.CouplingBetweenObjects)`
`65`	`66`	`* @SuppressWarnings(PHPMD.TooManyFields)`
`66`	`67`	`* @SuppressWarnings(PHPMD.CookieAndSessionMisuse)`
`67`		`- * phpcs:disable Magento2.Annotation.MethodAnnotationStructure`
`68`	`68`	`*/`
`69`	`69`	`class Url extends \Magento\Framework\DataObject implements \Magento\Framework\UrlInterface, ResetAfterRequestInterface`
`70`	`70`	`{`
`@@ -1010,6 +1010,7 @@ public function getRebuiltUrl($url)`
`1010`	`1010`	`* @param string $value`
`1011`	`1011`	`* @return string`
`1012`	`1012`	`* @deprecated 101.0.0`
	`1013`	`+ * @see \Magento\Framework\Escaper::escapeUrl`
`1013`	`1014`	`*/`
`1014`	`1015`	`public function escape($value)`
`1015`	`1016`	`{`
`@@ -1161,6 +1162,7 @@ protected function getRouteParamsResolver()`
`1161`	`1162`	`*`
`1162`	`1163`	`* @return \Magento\Framework\Url\ModifierInterface`
`1163`	`1164`	`* @deprecated 101.0.0`
	`1165`	`+ * @see \Magento\Framework\Url\ModifierInterface`
`1164`	`1166`	`*/`
`1165`	`1167`	`private function getUrlModifier()`
`1166`	`1168`	`{`
`@@ -1178,6 +1180,7 @@ private function getUrlModifier()`
`1178`	`1180`	`*`
`1179`	`1181`	`* @return Escaper`
`1180`	`1182`	`* @deprecated 101.0.0`
	`1183`	`+ * @see \Magento\Framework\Escaper`
`1181`	`1184`	`*/`
`1182`	`1185`	`private function getEscaper()`
`1183`	`1186`	`{`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@`
`19`	`19`	`*`
`20`	`20`	`* @api`
`21`	`21`	`* @since 100.0.2`
`22`		`- * phpcs:disable Magento2.Annotation.MethodAnnotationStructure`
	`22`	`+ * phpcs:disable Magento2.Commenting.ClassPropertyPHPDocFormatting`
`23`	`23`	`*/`
`24`	`24`	`class Repository implements ResetAfterRequestInterface`
`25`	`25`	`{`