Merge branch '2.4-develop' into order-cancellation

Author: svera

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

@@ -45,7 +45,7 @@ public function __construct(
      */
     private function copyArray(
         array $array,
-        CompareType $compareType,
+        string $compareType,
         int $recursionLevel,
         int $arrayRecursionLevel = 100
     ) : array {
@@ -86,7 +86,7 @@ function ($element) use (
      * @param ShouldResetState $shouldResetState
      * @return CollectedObject[]
      */
-    public function getSharedObjects(ShouldResetState $shouldResetState): array
+    public function getSharedObjects(string $shouldResetState): array
     {
         if ($this->objectManager instanceof ObjectManager) {
             $sharedInstances = $this->objectManager->getSharedInstances();
@@ -156,7 +156,7 @@ public function getPropertiesConstructedAndCurrent(): array
      */
     public function getPropertiesFromObject(
         object $object,
-        CompareType $compareType,
+        string $compareType,
         int $recursionLevel = 1,
     ): CollectedObject {
         $className = get_class($object);

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

@@ -9,9 +9,11 @@
 
 /**
  * What type of comparison
+ *
+ * TODO: change this back into enum once magento-semvar is fixed
  */
-enum CompareType
+class CompareType
 {
-    case CompareBetweenRequests;
-    case CompareConstructedAgainstCurrent;
+    public const CompareBetweenRequests = "CompareBetweenRequests";
+    public const CompareConstructedAgainstCurrent = "CompareConstructedAgainstCurrent";
 }

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

@@ -7,8 +7,9 @@
 
 namespace Magento\GraphQl\App\State;
 
-enum ShouldResetState
+// TODO: change this back into enum once magento-semvar is fixed
+class ShouldResetState
 {
-    case DoResetState;
-    case DoNotResetState;
+    public const DoResetState = "DoResetState";
+    public const DoNotResetState = "DoNotResetState";
 }

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

@@ -46,7 +46,7 @@ public function filterProperties(array $properties, array $propertiesToFilterLis
      * @param CompareType $compareType
      * @return array
      */
-    public function getSkipList(string $operationName, CompareType $compareType): array
+    public function getSkipList(string $operationName, string $compareType): array
     {
         if ($this->skipList === null) {
             $skipListList = [];