ddimaria / Laravel-REST-CMS

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

Unused Use Statements -3 removed lines

@@ -4,9 +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;
 

Indentation +166 added lines, -166 removed lines

@@ -14,182 +14,182 @@
 
 abstract class ApiController extends ApiGuardController implements ApiInterface
 {
-    /**
-     * 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 Eloquent Model
-     * 
-     * @var string
-     */
-    protected $modelName;
+	/**
+	 * The string name of the Eloquent 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();
-    }
-
-    /**
-     * Creates an item
-     *
-     * @param \Illuminate\Http\Request $data
-     * @return \Illuminate\Http\JsonResponse
-     */
-    public function create(Request $data = null)
-    {   
-        $data = $data ?: \Input::json();
-        $json = $data->all();
-        $json = $this->addAttribution($json);
-
-        try {
-            $this->model->validate($json);
-            $item = $this->model->create($json);
-            return $this->showByObject($item);
+		// parse includes
+		if (\Input::get('include') != '') {
+			$this->manager = new \League\Fractal\Manager;
+			$this->manager->parseIncludes(explode(',', \Input::get('include')));
+		}
+
+		parent::__construct();
+	}
+
+	/**
+	 * Creates an item
+	 *
+	 * @param \Illuminate\Http\Request $data
+	 * @return \Illuminate\Http\JsonResponse
+	 */
+	public function create(Request $data = null)
+	{   
+		$data = $data ?: \Input::json();
+		$json = $data->all();
+		$json = $this->addAttribution($json);
+
+		try {
+			$this->model->validate($json);
+			$item = $this->model->create($json);
+			return $this->showByObject($item);
         
-        } catch (ValidationException $e) {
-            return $this->response->setStatusCode(422)->withError($e->errors()->all(), 'GEN-UNPROCESSABLE-ENTITY');
-        } catch (MassAssignmentException $e) {
-            return $this->response->setStatusCode(422)->withError("Cannot mass assign " . $e->getMessage(), 'GEN-UNPROCESSABLE-ENTITY');
-        }  catch (\Exception $e) {
-            return $this->response->setStatusCode(422)->withError($e->getMessage(), 'GEN-UNPROCESSABLE-ENTITY');
-        }
-    }
-
-    /**
-     * Adds created_by and updated_by to the array if the model supports it
-     *
-     * @param array $data
-     * @return array $data
-     */
-    protected function addAttribution(array $data)
-    {   
-        if ($this->model->attirbution) {
-            $data['created_by'] = $this->apiKey->user_id;
-            $data['updated_by'] = $this->apiKey->user_id;
-        }
-
-        return $data;
-    }
-
-    /**
-     * 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()->all(), 'GEN-UNPROCESSABLE-ENTITY');
+		} catch (MassAssignmentException $e) {
+			return $this->response->setStatusCode(422)->withError("Cannot mass assign " . $e->getMessage(), 'GEN-UNPROCESSABLE-ENTITY');
+		}  catch (\Exception $e) {
+			return $this->response->setStatusCode(422)->withError($e->getMessage(), 'GEN-UNPROCESSABLE-ENTITY');
+		}
+	}
+
+	/**
+	 * Adds created_by and updated_by to the array if the model supports it
+	 *
+	 * @param array $data
+	 * @return array $data
+	 */
+	protected function addAttribution(array $data)
+	{   
+		if ($this->model->attirbution) {
+			$data['created_by'] = $this->apiKey->user_id;
+			$data['updated_by'] = $this->apiKey->user_id;
+		}
+
+		return $data;
+	}
+
+	/**
+	 * 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

Spacing +1 added lines, -1 removed lines

@@ -103,7 +103,7 @@
             return $this->response->setStatusCode(422)->withError($e->errors()->all(), 'GEN-UNPROCESSABLE-ENTITY');
         } catch (MassAssignmentException $e) {
             return $this->response->setStatusCode(422)->withError("Cannot mass assign " . $e->getMessage(), 'GEN-UNPROCESSABLE-ENTITY');
-        }  catch (\Exception $e) {
+        } catch (\Exception $e) {
             return $this->response->setStatusCode(422)->withError($e->getMessage(), 'GEN-UNPROCESSABLE-ENTITY');
         }
     }

Braces +1 added lines, -1 removed lines

@@ -103,7 +103,7 @@
             return $this->response->setStatusCode(422)->withError($e->errors()->all(), 'GEN-UNPROCESSABLE-ENTITY');
         } catch (MassAssignmentException $e) {
             return $this->response->setStatusCode(422)->withError("Cannot mass assign " . $e->getMessage(), 'GEN-UNPROCESSABLE-ENTITY');
-        }  catch (\Exception $e) {
+        } catch (\Exception $e) {
             return $this->response->setStatusCode(422)->withError($e->getMessage(), 'GEN-UNPROCESSABLE-ENTITY');
         }
     }

app/LaravelRestCms/BaseModel.php

Unused Use Statements -1 removed lines

@@ -5,7 +5,6 @@
 use Illuminate\Foundation\Validation\ValidatesRequests;
 use Illuminate\Support\MessageBag;
 use Illuminate\Support\Pluralizer;
-use Illuminate\Support\Singular;
 
 abstract class BaseModel extends Model {
 

Indentation +44 added lines, -44 removed lines

@@ -74,21 +74,21 @@ 
 	public $attirbution = false;
 
 	/**
-     * The "booting" method of the model.
-     *
-     * @return void
-     */
-    protected static function boot()
-    {
-        if (!is_null(static::$updateRules) && !is_null(static::$updateRulesConcat) && sizeof(static::$updateRulesConcat)) {
-	        static::$updateRules = static::$createRules + static::$updateRulesConcat; 
-	    }
-
-	    parent::boot();
-
-        static::savedEvent();
-        static::deletingEvent();
-    }	 
+	 * The "booting" method of the model.
+	 *
+	 * @return void
+	 */
+	protected static function boot()
+	{
+		if (!is_null(static::$updateRules) && !is_null(static::$updateRulesConcat) && sizeof(static::$updateRulesConcat)) {
+			static::$updateRules = static::$createRules + static::$updateRulesConcat; 
+		}
+
+		parent::boot();
+
+		static::savedEvent();
+		static::deletingEvent();
+	}	 
 	
 	/**
 	 * Gets the table name of the model.
@@ -101,35 +101,35 @@ 
 		return $this->table;
 	}
 
-    /**
-     * Hooks into the "saved" event
-     * 
-     * @return void
-     */
-    protected static function savedEvent()
-    {
-        static::saved(function($model)
-        {
-            static::addToCache($model);
-
-            return true;
-        });
-    }
-
-    /**
-     * Hooks into the "deleting" event
-     * 
-     * @return void
-     */
-    protected static function deletingEvent()
-    {
-        static::deleting(function($model)
-        {
-           static::removeFromCache($model);
-
-            return true;
-        });
-    }
+	/**
+	 * Hooks into the "saved" event
+	 * 
+	 * @return void
+	 */
+	protected static function savedEvent()
+	{
+		static::saved(function($model)
+		{
+			static::addToCache($model);
+
+			return true;
+		});
+	}
+
+	/**
+	 * Hooks into the "deleting" event
+	 * 
+	 * @return void
+	 */
+	protected static function deletingEvent()
+	{
+		static::deleting(function($model)
+		{
+		   static::removeFromCache($model);
+
+			return true;
+		});
+	}
 	
 	/**
 	 * Retrieves the singular name of the table

app/LaravelRestCms/Page/Page.php

Indentation +8 added lines, -8 removed lines

@@ -32,7 +32,7 @@ 
 	/**
 	 * Rules to validate when creating a model
 	 * 
-	* @var array
+	 * @var array
 	 */
 	protected static $createRules = [	
 		'parent_id' => 'integer',
@@ -47,7 +47,7 @@ 
 	/**
 	 * Indicates if the model should be attributed with created_by and updated_by
 	 * 
-	* @var bool
+	 * @var bool
 	 */
 	public $attirbution = true;
 
@@ -57,9 +57,9 @@ 
 	 * @return \Illuminate\Database\Eloquent\Relations\HasMany
 	 */
 	public function detail()
-    {
-        return $this->hasMany(PageDetail::class, 'page_id', 'id');
-    }
+	{
+		return $this->hasMany(PageDetail::class, 'page_id', 'id');
+	}
 
 	/**
 	 * Joins the templates table
@@ -67,8 +67,8 @@ 
 	 * @return \Illuminate\Database\Eloquent\Relations\hasOne
 	 */
 	public function template()
-    {
-        return $this->hasMany(Template::class, 'id', 'template_id');
-    }
+	{
+		return $this->hasMany(Template::class, 'id', 'template_id');
+	}
 
 }

app/LaravelRestCms/User/User.php

Indentation +1 added lines, -1 removed lines

@@ -30,7 +30,7 @@
 	/**
 	 * Rules to validate when creating a model
 	 * 
-	* @var array
+	 * @var array
 	 */
 	protected static $createRules = [	
 		'first_name' => 'required',