DataProvider::loadCurrent() moved to Environment::loadData()

Author: dg

Tester/Framework/DataProvider.php

@@ -16,28 +16,6 @@
 class DataProvider
 {
 
-	/**
-	 * Loads data according to the file annotation or specified by Tester\Runner\TestHandler::initiateDataProvider()
-	 * @return array
-	 */
-	public static function loadCurrent()
-	{
-		if (isset($_SERVER['argv'][2])) {
-			list(, $query, $file) = $_SERVER['argv'];
-
-		} else {
-			$annotations = Environment::getTestAnnotations();
-			if (!isset($annotations['dataprovider'])) {
-				throw new \Exception('Missing annotation @dataProvider.');
-			}
-			$provider = (array) $annotations['dataprovider'];
-			list($file, $query) = self::parseAnnotation($provider[0], $annotations['file']);
-		}
-		$data = self::load($file, $query);
-		return reset($data);
-	}
-
-
 	public static function load($file, $query = NULL)
 	{
 		if (!is_file($file)) {

Tester/Framework/Environment.php

@@ -137,4 +137,26 @@ public static function getTestAnnotations()
 		return Helpers::parseDocComment(file_get_contents($file)) + array('file' => $file);
 	}
 
+
+	/**
+	 * Loads data according to the file annotation or specified by Tester\Runner\TestHandler::initiateDataProvider()
+	 * @return array
+	 */
+	public static function loadData()
+	{
+		if (isset($_SERVER['argv'][2])) {
+			list(, $query, $file) = $_SERVER['argv'];
+
+		} else {
+			$annotations = self::getTestAnnotations();
+			if (!isset($annotations['dataprovider'])) {
+				throw new \Exception('Missing annotation @dataProvider.');
+			}
+			$provider = (array) $annotations['dataprovider'];
+			list($file, $query) = DataProvider::parseAnnotation($provider[0], $annotations['file']);
+		}
+		$data = DataProvider::load($file, $query);
+		return reset($data);
+	}
+
 }