ddimaria / Laravel-REST-CMS

app/Http/Controllers/API/V1/ApiController.php

Unused Use Statements -4 removed lines

@@ -4,10 +4,6 @@
 
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Contracts\Validation\ValidationException;
-use Illuminate\Foundation\Bus\DispatchesCommands;
-use Illuminate\Foundation\Validation\ValidatesRequests;
-use Illuminate\Routing\Controller as BaseController;
-
 use Chrisbjr\ApiGuard\Http\Controllers\ApiGuardController;
 
 abstract class ApiController extends ApiGuardController

Spacing +1 added lines, -1 removed lines

@@ -60,7 +60,7 @@
      */
     public function __construct()
     {
-        $this->response =  \Response::api();
+        $this->response = \Response::api();
         
         if (!empty($this->modelName)) {
             $this->model = new $this->modelName;

Indentation +143 added lines, -143 removed lines

@@ -12,160 +12,160 @@
 
 abstract class ApiController extends ApiGuardController
 {
-    /**
-     * Laraponse object, which abstracts Fractal
-     * 
-     * @var EllipseSynergie\ApiResponse\Laravel\Response
-     */
-    public $response;
+	/**
+	 * Laraponse object, which abstracts Fractal
+	 * 
+	 * @var EllipseSynergie\ApiResponse\Laravel\Response
+	 */
+	public $response;
     
-    /**
-     * The string name of the Eloquen Model
-     * 
-     * @var string
-     */
-    protected $modelName;
+	/**
+	 * The string name of the Eloquen Model
+	 * 
+	 * @var string
+	 */
+	protected $modelName;
     
-    /**
-     * The Eloquent Model
-     * 
-     * @var Illuminate\Database\Eloquent\Model
-     */
-    protected $model;
+	/**
+	 * The Eloquent Model
+	 * 
+	 * @var Illuminate\Database\Eloquent\Model
+	 */
+	protected $model;
     
-    /**
-     * The string name of the Transformer class
-     * 
-     * @var string
-     */
-    protected $transformerName;
+	/**
+	 * The string name of the Transformer class
+	 * 
+	 * @var string
+	 */
+	protected $transformerName;
     
-    /**
-     * The name of the collection that is returned in the JSON response
-     * 
-     * @var string
-     */
-    protected $collectionName;
+	/**
+	 * The name of the collection that is returned in the JSON response
+	 * 
+	 * @var string
+	 */
+	protected $collectionName;
     
-    /**
-     * The Fractal Manager
-     * 
-     * @var \League\Fractal\Manager
-     */
-    public $manager;
-
-
-    /**
-     * Constructor
-     */
-    public function __construct()
-    {
-        $this->response =  \Response::api();
+	/**
+	 * The Fractal Manager
+	 * 
+	 * @var \League\Fractal\Manager
+	 */
+	public $manager;
+
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		$this->response =  \Response::api();
         
-        if (!empty($this->modelName)) {
-            $this->model = new $this->modelName;
-        }
-
-        // if no collection name provided, use the model's table name
-        if (empty($this->collectionName)) {
-            $this->collectionName = $this->model->getTable();
-        }
+		if (!empty($this->modelName)) {
+			$this->model = new $this->modelName;
+		}
+
+		// if no collection name provided, use the model's table name
+		if (empty($this->collectionName)) {
+			$this->collectionName = $this->model->getTable();
+		}
         
-        // parse includes
-        if (\Input::get('include') != '') {
-            $this->manager = new \League\Fractal\Manager;
-            $this->manager->parseIncludes(explode(',', \Input::get('include')));
-        }
-
-        parent::__construct();
-    }
-
-    /**
-     * Create an item
-     * 
-     * @return \Illuminate\Http\JsonResponse
-     */
-    public function create($data = null)
-    {   
-        $data = $data ?: \Input::json()->all();
-
-        try {
-            $this->model->validate($data);
-            $item = $this->model->create($data);
+		// parse includes
+		if (\Input::get('include') != '') {
+			$this->manager = new \League\Fractal\Manager;
+			$this->manager->parseIncludes(explode(',', \Input::get('include')));
+		}
+
+		parent::__construct();
+	}
+
+	/**
+	 * Create an item
+	 * 
+	 * @return \Illuminate\Http\JsonResponse
+	 */
+	public function create($data = null)
+	{   
+		$data = $data ?: \Input::json()->all();
+
+		try {
+			$this->model->validate($data);
+			$item = $this->model->create($data);
             
-            return $this->showByObject($item);
+			return $this->showByObject($item);
         
-        } catch (ValidationException $e) {
-            return $this->response->setStatusCode(422)->withError($e->errors()->toArray(), 'GEN-UNPROCESSABLE-ENTITY');
-        }
-    }
-
-    /**
-     * Returns a single item
-     * 
-     * @param  int $id
-     * @return \Illuminate\Http\JsonResponse
-     */
-    public function show($id)
-    {        
-        try {
+		} catch (ValidationException $e) {
+			return $this->response->setStatusCode(422)->withError($e->errors()->toArray(), 'GEN-UNPROCESSABLE-ENTITY');
+		}
+	}
+
+	/**
+	 * Returns a single item
+	 * 
+	 * @param  int $id
+	 * @return \Illuminate\Http\JsonResponse
+	 */
+	public function show($id)
+	{        
+		try {
             
-            return $this->response->withItem($this->model->findOrFail($id), new $this->transformerName);
+			return $this->response->withItem($this->model->findOrFail($id), new $this->transformerName);
         
-        } catch (ModelNotFoundException $e) {
-
-            return $this->respondNotFound();
-        }
-    }
-
-    /**
-     * Returns a single item
-     * 
-     * @param  object $object
-     * @return \Illuminate\Http\JsonResponse
-     */
-    public function showByObject($object)
-    {        
-        try {
-            return $this->response->withItem($object, new $this->transformerName);
+		} catch (ModelNotFoundException $e) {
+
+			return $this->respondNotFound();
+		}
+	}
+
+	/**
+	 * Returns a single item
+	 * 
+	 * @param  object $object
+	 * @return \Illuminate\Http\JsonResponse
+	 */
+	public function showByObject($object)
+	{        
+		try {
+			return $this->response->withItem($object, new $this->transformerName);
         
-        } catch (ModelNotFoundException $e) {
-
-            return $this->respondNotFound();
-        }
-    }
-
-    /**
-     * Returns a paginated collection
-     * 
-     * @return \Illuminate\Http\JsonResponse
-     */
-    public function collection()
-    {
-        $limit = \Input::get('limit') ?: 10;
-        $model = $this->model;
+		} catch (ModelNotFoundException $e) {
+
+			return $this->respondNotFound();
+		}
+	}
+
+	/**
+	 * Returns a paginated collection
+	 * 
+	 * @return \Illuminate\Http\JsonResponse
+	 */
+	public function collection()
+	{
+		$limit = \Input::get('limit') ?: 10;
+		$model = $this->model;
         
-        if (\Request::has('order')) {
-            list($orderCol, $orderBy) = explode('|', \Input::get('order'));
-            $model = $model->orderBy($orderCol, $orderBy);
-        }
-
-        return $this->response->withPaginator($model->paginate($limit), new $this->transformerName, $this->collectionName);
-    }
-
-    /**
-     * Handles 404 errors
-     * 
-     * @param  string $msg
-     * @return \Illuminate\Http\JsonResponse
-     */
-    public function respondNotFound($msg = 'Not found!')
-    {
-        return \Response::json([
-            'error' => [
-                'message' => $msg,
-                'status_code' => 404
-            ]
-        ], 404);
-    }
+		if (\Request::has('order')) {
+			list($orderCol, $orderBy) = explode('|', \Input::get('order'));
+			$model = $model->orderBy($orderCol, $orderBy);
+		}
+
+		return $this->response->withPaginator($model->paginate($limit), new $this->transformerName, $this->collectionName);
+	}
+
+	/**
+	 * Handles 404 errors
+	 * 
+	 * @param  string $msg
+	 * @return \Illuminate\Http\JsonResponse
+	 */
+	public function respondNotFound($msg = 'Not found!')
+	{
+		return \Response::json([
+			'error' => [
+				'message' => $msg,
+				'status_code' => 404
+			]
+		], 404);
+	}
 }
\ No newline at end of file

app/LaravelRestCms/User/User.php

Doc Comments +1 added lines, -1 removed lines

@@ -43,7 +43,7 @@
 	 * Relationship to the api_key table
 	 * 
 	 * @codeCoverageIgnore
-	 * @return Illuminate\Database\Eloquent\Relations\HasOne
+	 * @return \Illuminate\Database\Eloquent\Relations\HasOne
 	 */
 	public function apiKey()
 	{

app/Http/routes.php

Indentation +2 added lines, -2 removed lines

@@ -15,6 +15,6 @@
 Route::group(['prefix' => 'api/v1', 'namespace' => 'Api\V1'], function()
 {
 	// users/auth
-    Route::post('user/login', 'UserController@authenticate');
-    Route::get('user/logout/{api_key}', 'UserController@deauthenticate');
+	Route::post('user/login', 'UserController@authenticate');
+	Route::get('user/logout/{api_key}', 'UserController@deauthenticate');
 });
\ No newline at end of file

app/Http/Middleware/Authenticate.php

Braces +1 added lines, -2 removed lines

@@ -37,8 +37,7 @@
 			if ($request->ajax())
 			{
 				return response('Unauthorized.', 401);
-			}
-			else
+			} else
 			{
 				return redirect()->guest('auth/login');
 			}

app/LaravelRestCms/SearchTrait.php

Spacing +1 added lines, -1 removed lines

@@ -67,7 +67,7 @@
         $searchCols = $this->getSearchCols(null, static::$labelCol);
         $select = array_merge([static::$labelCol], ['url']);
         //$query->select('*', implode(' ', static::$labelCol) .  ' as label', \DB::raw('concat("' . static::$urlPrepend . '",url) as url'));
-        $query->select('*', implode(' ', static::$labelCol) .  ' as label', 'url');
+        $query->select('*', implode(' ', static::$labelCol) . ' as label', 'url');
         $match = '';
 
         // make search results use the "and" clause

Indentation +68 added lines, -68 removed lines

@@ -2,81 +2,81 @@
 
 trait SearchTrait {
 
-    public static $labelCol = [];
-    public static $searchCols = [];
+	public static $labelCol = [];
+	public static $searchCols = [];
 
-    /**
-     * Adds search methods to the model
-     *         
-     * @param string $keyword
-     * @param string $labelCol
-     * @return \BaseModel
-     */
-    public function addSearch($keyword = null, $labelCol = null)
-    {
-        $searchCols = self::getSearchCols(null, $labelCol);
-        $keyword = strtolower($keyword);
+	/**
+	 * Adds search methods to the model
+	 *         
+	 * @param string $keyword
+	 * @param string $labelCol
+	 * @return \BaseModel
+	 */
+	public function addSearch($keyword = null, $labelCol = null)
+	{
+		$searchCols = self::getSearchCols(null, $labelCol);
+		$keyword = strtolower($keyword);
         
-        if ($searchCols && !is_null($keyword) && trim($keyword) != '') {
+		if ($searchCols && !is_null($keyword) && trim($keyword) != '') {
             
-            return self::orWhere(function($query) use ($searchCols, $keyword)
-            {
-                foreach ($searchCols as $key=>$val) {
-                    $query->orWhere($val, 'like', "%{$keyword}%");
-                }
-            });
-        } else {
-            return $this;
-        }
-    }
+			return self::orWhere(function($query) use ($searchCols, $keyword)
+			{
+				foreach ($searchCols as $key=>$val) {
+					$query->orWhere($val, 'like', "%{$keyword}%");
+				}
+			});
+		} else {
+			return $this;
+		}
+	}
     
-    /**
-     * Retrieves the columns to search
-     * 
-     * @param  string $override
-     * @param  string $default
-     * @return array
-     */
-    public function getSearchCols($override = null, $default = null)
-    {
-        if (!is_null($override)) {
-            $searchCols = $override;
-        } else if (!is_null(static::$searchCols)) {
-            $searchCols = static::$searchCols;
-        } else if (!is_null(static::$labelCol)) {
-            $searchCols = static::$labelCol;
-        } else if (!is_null($default)) {
-            $searchCols = $default;
-        } else {
-            return false;
-        }
+	/**
+	 * Retrieves the columns to search
+	 * 
+	 * @param  string $override
+	 * @param  string $default
+	 * @return array
+	 */
+	public function getSearchCols($override = null, $default = null)
+	{
+		if (!is_null($override)) {
+			$searchCols = $override;
+		} else if (!is_null(static::$searchCols)) {
+			$searchCols = static::$searchCols;
+		} else if (!is_null(static::$labelCol)) {
+			$searchCols = static::$labelCol;
+		} else if (!is_null($default)) {
+			$searchCols = $default;
+		} else {
+			return false;
+		}
         
-        return (array) $searchCols;
-    }
+		return (array) $searchCols;
+	}
     
-    /**
-     * Eloquent scope of the search
-     * 
-     * @param  Illuminate\Database\Eloquent\Builder $query
-     * @param  string $keyword
-     * @return Illuminate\Database\Eloquent\Builder
-     */
-    public function scopeSearch($query, $keyword = null) 
-    {        
-        $searchCols = $this->getSearchCols(null, static::$labelCol);
-        $query->select('*', implode(' ', static::$labelCol) .  ' as label', 'url');
-        $match = '';
+	/**
+	 * Eloquent scope of the search
+	 * 
+	 * @param  Illuminate\Database\Eloquent\Builder $query
+	 * @param  string $keyword
+	 * @return Illuminate\Database\Eloquent\Builder
+	 */
+	public function scopeSearch($query, $keyword = null) 
+	{        
+		$searchCols = $this->getSearchCols(null, static::$labelCol);
+		$query->select('*', implode(' ', static::$labelCol) .  ' as label', 'url');
+		$match = '';
 
-        // make search results use the "and" clause
-        $keyword[0] = '"' . $keyword[0] . '"';
+		// make search results use the "and" clause
+		$keyword[0] = '"' . $keyword[0] . '"';
 
-        if (is_array($searchCols)) {
-            foreach ($searchCols as $searchCol) {
-                $match = "MATCH(" . $searchCol . ") AGAINST (? IN BOOLEAN MODE)";
-                $query = $query->whereRaw($match, $keyword);
-            }
-        }
+		if (is_array($searchCols)) {
+			foreach ($searchCols as $searchCol) {
+				$match = "MATCH(" . $searchCol . ") AGAINST (? IN BOOLEAN MODE)";
+				$query = $query->whereRaw($match, $keyword);
+			}
+		}
                
-        return $query->orderByRaw($match . ' desc', $keyword);  
-    }
+		return $query->orderByRaw($match . ' desc', $keyword);  
+	}
 }
\ No newline at end of file

app/Console/Commands/Inspire.php

Spacing +1 added lines, -1 removed lines

@@ -26,7 +26,7 @@
 	 */
 	public function handle()
 	{
-		$this->comment(PHP_EOL.Inspiring::quote().PHP_EOL);
+		$this->comment(PHP_EOL . Inspiring::quote() . PHP_EOL);
 	}
 
 }

