ACPT-1688: Fix Static Tests failures on Application-Server branch Final

Author: yaroslavGoncharuk

app/code/Magento/CatalogGraphQl/Model/Resolver/Product/Price/Provider.php

@@ -37,14 +37,14 @@ class Provider implements ProviderInterface, ResetAfterRequestInterface
     /**
      * @var array|array[]
      *
-     * @SuppressWarnings(PHPCS)
+     * phpcs:disable Magento2.Commenting.ClassPropertyPHPDocFormatting
      */
     private readonly array $minimalPriceConstructed;
 
     /**
      * @var array|array[]
      *
-     * @SuppressWarnings(PHPCS)
+     * phpcs:disable Magento2.Commenting.ClassPropertyPHPDocFormatting
      */
     private readonly array $maximalPriceConstructed;
 

app/code/Magento/CatalogGraphQl/Plugin/Search/RequestBuilderPlugin.php

@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
 namespace Magento\CatalogGraphQl\Plugin\Search;
 
@@ -11,18 +12,26 @@
 
 class RequestBuilderPlugin
 {
+    /**
+     * Constructor
+     *
+     * @param RequestDataBuilder $localData
+     * @phpcs:disable Magento2.CodeAnalysis.EmptyBlock
+     */
     public function __construct(private RequestDataBuilder $localData)
     {
     }
 
     /**
+     * Get around
+     *
      * @param Config $subject
      * @param callable $proceed
      * @param string $requestName
      * @return array
      */
-    public function aroundGet(Config $subject, callable $proceed, string $requestName) {
-
+    public function aroundGet(Config $subject, callable $proceed, string $requestName)
+    {
         if ($this->localData->getData($requestName)) {
             return $this->localData->getData($requestName);
         } else {

app/code/Magento/CatalogGraphQl/etc/di.xml

@@ -101,9 +101,6 @@
             </argument>
         </arguments>
     </type>
-    <type name="Magento\Framework\Search\Request\Config">
-        <plugin name="localRequestDataPlugin"  type="Magento\CatalogGraphQl\Plugin\Search\RequestBuilderPlugin" />
-    </type>
     <type name="Magento\Framework\Search\Request\Config\FilesystemReader">
         <plugin name="productAttributesDynamicFields"  type="Magento\CatalogGraphQl\Plugin\Search\Request\ConfigReader" />
     </type>
@@ -114,6 +111,7 @@
                 <item name="EAV" xsi:type="string">EAV</item>
             </argument>
         </arguments>
+        <plugin name="localRequestDataPlugin"  type="Magento\CatalogGraphQl\Plugin\Search\RequestBuilderPlugin" />
     </type>
 
     <preference type="Magento\CatalogGraphQl\Model\Resolver\Product\Price\Provider" for="Magento\CatalogGraphQl\Model\Resolver\Product\Price\ProviderInterface"/>

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

@@ -86,7 +86,7 @@ class Address extends \Magento\Framework\App\Helper\AbstractHelper implements Re
      * @var CustomerMetadataInterface
      *
      * @deprecated 101.0.0
-     * phpcs:disable Magento2.Annotation.ClassPropertyPHPDocFormatting
+     * phpcs:disable Magento2.Commenting.ClassPropertyPHPDocFormatting
      */
     protected $_customerMetadataService;
 

dev/tests/integration/testsuite/Magento/GraphQl/App/GraphQlStateTest.php

@@ -122,6 +122,7 @@ public function testCartState(
      *
      * @return array[]
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     * @SuppressWarnings(PHPMD.UnusedPrivateMethod)
      */
     private function queryDataProvider(): array
     {

dev/tests/integration/testsuite/Magento/GraphQl/App/State/GraphQlStateDiff.php

@@ -37,21 +37,21 @@ class GraphQlStateDiff
     /**
      * @var ObjectManagerInterface
      *
-     * @SuppressWarnings(PHPCS)
+     * phpcs:disable Magento2.Commenting.ClassPropertyPHPDocFormatting
      */
     private readonly ObjectManagerInterface $objectManagerBeforeTest;
 
     /**
      * @var ObjectManager
      *
-     * @SuppressWarnings(PHPCS)
+     * phpcs:disable Magento2.Commenting.ClassPropertyPHPDocFormatting
      */
     private readonly ObjectManager $objectManagerForTest;
 
     /**
      * @var Comparator
      *
-     * @SuppressWarnings(PHPCS)
+     * phpcs:disable Magento2.Commenting.ClassPropertyPHPDocFormatting
      */
     private readonly Comparator $comparator;
 
@@ -80,6 +80,8 @@ public function getTestObjectManager()
     }
 
     /**
+     * Tear Down
+     *
      * @return void
      */
     public function tearDown(): void

lib/internal/Magento/Framework/App/Cache/State.php

@@ -1,7 +1,5 @@
 <?php
 /**
- * An ultimate accessor to cache types' statuses
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
@@ -25,12 +23,13 @@ class State implements StateInterface, ResetAfterRequestInterface
     /**
      * Deployment config key
      */
-    const CACHE_KEY = 'cache_types';
+    public const CACHE_KEY = 'cache_types';
 
     /**
      * Deployment configuration
      *
      * @var DeploymentConfig
+     *  phpcs:disable Magento2.Commenting.ClassPropertyPHPDocFormatting
      */
     private readonly DeploymentConfig $config;
 
@@ -39,23 +38,22 @@ class State implements StateInterface, ResetAfterRequestInterface
      *
      * @var Writer
      *
-     * @SuppressWarnings(PHPCS)
+     * phpcs:disable Magento2.Commenting.ClassPropertyPHPDocFormatting
      */
     private readonly Writer $writer;
 
     /**
      * Associative array of cache type codes and their statuses (enabled/disabled)
      *
      * @var array|null
-     * @SuppressWarnings(PHPCS)
      */
     private ?array $statuses = null;
 
     /**
      * Whether all cache types are forced to be disabled
      *
      * @var bool
-     * @SuppressWarnings(PHPCS)
+     * phpcs:disable Magento2.Commenting.ClassPropertyPHPDocFormatting
      */
     private readonly bool $banAll;
 

lib/internal/Magento/Framework/TestFramework/ApplicationStateComparator/Collector.php

@@ -89,7 +89,6 @@ function ($element) use (
      * @param string $shouldResetState
      * @return CollectedObject[]
      * @throws \Exception
-     * @SuppressWarnings(PHPCS)
      */
     public function getSharedObjects(string $shouldResetState): array
     {
@@ -98,6 +97,7 @@ public function getSharedObjects(string $shouldResetState): array
         } else {
             $obj = new \ReflectionObject($this->objectManager);
             if (!$obj->hasProperty('_sharedInstances')) {
+                // phpcs:ignore Magento2.Exceptions.DirectThrow
                 throw new \Exception('Cannot get shared objects from ' . get_class($this->objectManager));
             }
             $property = $obj->getProperty('_sharedInstances');
@@ -129,13 +129,13 @@ public function getSharedObjects(string $shouldResetState): array
      *
      * @return CollectedObjectConstructedAndCurrent[]
      * @throws \Exception
-     * @SuppressWarnings(PHPCS)
      */
     public function getPropertiesConstructedAndCurrent(): array
     {
         /** @var ObjectManager $objectManager */
         $objectManager = $this->objectManager;
         if (!($objectManager instanceof StateObjectManagerInterface)) {
+            // phpcs:ignore Magento2.Exceptions.DirectThrow
             throw new \Exception("Not the correct type of ObjectManager");
         }
         // Calling _resetState helps us avoid adding skip/filter for these classes.

lib/internal/Magento/Framework/TestFramework/ApplicationStateComparator/Comparator.php

@@ -232,7 +232,6 @@ private function formatValue($value): mixed
      * @return array
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @throws \Exception
-     * @SuppressWarnings(PHPCS)
      */
     public function checkValues(mixed $before, mixed $after, array $skipList): array
     {
@@ -289,6 +288,7 @@ public function checkValues(mixed $before, mixed $after, array $skipList): array
                         $skipList,
                     );
                 }
+                // phpcs:ignore Magento2.Exceptions.DirectThrow
                 throw new \Exception("Unexpected object in checkValues()");
         }
         return [];

lib/internal/Magento/Framework/TestFramework/ApplicationStateComparator/ObjectManager.php

@@ -16,11 +16,9 @@
  */
 class ObjectManager extends TestFrameworkObjectManager implements ObjectManagerInterface
 {
+    //phpcs:disable Magento2.PHP.LiteralNamespaces
     /**
-     * Constructs this instance by copying test framework's ObjectManager
-     *
-     * @param TestFrameworkObjectManager $testFrameworkObjectManager
-     * @SuppressWarnings(PHPCS)
+     * @var array|string[]
      */
     private array $bootstrappedObjects = [
         // Note: These are after $objectManager = $this->_factory->create($overriddenParams);
@@ -97,6 +95,8 @@ class ObjectManager extends TestFrameworkObjectManager implements ObjectManagerI
     ];
 
     /**
+     * Constructs this instance by copying test framework's ObjectManager
+     *
      * @param TestFrameworkObjectManager $testFrameworkObjectManager
      */
     public function __construct(TestFrameworkObjectManager $testFrameworkObjectManager)