ACPT-1696: Fix SVC test failures on Application-Server branch

Author: andimov

app/code/Magento/ApplicationPerformanceMonitor/Profiler/Metric.php

@@ -14,21 +14,21 @@
 class Metric
 {
     /**
-     * @param int $type
+     * @param string $type
      * @param string $name
      * @param mixed $value
      * @param bool $verbose
      */
     public function __construct(
-        private readonly MetricType $type,
+        private readonly string $type,
         private readonly string $name,
         private readonly mixed $value,
         private readonly bool $verbose,
     ) {
     }
 
     /**
-     * @return MetricType
+     * @return string
      */
     public function getType()
     {

app/code/Magento/ApplicationPerformanceMonitor/Profiler/MetricType.php

@@ -10,10 +10,10 @@
 /**
  * Enum for which type of metric
  */
-enum MetricType
+class MetricType
 {
-    case Other;
-    case SecondsElapsedFloat;
-    case UnixTimestampFloat;
-    case MemorySizeInt;
+    public const Other = "Other";
+    public const SecondsElapsedFloat = "SecondsElapsedFloat";
+    public const UnixTimestampFloat = "UnixTimestampFloat";
+    public const MemorySizeInt = "MemorySizeInt";
 }

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

@@ -48,7 +48,7 @@ public function __construct(
      */
     private function copyArray(
         array $array,
-        CompareType $compareType,
+        string $compareType,
         int $recursionLevel,
         int $arrayRecursionLevel = 100
     ) : array {
@@ -86,10 +86,10 @@ function ($element) use (
     /**
      * Gets shared objects from ObjectManager using reflection and copies properties that are objects
      *
-     * @param ShouldResetState $shouldResetState
+     * @param string $shouldResetState
      * @return CollectedObject[]
      */
-    public function getSharedObjects(ShouldResetState $shouldResetState): array
+    public function getSharedObjects(string $shouldResetState): array
     {
         if ($this->objectManager instanceof ObjectManagerInterface) {
             $sharedInstances = $this->objectManager->getSharedInstances();
@@ -159,7 +159,7 @@ public function getPropertiesConstructedAndCurrent(): array
      */
     public function getPropertiesFromObject(
         object $object,
-        CompareType $compareType,
+        string $compareType,
         int $recursionLevel = 0,
     ): CollectedObject {
         $className = get_class($object);

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

@@ -10,8 +10,8 @@
 /**
  * What type of comparison
  */
-enum CompareType
+class CompareType
 {
-    case CompareBetweenRequests;
-    case CompareConstructedAgainstCurrent;
+    public const CompareBetweenRequests = "CompareBetweenRequests";
+    public const CompareConstructedAgainstCurrent = "CompareConstructedAgainstCurrent";
 }

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

@@ -7,8 +7,8 @@
 
 namespace Magento\Framework\TestFramework\ApplicationStateComparator;
 
-enum ShouldResetState
+class ShouldResetState
 {
-    case DoResetState;
-    case DoNotResetState;
+    public const DoResetState = "DoResetState";
+    public const DoNotResetState = "DoNotResetState";
 }

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

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