app/Library/Sftp.php

Spacing +2 added lines, -2 removed lines

@@ -54,7 +54,7 @@ 
 			if ($this->isValidExtension($val['filename'])) {
 				$files[] = [
                     'fileName' => $val['filename'], 
-                    'fullFileName' => $dir . '/' .$val['filename'],
+                    'fullFileName' => $dir . '/' . $val['filename'],
                     'size' => $val['size'],
                     'modified' => gmdate("m/d/Y H:i:s", $val['mtime']),
                 ];
@@ -154,6 +154,6 @@ 
      */
     protected function isValidExtension($fileName)
     {
-    	return substr(strrchr($fileName,'.'),1) === 'xml' || substr(strrchr($fileName,'.'),1) === 'err';
+    	return substr(strrchr($fileName, '.'), 1) === 'xml' || substr(strrchr($fileName, '.'), 1) === 'err';
     }
 }
\ No newline at end of file

Indentation +127 added lines, -127 removed lines

@@ -7,154 +7,154 @@
 class Sftp
 {
     
-    protected $connectionName;
-
-    /**
-     * Constructor
-     *
-     * @param string $connectionName
-     */
-    public function __construct($connectionName)
-    {
-        $this->connectionName = $connectionName;
-    }
-
-    /**
-     * Gets all XML files from a remote folder
-     * 
-     * @param  string $remoteDir 
-     * @param  string $localDir 
-     * @return array
-     */
+	protected $connectionName;
+
+	/**
+	 * Constructor
+	 *
+	 * @param string $connectionName
+	 */
+	public function __construct($connectionName)
+	{
+		$this->connectionName = $connectionName;
+	}
+
+	/**
+	 * Gets all XML files from a remote folder
+	 * 
+	 * @param  string $remoteDir 
+	 * @param  string $localDir 
+	 * @return array
+	 */
    	public function getFiles($remoteDir, $localDir)
    	{    	
-    	$files = $this->remoteListPackaged($remoteDir);
+		$files = $this->remoteListPackaged($remoteDir);
 
-    	foreach ($files as $file) {			
+		foreach ($files as $file) {			
 			$this->getFile($file['fullFileName'], $localDir . '/' . $file['fileName']);
 		}
 
-    	return $files;
+		return $files;
   	}
 
-    /**
-     * Gets all XML files from a remote folder
-     * 
-     * @param  string 	$dir 
-     * @param  bool     $sorted 
-     * @param  string   $sortOrder 
-     * @return array
-     */
+	/**
+	 * Gets all XML files from a remote folder
+	 * 
+	 * @param  string 	$dir 
+	 * @param  bool     $sorted 
+	 * @param  string   $sortOrder 
+	 * @return array
+	 */
    	public function remoteListPackaged($dir, $sorted = true, $sortOrder = 'desc')
    	{    	
-    	$files = [];
+		$files = [];
 		$all = $this->remoteList($dir, $sorted, $sortOrder);
 		
-        foreach ($all as $file=>$val) {
+		foreach ($all as $file=>$val) {
 			if ($this->isValidExtension($val['filename'])) {
 				$files[] = [
-                    'fileName' => $val['filename'], 
-                    'fullFileName' => $dir . '/' .$val['filename'],
-                    'size' => $val['size'],
-                    'modified' => gmdate("m/d/Y H:i:s", $val['mtime']),
-                ];
+					'fileName' => $val['filename'], 
+					'fullFileName' => $dir . '/' .$val['filename'],
+					'size' => $val['size'],
+					'modified' => gmdate("m/d/Y H:i:s", $val['mtime']),
+				];
 			}
 		}
 
 		return $files;
-    }
+	}
 
-    /**
-     * Retrieves a file from a SSH/SFTP server
-     * 
-     * @param  string $remoteFile 
-     * @param  string $localFile 
+	/**
+	 * Retrieves a file from a SSH/SFTP server
+	 * 
+	 * @param  string $remoteFile 
+	 * @param  string $localFile 
 	 * @return \Symfony\Component\Console\Output\OutputInterface
-     */
-    public function getFile($remoteFile, $localFile)
-    {	
-    	return \SSH::into($this->connectionName)->get($remoteFile, $localFile);    
-    }
-
-    /**
-     * Places a file on a remote SSH/SFTP server
-     * 
-     * @param  string $remoteFile 
-     * @param  string $localFile 
+	 */
+	public function getFile($remoteFile, $localFile)
+	{	
+		return \SSH::into($this->connectionName)->get($remoteFile, $localFile);    
+	}
+
+	/**
+	 * Places a file on a remote SSH/SFTP server
+	 * 
+	 * @param  string $remoteFile 
+	 * @param  string $localFile 
 	 * @return \Symfony\Component\Console\Output\OutputInterface
-     */
-    public function putFile($remoteFile, $localFile)
-    {
-    	return \SSH::into($this->connectionName)->put($localFile, $remoteFile);
-    }
-
-    /**
-     * Retrieves a listing from directory
-     * 
-     * @param  string 	$dir 
-     * @param  bool     $sorted 
-     * @param  string   $sortOrder 
+	 */
+	public function putFile($remoteFile, $localFile)
+	{
+		return \SSH::into($this->connectionName)->put($localFile, $remoteFile);
+	}
+
+	/**
+	 * Retrieves a listing from directory
+	 * 
+	 * @param  string 	$dir 
+	 * @param  bool     $sorted 
+	 * @param  string   $sortOrder 
 	 * @return array 	array of files and folders	
-     */
-    public function remoteList($dir, $sorted = true, $sortOrder = 'desc')
-    {
-    	$conn = $this->getConnection();
-    	$conn->chdir($dir);
-        $list = $conn->rawlist();
-
-        if ($sorted) {
-            $list = $this->sortList($list, $sortOrder);
-        }
+	 */
+	public function remoteList($dir, $sorted = true, $sortOrder = 'desc')
+	{
+		$conn = $this->getConnection();
+		$conn->chdir($dir);
+		$list = $conn->rawlist();
+
+		if ($sorted) {
+			$list = $this->sortList($list, $sortOrder);
+		}
     	
-    	return $list;    
-    }
-
-    /**
-     * Retrieves a listing from directory
-     * 
-     * @param  array    $list 
-     * @param  string   $sortOrder 
-     * @return array    sorted array of a folder
-     */
-    public function sortList($list, $sortOrder = 'desc')
-    {
-        usort($list, function($a, $b) { return $a['mtime'] - $b['mtime']; }); 
-
-        return $sortOrder == 'asc' ? $list : array_reverse($list);
-    }
-
-    /**
-     * Retrieves a listing from directory
-     * 
-     * @param  string   $remoteFileFrom 
-     * @param  string   $remoteFileTo 
-     * @return boolean  success
-     */
-    public function rename($remoteFileFrom, $remoteFileTo)
-    {
-        $conn = $this->getConnection();
-        //print $conn->getSFTPLog();
-        return $conn->rename($remoteFileFrom, $remoteFileTo);
-    }
-
-    /**
-     * Gets a Net_SFTP connection as Laravels SSH doesn't have all the functionality
-     * 
-     * @return Net_SFTP connection
-     */
-    protected function getConnection()
-    {
-    	return \SSH::into($this->connectionName)->getGateway()->getConnection();
-    }
-
-    /**
-     * Gets a Net_SFTP connection as Laravels SSH doesn't have all the functionality
-     * 
-     * @param  string $fileName 
-     * @return bool 	
-     */
-    protected function isValidExtension($fileName)
-    {
-    	return substr(strrchr($fileName,'.'),1) === 'xml' || substr(strrchr($fileName,'.'),1) === 'err';
-    }
+		return $list;    
+	}
+
+	/**
+	 * Retrieves a listing from directory
+	 * 
+	 * @param  array    $list 
+	 * @param  string   $sortOrder 
+	 * @return array    sorted array of a folder
+	 */
+	public function sortList($list, $sortOrder = 'desc')
+	{
+		usort($list, function($a, $b) { return $a['mtime'] - $b['mtime']; }); 
+
+		return $sortOrder == 'asc' ? $list : array_reverse($list);
+	}
+
+	/**
+	 * Retrieves a listing from directory
+	 * 
+	 * @param  string   $remoteFileFrom 
+	 * @param  string   $remoteFileTo 
+	 * @return boolean  success
+	 */
+	public function rename($remoteFileFrom, $remoteFileTo)
+	{
+		$conn = $this->getConnection();
+		//print $conn->getSFTPLog();
+		return $conn->rename($remoteFileFrom, $remoteFileTo);
+	}
+
+	/**
+	 * Gets a Net_SFTP connection as Laravels SSH doesn't have all the functionality
+	 * 
+	 * @return Net_SFTP connection
+	 */
+	protected function getConnection()
+	{
+		return \SSH::into($this->connectionName)->getGateway()->getConnection();
+	}
+
+	/**
+	 * Gets a Net_SFTP connection as Laravels SSH doesn't have all the functionality
+	 * 
+	 * @param  string $fileName 
+	 * @return bool 	
+	 */
+	protected function isValidExtension($fileName)
+	{
+		return substr(strrchr($fileName,'.'),1) === 'xml' || substr(strrchr($fileName,'.'),1) === 'err';
+	}
 }
