ACPT-1186

fixing static test failures

Author: JacobBrownAustin

dev/tests/integration/testsuite/Magento/Framework/ObjectManager/ResetAfterRequestTest.php

@@ -16,6 +16,7 @@
 /**
  * Test that verifies that resetState method for classes cause the state to be the same as it was initially constructed
  * @magentoDbIsolation disabled
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class ResetAfterRequestTest extends \PHPUnit\Framework\TestCase
 {
@@ -40,6 +41,8 @@ protected function setUp(): void
      *
      * @return array
      * @magentoAppIsolation enabled
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+     * @SuppressWarnings(PHPMD.NPathComplexity)
      */
     public function resetAfterRequestClassDataProvider()
     {
@@ -105,6 +108,8 @@ public function resetAfterRequestClassDataProvider()
      * @dataProvider resetAfterRequestClassDataProvider
      * @magentoAppArea graphql
      * @magentoDbIsolation disabled
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+     * @SuppressWarnings(PHPMD.NPathComplexity)
      */
     public function testResetAfterRequestClasses(string $className)
     {
@@ -170,8 +175,8 @@ public function testResetAfterRequestClasses(string $className)
                     continue; // We can skip _select because we load a fresh new Select after reset
                 }
                 if ('_regionModels' == $propertyName
-                    && is_a($className, \Magento\Customer\Model\Address\AbstractAddress::class, true))
-                {
+                    && is_a($className, \Magento\Customer\Model\Address\AbstractAddress::class, true)
+                ) {
                     continue; // AbstractAddress has static property _regionModels, so it would fail this test.
                     // TODO: Can we convert _regionModels to member variable,
                     // or move to a dependency injected service class instead?

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

@@ -37,7 +37,6 @@ class GraphQlStateTest extends \PHPUnit\Framework\TestCase
     /** @var ObjectManagerInterface */
     private ObjectManagerInterface $objectManagerForTest;
 
-
     /** @var Comparator */
     private Comparator $comparator;
 
@@ -87,8 +86,13 @@ protected function tearDown(): void
      * @return void
      * @throws \Exception
      */
-    public function testState(string $query, array $variables, array $variables2, string $operationName, string $expected): void
-    {
+    public function testState(
+        string $query,
+        array $variables,
+        array $variables2,
+        string $operationName,
+        string $expected,
+    ): void {
         $jsonEncodedRequest = json_encode([
             'query' => $query,
             'variables' => $variables,

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

@@ -12,6 +12,9 @@
  */
 class CollectedObject
 {
+    private static ?CollectedObject $skippedObject = null;
+    private static ?CollectedObject $recursionEndObject = null;
+
     public function __construct(
         private readonly string $className,
         private readonly array $properties,
@@ -34,15 +37,16 @@ public function getObjectId() : int
         return $this->objectId;
     }
 
-    private static ?CollectedObject $skippedObject = null;
-    public static function getSkippedObject() {
+    public static function getSkippedObject()
+    {
         if (!self::$skippedObject) {
             self::$skippedObject = new CollectedObject('(skipped)', [], 0);
         }
         return self::$skippedObject;
     }
-    private static ?CollectedObject $recursionEndObject = null;
-    public static function getRecursionEndObject() {
+
+    public static function getRecursionEndObject()
+    {
         if (!self::$recursionEndObject) {
             self::$recursionEndObject = new CollectedObject('(end of recursion level)', [], 0);
         }

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

@@ -41,8 +41,7 @@ private function copyArray(
         CompareType $compareType,
         int $recursionLevel,
         int $arrayRecursionLevel = 100
-    ) : array
-    {
+    ) : array {
         return array_map(
             function ($element) use (
                 $compareType,
@@ -129,7 +128,7 @@ public function getPropertiesConstructedAndCurrent(): array
         }
         /* Note: We must force garbage collection to clean up cyclic referenced objects after _resetState()
         Otherwise, they may still show up in the WeakMap. */
-        $collectedCount = gc_collect_cycles();
+        gc_collect_cycles();
         $objects = [];
         foreach ($objectManager->getWeakMap() as $object => $propertiesBefore) {
             $objects[] = new CollectedObjectConstructedAndCurrent(

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

@@ -98,7 +98,7 @@ public function compareConstructedAgainstCurrent(string $operationName): array
         $filterListParentClasses = $filterList['parents'] ?? [];
         $filterListServices = $filterList['services'] ?? [];
         $filterListAll = $filterList['all'] ?? [];
-        foreach($this->collector->getPropertiesConstructedAndCurrent() as $objectAndProperties) {
+        foreach ($this->collector->getPropertiesConstructedAndCurrent() as $objectAndProperties) {
             $object = $objectAndProperties->getObject();
             $constructedObject = $objectAndProperties->getConstructedCollected();
             $currentObject = $objectAndProperties->getCurrentCollected();
@@ -139,6 +139,7 @@ public function compareConstructedAgainstCurrent(string $operationName): array
      * @param array $skipList
      * @param string $serviceName
      * @return array
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
     private function compare(
         CollectedObject $before,
@@ -217,10 +218,12 @@ private function formatValue($value): mixed
      *
      * @param mixed $before
      * @param mixed $after
+     * @param array $skipList
      * @return array
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
-    public function checkValues(mixed $before, mixed $after, array $skipList): array {
+    public function checkValues(mixed $before, mixed $after, array $skipList): array
+    {
         $typeBefore = gettype($before);
         $typeAfter = gettype($after);
         if ($typeBefore !== $typeAfter) {

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

@@ -33,7 +33,7 @@ public function __construct(TestFrameworkObjectManager $testFrameworkObjectManag
         /* Note: PHP doesn't have copy constructors, so we have to use get_object_vars,
          * but luckily all the properties in the superclass are protected. */
         $properties = get_object_vars($testFrameworkObjectManager);
-        foreach($properties as $key => $value) {
+        foreach ($properties as $key => $value) {
             $this->$key = $value;
         }
         $skipListAndFilterList =  new SkipListAndFilterList;
@@ -66,7 +66,8 @@ public function get($requestedType)
             if (!array_key_exists(get_class($object), $this->skipList)) {
                 if ($object instanceof ResetAfterRequestInterface) {
                     /* Note: some service classes get added to weakMap after they are already used, so
-                     * we need to make sure to reset them to get proper initial state after construction for comparison */
+                     * we need to make sure to reset them to get proper initial state after construction for
+                     * comparison */
                     $object->_resetState();
                 }
                 $this->weakMap[$object] =

lib/internal/Magento/Framework/App/ObjectManager/ConfigLoader.php

@@ -28,8 +28,6 @@ class ConfigLoader implements ConfigLoaderInterface
     protected $_readerFactory;
 
     /**
-     * Cache
-     *
      * @var \Magento\Framework\Config\CacheInterface
      */
     protected $_cache;
@@ -69,7 +67,7 @@ protected function _getReader()
     }
 
     /**
-     * {inheritdoc}
+     * @inheritdoc
      */
     public function load($area)
     {