ACPT-1666 & ACPT-1552

fixing static test failures

Author: JacobBrownAustin

lib/internal/Magento/Framework/ObjectManager/Resetter/SortableReferenceObject.php

@@ -35,6 +35,11 @@ public function getSort() : int
         return $this->sort;
     }
 
+    /**
+     * Gets WeakReference
+     *
+     * @return WeakReference
+     */
     public function getWeakReference() : WeakReference
     {
         return $this->reference;

lib/internal/Magento/Framework/ObjectManager/Resetter/WeakMapSorter.php

@@ -22,18 +22,13 @@ class WeakMapSorter
 
     public const MAX_SORT_VALUE = 10000;
 
-    /**
-     * @var SortableReferenceObject[]
-     */
-    private array $sortableReferenceList = [];
-
     /**
      * Constructor
      *
      * @param array<string, int> $sortOrder
      * @SuppressWarnings(PHPMD.UnusedLocalVariable)
      */
-    public function __construct (private array $sortOrder)
+    public function __construct(private array $sortOrder)
     {
         // Note: Even though they are declared as xsi:type="number", they are still strings, so we convert them here.
         foreach ($this->sortOrder as &$value) {
@@ -42,8 +37,11 @@ public function __construct (private array $sortOrder)
     }
 
     /**
+     * Sorts the WeakMap into a WeakReference list
+     *
      * @param WeakMap $weakmap
      * @return WeakReference[]
+     * @SuppressWarnings(PHPMD.UnusedLocalVariable)
      */
     public function sortWeakMapIntoWeakReferenceList(WeakMap $weakmap) : array
     {
@@ -69,17 +67,20 @@ public function sortWeakMapIntoWeakReferenceList(WeakMap $weakmap) : array
     }
 
     /**
+     * Gets sort value for the specified object
+     *
      * @param object $object
      * @return int
      */
     private function getSortValueOfObject(object $object) : int
     {
         $className = get_class($object);
-        if (array_key_exists($className , $this->sortOrder)) {
+        if (array_key_exists($className, $this->sortOrder)) {
             return $this->sortOrder[$className];
         }
+        // phpcs:ignore Generic.CodeAnalysis.ForLoopWithTestFunctionCall
         for ($parentClass = $className; $parentClass = get_parent_class($parentClass);) {
-            if (array_key_exists($parentClass , $this->sortOrder)) {
+            if (array_key_exists($parentClass, $this->sortOrder)) {
                 $sortValue = $this->sortOrder[$parentClass];
                 $this->sortOrder[$className] = $sortValue;
                 return $sortValue;

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

@@ -81,7 +81,6 @@ public function create($type, array $arguments = [])
     public function _resetState(): void
     {
         $this->resetter->_resetState();
-        return;
     }
 
     /**

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

@@ -37,8 +37,10 @@ class Resetter extends OriginalResetter
      */
     private readonly array $skipList;
 
+    /** @var ObjectManagerInterface */
     private ObjectManagerInterface $objectManager;
 
+    /** @var WeakMapSorter|null */
     private ?WeakMapSorter $weakMapSorter = null;
 
     /**