ddimaria / Laravel-REST-CMS

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

Doc Comments +1 added lines, -1 removed lines

@@ -121,7 +121,7 @@
     /**
      * Returns a single item
      * 
-     * @param  object $object
+     * @param  \Illuminate\Database\Eloquent\Model $object
      * @return \Illuminate\Http\JsonResponse
      */
     public function showByObject($object)

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 +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 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();
-    }
-
-    /**
-     * 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/Page/PageDetailTransformer.php

Doc Comments +1 added lines, -1 removed lines

@@ -19,7 +19,7 @@
     /**
      * Include Template Detail
      *
-     * @return \League\Fractal\ItemResource
+     * @return \League\Fractal\Resource\Collection
      */
     public function includeTemplateDetail(PageDetail $pageDetail)
     {

Unused Use Statements -1 removed lines

@@ -1,6 +1,5 @@
 <?php namespace App\LaravelRestCms\Page;
 
-use App\LaravelRestCms\BaseModel;
 use App\LaravelRestCms\BaseTransformer;
 use App\LaravelRestCms\Page\PageDetail;
 use App\LaravelRestCms\Template\TemplateDetailTransformer;

Indentation +9 added lines, -9 removed lines

@@ -16,13 +16,13 @@
 		'template_detail'
 	];
 
-    /**
-     * Include Template Detail
-     *
-     * @return \League\Fractal\ItemResource
-     */
-    public function includeTemplateDetail(PageDetail $pageDetail)
-    {
-        return $this->collection($pageDetail->templateDetail, new TemplateDetailTransformer);
-    }
+	/**
+	 * Include Template Detail
+	 *
+	 * @return \League\Fractal\ItemResource
+	 */
+	public function includeTemplateDetail(PageDetail $pageDetail)
+	{
+		return $this->collection($pageDetail->templateDetail, new TemplateDetailTransformer);
+	}
 }
\ No newline at end of file

app/LaravelRestCms/Page/PageTransformer.php

Doc Comments +2 added lines, -2 removed lines

@@ -22,7 +22,7 @@ 
      * Include Page Detail
      * 
      * @param \App\LaravelRestCms\Page\Page
-     * @return \League\Fractal\ItemResource
+     * @return \League\Fractal\Resource\Collection
      */
     public function includeDetail(Page $page)
     {
@@ -33,7 +33,7 @@ 
      * Include Template
      *
      * @param \App\LaravelRestCms\Page\Page
-     * @return \League\Fractal\ItemResource
+     * @return \League\Fractal\Resource\Collection
      */
     public function includeTemplate(Page $page)
     {

Unused Use Statements -1 removed lines

@@ -1,6 +1,5 @@
 <?php namespace App\LaravelRestCms\Page;
 
-use App\LaravelRestCms\BaseModel;
 use App\LaravelRestCms\BaseTransformer;
 use App\LaravelRestCms\Page\Page;
 use App\LaravelRestCms\Page\PageDetailTransformer;

Indentation +20 added lines, -20 removed lines

@@ -18,25 +18,25 @@
 		'template',
 	];
 
-    /**
-     * Include Page Detail
-     * 
-     * @param \App\LaravelRestCms\Page\Page
-     * @return \League\Fractal\ItemResource
-     */
-    public function includeDetail(Page $page)
-    {
-        return $this->collection($page->detail, new PageDetailTransformer);
-    }
+	/**
+	 * Include Page Detail
+	 * 
+	 * @param \App\LaravelRestCms\Page\Page
+	 * @return \League\Fractal\ItemResource
+	 */
+	public function includeDetail(Page $page)
+	{
+		return $this->collection($page->detail, new PageDetailTransformer);
+	}
 
-    /**
-     * Include Template
-     *
-     * @param \App\LaravelRestCms\Page\Page
-     * @return \League\Fractal\ItemResource
-     */
-    public function includeTemplate(Page $page)
-    {
-        return $this->collection($page->template, new TemplateTransformer);
-    }
+	/**
+	 * Include Template
+	 *
+	 * @param \App\LaravelRestCms\Page\Page
+	 * @return \League\Fractal\ItemResource
+	 */
+	public function includeTemplate(Page $page)
+	{
+		return $this->collection($page->template, new TemplateTransformer);
+	}
 }
\ No newline at end of file

app/LaravelRestCms/Template/Template.php

Indentation +3 added lines, -3 removed lines

@@ -34,8 +34,8 @@
 	 * @return \Illuminate\Database\Eloquent\Relations\HasMany
 	 */
 	public function detail()
-    {
-        return $this->hasMany(TemplateDetail::class, 'template_id', 'id');
-    }
+	{
+		return $this->hasMany(TemplateDetail::class, 'template_id', 'id');
+	}
     
 }

app/LaravelRestCms/Page/PageDetail.php

Indentation +3 added lines, -3 removed lines

@@ -34,8 +34,8 @@
 	 * @return \Illuminate\Database\Eloquent\Relations\HasOne
 	 */
 	public function templateDetail()
-    {
-        return $this->hasMany(TemplateDetail::class, 'id', 'template_detail_id');
-    }
+	{
+		return $this->hasMany(TemplateDetail::class, 'id', 'template_detail_id');
+	}
 
 }

app/LaravelRestCms/Page/Page.php

Indentation +6 added lines, -6 removed lines

@@ -35,9 +35,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
@@ -45,8 +45,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/Library/Xml.php

Indentation +1 added lines, -1 removed lines

@@ -63,7 +63,7 @@
 	 * 
 	 * @param  string $xml 
 	 * @return \SimpleXMLElement
-     */
+	 */
 	public function toXml($xml, $namespace = null)
 	{       
 		$xml = $xml ?: $this->xml;