Extract method

Author: sebastianbergmann

src/Metadata/Api/DataProvider.php

@@ -62,40 +62,10 @@ public function providedData(string $className, string $methodName): ?array
                 $this->triggerWarningForMixingOfDataProviderAndTestWith($testMethod);
             }
 
-            $data = $this->dataProvidedByMethods($testMethod, $dataProvider);
-        } else {
-            $data = $this->dataProvidedByMetadata($testWith);
+            return $this->dataProvidedByMethods($testMethod, $dataProvider);
         }
 
-        $testMethodNumberOfParameters = $testMethod->getNumberOfParameters();
-        $testMethodIsNonVariadic      = !$testMethod->isVariadic();
-
-        foreach ($data as $key => $providedData) {
-            $value = $providedData->value();
-
-            if (!is_array($value)) {
-                throw new InvalidDataProviderException(
-                    sprintf(
-                        'Data set %s provided by %s is invalid, expected array but got %s',
-                        $this->formatKey($key),
-                        $providedData->label(),
-                        get_debug_type($value),
-                    ),
-                );
-            }
-
-            if ($testMethodIsNonVariadic && $testMethodNumberOfParameters < count($value)) {
-                $this->triggerWarningForArgumentCount(
-                    $testMethod,
-                    $this->formatKey($key),
-                    $providedData->label(),
-                    count($value),
-                    $testMethodNumberOfParameters,
-                );
-            }
-        }
-
-        return $data;
+        return $this->dataProvidedByMetadata($testMethod, $testWith);
     }
 
     /**
@@ -219,13 +189,15 @@ private function dataProvidedByMethods(ReflectionMethod $testMethod, MetadataCol
             );
         }
 
+        $this->validate($testMethod, $result);
+
         return $result;
     }
 
     /**
      * @return array<ProvidedData>
      */
-    private function dataProvidedByMetadata(MetadataCollection $testWith): array
+    private function dataProvidedByMetadata(ReflectionMethod $testMethod, MetadataCollection $testWith): array
     {
         $result = [];
 
@@ -253,9 +225,47 @@ private function dataProvidedByMetadata(MetadataCollection $testWith): array
             }
         }
 
+        $this->validate($testMethod, $result);
+
         return $result;
     }
 
+    /**
+     * @param array<ProvidedData> $data
+     *
+     * @throws InvalidDataProviderException
+     */
+    private function validate(ReflectionMethod $testMethod, array $data): void
+    {
+        $testMethodNumberOfParameters = $testMethod->getNumberOfParameters();
+        $testMethodIsNonVariadic      = !$testMethod->isVariadic();
+
+        foreach ($data as $key => $providedData) {
+            $value = $providedData->value();
+
+            if (!is_array($value)) {
+                throw new InvalidDataProviderException(
+                    sprintf(
+                        'Data set %s provided by %s is invalid, expected array but got %s',
+                        $this->formatKey($key),
+                        $providedData->label(),
+                        get_debug_type($value),
+                    ),
+                );
+            }
+
+            if ($testMethodIsNonVariadic && $testMethodNumberOfParameters < count($value)) {
+                $this->triggerWarningForArgumentCount(
+                    $testMethod,
+                    $this->formatKey($key),
+                    $providedData->label(),
+                    count($value),
+                    $testMethodNumberOfParameters,
+                );
+            }
+        }
+    }
+
     /**
      * @param int|non-empty-string $key
      *