\ No newline at end of file

app/Library/Xml.php

Indentation +136 added lines, -136 removed lines

@@ -4,150 +4,150 @@
 
 class Xml
 {
-    /**
-     * xml
-     * @var string
-     */
-    protected $xml;
-
-    /**
-     * XSD validation errors
-     * @var array
-     */
-    protected $errors;
-
-    /**
-     * Constructor
-     *
-     * @param string $xml
-     */
-    public function __construct($xml = '')
-    {
-        $this->xml = $xml;
-    }
-
-    /**
-     * Gets all XML files from a remote folder
-     * 
-     * @param  string $xml 
-     * @return array
-     */
+	/**
+	 * xml
+	 * @var string
+	 */
+	protected $xml;
+
+	/**
+	 * XSD validation errors
+	 * @var array
+	 */
+	protected $errors;
+
+	/**
+	 * Constructor
+	 *
+	 * @param string $xml
+	 */
+	public function __construct($xml = '')
+	{
+		$this->xml = $xml;
+	}
+
+	/**
+	 * Gets all XML files from a remote folder
+	 * 
+	 * @param  string $xml 
+	 * @return array
+	 */
    	public function toArray($xml)
    	{    	
-    	$xml = $xml ?: $this->xml;
-        //$array = json_decode(str_replace('{"0":" "}','null', json_encode(simplexml_load_string($xml),JSON_NUMERIC_CHECK)), true);
-        $array = json_decode(str_replace('{"0":" "}','null', json_encode(simplexml_load_string($xml))), true);
-        $this->filterEmptyArray($array);
+		$xml = $xml ?: $this->xml;
+		//$array = json_decode(str_replace('{"0":" "}','null', json_encode(simplexml_load_string($xml),JSON_NUMERIC_CHECK)), true);
+		$array = json_decode(str_replace('{"0":" "}','null', json_encode(simplexml_load_string($xml))), true);
+		$this->filterEmptyArray($array);
 
-        return $array;
+		return $array;
   	}
 
-    /**
-     * Replace data in a node
-     * 
-     * @param  string $xml 
-     * @param  string $node 
-     * @param  string $find 
-     * @param  string $replace 
-     * @return string
-     */
-    public function replaceInNode($xml, $node, $find, $replace)
-    {       
-        return preg_replace_callback('@(<' . $node . '>)' . $find . '(</' . $node . '>)@s', function ($matches) use ($replace) {
-            return str_replace(' ', $replace, $matches[0]);
-        }, $xml);
-    }
-
-    /**
-     * Converts an xml string into a SimpleXml object
-     * 
-     * @param  string $xml 
-     * @return SimpleXml
-     */
-    public function toXml($xml, $namespace = null)
-    {       
-        $xml = $xml ?: $this->xml;
-
-        libxml_use_internal_errors(true);
-        $xmlDoc = simplexml_load_string($xml, null, 0, $namespace, !is_null($namespace));
+	/**
+	 * Replace data in a node
+	 * 
+	 * @param  string $xml 
+	 * @param  string $node 
+	 * @param  string $find 
+	 * @param  string $replace 
+	 * @return string
+	 */
+	public function replaceInNode($xml, $node, $find, $replace)
+	{       
+		return preg_replace_callback('@(<' . $node . '>)' . $find . '(</' . $node . '>)@s', function ($matches) use ($replace) {
+			return str_replace(' ', $replace, $matches[0]);
+		}, $xml);
+	}
+
+	/**
+	 * Converts an xml string into a SimpleXml object
+	 * 
+	 * @param  string $xml 
+	 * @return SimpleXml
+	 */
+	public function toXml($xml, $namespace = null)
+	{       
+		$xml = $xml ?: $this->xml;
+
+		libxml_use_internal_errors(true);
+		$xmlDoc = simplexml_load_string($xml, null, 0, $namespace, !is_null($namespace));
         
-        if ($xmlDoc === false) {
-            $this->errors = libxml_get_errors();
+		if ($xmlDoc === false) {
+			$this->errors = libxml_get_errors();
             
-            return false;
-        }
-
-        return $xmlDoc;    
-    }
-
-    /**
-     * Get an array of attributes from an XML node
-     * @param  SimpleXMLElement $node 
-     * @return array
-     */
-    public static function attributes($node)
-    {
-        return current($node->attributes());
-    }
-
-    /**
-     * Validates an xml string against
-     * @param  string $xml     
-     * @param  string $xsdPath
-     * @return bool
-     */
-    public function validate($xsdPath, $xml = null)
-    {
-        $xml = $xml ?: $this->xml;
-
-        libxml_use_internal_errors(true);
-        $xmlDoc = new \DOMDocument(); 
-        $xmlDoc->loadXML($xml);
+			return false;
+		}
+
+		return $xmlDoc;    
+	}
+
+	/**
+	 * Get an array of attributes from an XML node
+	 * @param  SimpleXMLElement $node 
+	 * @return array
+	 */
+	public static function attributes($node)
+	{
+		return current($node->attributes());
+	}
+
+	/**
+	 * Validates an xml string against
+	 * @param  string $xml     
+	 * @param  string $xsdPath
+	 * @return bool
+	 */
+	public function validate($xsdPath, $xml = null)
+	{
+		$xml = $xml ?: $this->xml;
+
+		libxml_use_internal_errors(true);
+		$xmlDoc = new \DOMDocument(); 
+		$xmlDoc->loadXML($xml);
         
-        if (!$xmlDoc->schemaValidate($xsdPath)) {
+		if (!$xmlDoc->schemaValidate($xsdPath)) {
             
-            $this->errors = libxml_get_errors();
+			$this->errors = libxml_get_errors();
             
-            return false;
-        }
-
-        return true;
-    }
-
-    /**
-     * Validates an xml string against
-     * @param  bool $compact
-     * @return array
-     */
-    public function getErrors($compact = true)
-    {
-        $errors = [];
-
-        if (!$compact) {
-            $errors = $this->errors;
-        } else {
-
-            foreach ($this->errors as $error) {
-                $errors[] = $error->message;
-            }
-        }
-
-        return $errors;
-    }
-
-    /**
-     * Converts empty array nodes into empty strings to corredt the toArray() side effect
-     * 
-     * @param  array  &$array
-     */
-    public function filterEmptyArray(array &$array) 
-    {
-        foreach ($array as $key=>&$val) {
-            if (empty($val)) {
-                $array[$key] = "";
-            } else {
-                is_array($val) && $this->filterEmptyArray($val);
-            }
-        }
-    }
+			return false;
+		}
+
+		return true;
+	}
+
+	/**
+	 * Validates an xml string against
+	 * @param  bool $compact
+	 * @return array
+	 */
+	public function getErrors($compact = true)
+	{
+		$errors = [];
+
+		if (!$compact) {
+			$errors = $this->errors;
+		} else {
+
+			foreach ($this->errors as $error) {
+				$errors[] = $error->message;
+			}
+		}
+
+		return $errors;
+	}
+
+	/**
+	 * Converts empty array nodes into empty strings to corredt the toArray() side effect
+	 * 
+	 * @param  array  &$array
+	 */
+	public function filterEmptyArray(array &$array) 
+	{
+		foreach ($array as $key=>&$val) {
+			if (empty($val)) {
+				$array[$key] = "";
+			} else {
+				is_array($val) && $this->filterEmptyArray($val);
+			}
+		}
+	}
 }
