ddimaria / Laravel-REST-CMS

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

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/SearchTrait.php

Spacing +1 added lines, -1 removed lines

@@ -64,7 +64,7 @@
 	public function scopeSearch($query, $keyword = null) 
 	{        
 		$searchCols = $this->getSearchCols(null, static::$labelCol);
-		$query->select('*', implode(' ', static::$labelCol) .  ' as label', 'url');
+		$query->select('*', implode(' ', static::$labelCol) . ' as label', 'url');
 		$match = '';
 
 		// make search results use the "and" clause

app/Console/Commands/CallRoute.php

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)

app/Library/Sftp.php

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

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);
 	}