Improvements

Added Exception `UnableToParseFormatException`
Improved PHP Adapter, support for non extension path
Improved JSON Adapter, just more clear
Fixed bug with AbstractAdapter, support for non extension path

src/AbstractAdapter.php

@@ -22,6 +22,7 @@
 class AbstractAdapter implements AdapterInterface
 {
 	public $basePath;
+	public $extension;
 
 	public function setBasePath($basePath)
 	{
@@ -45,18 +46,16 @@ public function load($data)
 
 	public function loadFile($file)
 	{
-		$data = $this->getContent($file);
-
-		if ($data) {
-			$this->parse($data);
+		if ($data = $this->getContent($file)) {
+			return $this->parse($data);
 		}
 
 		return null;
 	}
 
 	private function getValidPath($path)
 	{
-		if (file_exists($basePath.$path)) {
+		if (file_exists($path)) {
 			return true;
 		}
 
@@ -66,8 +65,8 @@ private function getValidPath($path)
 
 	protected function getContent($path)
 	{
-		if ($this->getValidPath($this->basePath.$path)) {
-			return file_get_contents($this->basePath.$path);
+		if ($this->getValidPath($this->basePath.$path.$this->extension)) {
+			return file_get_contents($this->basePath.$path.$this->extension);
 		}
 
 		return null;

src/Adapter/JSON.php

@@ -23,10 +23,10 @@
 
 class JSON extends AbstractAdapter
 {
+	public $extension = ".php";
+
 	public function parse($data)
 	{
-		$data = json_decode($data, true);
-
-		return $data;
+		return json_decode($data, true);
 	}
 }

src/Adapter/PHP.php

@@ -20,26 +20,32 @@
 namespace Aurora\Adapter;
 
 use Aurora\AbstractAdapter;
+use Aurora\Exception\UnableToParseFormatException;
 
 class PHP extends AbstractAdapter
 {
+	public $extension = ".php";
 
-	public function parse($path){
+	public function parse($data)
+	{
 
-		try {
-			$temp = require $path;
-		} catch (\Exception $e) {
-			// To do throw errors
+		if (is_callable($data)) {
+			$data = call_user_func($data);
 		}
 
-		if (is_callable($temp)) {
-			$temp = call_user_func($temp);
+		if (!$data || !is_array($data)) {
+			throw new UnableToParseFormatException;
 		}
 
-		if (!$temp || !is_array($temp)) {
-			// To do throw error
+		return $data;
+	}
+
+	protected function getContent($path)
+	{
+		if ($this->getValidPath($this->basePath.$path.$this->extension)) {
+			return require_once $this->basePath.$path.$this->extension;
 		}
 
-		return $temp;
+		return null;
 	}
 }

src/Exception/UnableToParseFormatException.php

@@ -0,0 +1,9 @@
+<?php
+
+namespace Aurora\Exception;
+
+use Exception;
+
+class UnableToParseFormatException extends Exception
+{
+}

src/FileSystem.php

@@ -62,7 +62,6 @@ public static function extension($file)
    public static function mime($file, $guess = true)
 	{
 		if (function_exists('finfo_open')) {
-   		// Get mime using the file information functions
    		$info = finfo_open(FILEINFO_MIME_TYPE);
    		$mime = finfo_file($info, $file);
    		finfo_close($info);