Removed adaptToSmoke from AgentEnabledConfigComponentTest

SergeyKleyman · SergeyKleyman · commit c119d94a95d9 · 2023-09-14T09:23:35.000+03:00
diff --git a/tests/ElasticApmTests/ComponentTests/AgentEnabledConfigComponentTest.php b/tests/ElasticApmTests/ComponentTests/AgentEnabledConfigComponentTest.php
@@ -64,7 +64,7 @@ public static function dataProviderForTestWhenAgentIsDisabledItShouldNotSendAnyD
             ->addKeyedDimensionOnlyFirstValueCombinable(OptionNames::ENABLED, [null, true . false])
             ->build();
 
-        return self::adaptToSmoke(DataProviderForTestBuilder::convertEachDataSetToMixedMap($result));
+        return DataProviderForTestBuilder::convertEachDataSetToMixedMap($result);
     }
 
     /**
diff --git a/tests/ElasticApmTests/ComponentTests/Util/ComponentTestCaseBase.php b/tests/ElasticApmTests/ComponentTests/Util/ComponentTestCaseBase.php
@@ -254,12 +254,11 @@ protected static function implTestIsAutoInstrumentationEnabled(string $instrClas
     }
 
     /**
-     * @template TKey
-     * @template TValue
+     * @template T
      *
-     * @param iterable<TKey, TValue> $variants
+     * @param iterable<T> $variants
      *
-     * @return iterable<TKey, TValue>
+     * @return iterable<T>
      */
     public static function adaptToSmoke(iterable $variants): iterable
     {

Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ public static function dataProviderForTestWhenAgentIsDisabledItShouldNotSendAnyD`
`64`	`64`	`->addKeyedDimensionOnlyFirstValueCombinable(OptionNames::ENABLED, [null, true . false])`
`65`	`65`	`->build();`
`66`	`66`
`67`		`- return self::adaptToSmoke(DataProviderForTestBuilder::convertEachDataSetToMixedMap($result));`
	`67`	`+ return DataProviderForTestBuilder::convertEachDataSetToMixedMap($result);`
`68`	`68`	`}`
`69`	`69`
`70`	`70`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -254,12 +254,11 @@ protected static function implTestIsAutoInstrumentationEnabled(string $instrClas`
`254`	`254`	`}`
`255`	`255`
`256`	`256`	`/**`
`257`		`- * @template TKey`
`258`		`- * @template TValue`
	`257`	`+ * @template T`
`259`	`258`	`*`
`260`		`- * @param iterable<TKey, TValue> $variants`
	`259`	`+ * @param iterable<T> $variants`
`261`	`260`	`*`
`262`		`- * @return iterable<TKey, TValue>`
	`261`	`+ * @return iterable<T>`
`263`	`262`	`*/`
`264`	`263`	`public static function adaptToSmoke(iterable $variants): iterable`
`265`	`264`	`{`