Merge pull request #7 from terdelyi/master

Fixed line_number variable, Errors method
Soapbox · Apr 15, 2014 · 4a7b9df · 4a7b9df
2 parents f01ec3a + 2f2a28a
commit 4a7b9df
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/src/SoapBox/Formatter/Formatter.php b/src/SoapBox/Formatter/Formatter.php
@@ -368,12 +368,12 @@ protected function _from_csv($string, $attributes = array()) {
 		// Get the headings
 		$headings = str_replace($escape.$enclosure, $enclosure, str_getcsv(array_shift($rows), $delimiter, $enclosure, $escape));
 
-		foreach ($rows as $row) {
+		foreach ($rows as $line_number => $row) {
 			$data_fields = str_replace($escape.$enclosure, $enclosure, str_getcsv($row, $delimiter, $enclosure, $escape));
 			if (count($data_fields) > count($headings)) {
-				array_push(self::$errors, Lang::get('formatter::formatter.more_data', array('line_number' => $line_number ) ));
+				array_push(self::$errors, Lang::get('formatter::formatter.more_data', array('line_number' => $line_number + 1) ));
 			} else if (count($data_fields) < count($headings)) {
-				array_push(self::$errors, Lang::get('formatter::formatter.less_data', array('line_number' => $line_number ) ));
+				array_push(self::$errors, Lang::get('formatter::formatter.less_data', array('line_number' => $line_number + 1) ));
 			} else {
 				$data[] = array_combine($headings, $data_fields);
 			}
@@ -419,4 +419,13 @@ public static function is_assoc($arr) {
 		}
 		return false;
 	}
+
+	/**
+	 * Returns with errors
+	 * @return array
+	 */
+	public function errors()
+	{
+		return self::$errors;
+	}
 }