\ No newline at end of file

Spacing +2 added lines, -2 removed lines

@@ -36,7 +36,7 @@ 
    	{    	
     	$xml = $xml ?: $this->xml;
         //$array = json_decode(str_replace('{"0":" "}','null', json_encode(simplexml_load_string($xml),JSON_NUMERIC_CHECK)), true);
-        $array = json_decode(str_replace('{"0":" "}','null', json_encode(simplexml_load_string($xml))), true);
+        $array = json_decode(str_replace('{"0":" "}', 'null', json_encode(simplexml_load_string($xml))), true);
         $this->filterEmptyArray($array);
 
         return $array;
@@ -53,7 +53,7 @@ 
      */
     public function replaceInNode($xml, $node, $find, $replace)
     {       
-        return preg_replace_callback('@(<' . $node . '>)' . $find . '(</' . $node . '>)@s', function ($matches) use ($replace) {
+        return preg_replace_callback('@(<' . $node . '>)' . $find . '(</' . $node . '>)@s', function($matches) use ($replace) {
             return str_replace(' ', $replace, $matches[0]);
         }, $xml);
     }

app/Console/Commands/CallRoute.php

Indentation +24 added lines, -24 removed lines

@@ -10,29 +10,29 @@
 
 class CallRoute extends Command {
 
-    protected $name = 'route:call';
-    protected $description = 'Call route from CLI';
-
-    public function __construct()
-    {
-        parent::__construct();
-    }
-
-    public function fire()
-    {
-        $request = Request::create((string)$this->option('uri'), 'GET');
-        $request->headers->set('X-Authorization', $this->option('token'));
-        $this->info(strip_tags(
-        	app()['Illuminate\Contracts\Http\Kernel']->handle($request)
-        ));
-    }
-
-    protected function getOptions()
-    {
-        return [
-            ['token', null, InputOption::VALUE_REQUIRED, 'The auth token', null],
-            ['uri', null, InputOption::VALUE_REQUIRED, 'The path of the route to be called', null],
-        ];
-    }
+	protected $name = 'route:call';
+	protected $description = 'Call route from CLI';
+
+	public function __construct()
+	{
+		parent::__construct();
+	}
+
+	public function fire()
+	{
+		$request = Request::create((string)$this->option('uri'), 'GET');
+		$request->headers->set('X-Authorization', $this->option('token'));
+		$this->info(strip_tags(
+			app()['Illuminate\Contracts\Http\Kernel']->handle($request)
+		));
+	}
+
+	protected function getOptions()
+	{
+		return [
+			['token', null, InputOption::VALUE_REQUIRED, 'The auth token', null],
+			['uri', null, InputOption::VALUE_REQUIRED, 'The path of the route to be called', null],
+		];
+	}
 
 }

Spacing +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
 
     public function fire()
     {
-        $request = Request::create((string)$this->option('uri'), 'GET');
+        $request = Request::create((string) $this->option('uri'), 'GET');
         $request->headers->set('X-Authorization', $this->option('token'));
         $this->info(strip_tags(
         	app()['Illuminate\Contracts\Http\Kernel']->handle($request)