ddimaria / Laravel-REST-CMS

app/LaravelRestCms/Page/Page.php

Doc Comments +2 added lines, -2 removed lines

@@ -64,7 +64,7 @@ 
 	/**
 	 * Joins the templates table
 	 * 
-	 * @return \Illuminate\Database\Eloquent\Relations\hasOne
+	 * @return \Illuminate\Database\Eloquent\Relations\HasMany
 	 */
 	public function template()
     {
@@ -74,7 +74,7 @@ 
 	/**
 	 * Joins the pages table
 	 * 
-	 * @return \Illuminate\Database\Eloquent\Relations\hasOne
+	 * @return \Illuminate\Database\Eloquent\Relations\HasMany
 	 */
 	public function parent()
     {

Indentation +50 added lines, -50 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,9 +67,9 @@ 
 	 * @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');
+	}
 
 	/**
 	 * Joins the pages table
@@ -77,52 +77,52 @@ 
 	 * @return \Illuminate\Database\Eloquent\Relations\hasOne
 	 */
 	public function parent()
-    {
-        return $this->hasMany(Page::class, 'id', 'parent_id');
-    }
+	{
+		return $this->hasMany(Page::class, 'id', 'parent_id');
+	}
 
-    /**
-     * Returns a page and associated detail and template data
-     * 
-     * @param  string $slug
-     * @return array
-     */
-    public function showBySlug($slug)
-    {        
-        $data = Page::where(['url' => $slug])->with('template', 'detail.templateDetail')->firstOrFail();
+	/**
+	 * Returns a page and associated detail and template data
+	 * 
+	 * @param  string $slug
+	 * @return array
+	 */
+	public function showBySlug($slug)
+	{        
+		$data = Page::where(['url' => $slug])->with('template', 'detail.templateDetail')->firstOrFail();
         
-        return $this->packagePage($data);
-    }
+		return $this->packagePage($data);
+	}
 
-    /**
-     * Pacages a Page collection into an array for public consumption
-     * 
-     * @param  Page   $data 
-     * @return array
-     */
-    protected function packagePage(Page $data)
-    {
-    	$template = $data->template->first();
+	/**
+	 * Pacages a Page collection into an array for public consumption
+	 * 
+	 * @param  Page   $data 
+	 * @return array
+	 */
+	protected function packagePage(Page $data)
+	{
+		$template = $data->template->first();
     	
-    	$page = [
-        	'nav_name' => $data->nav_name,
-        	'url' => $data->url,
-        	'title' => $data->title,
-        	'vars' => [],
-        	'template' => [
-        		'name' => $template->name,
-	            'class' => $template->class,
-	            'method' => $template->method,
-	            'params' => $template->params,
-	            'template_name' => $template->template_name,
-	            'layout' => $template->layout,
-        	]
-        ];
+		$page = [
+			'nav_name' => $data->nav_name,
+			'url' => $data->url,
+			'title' => $data->title,
+			'vars' => [],
+			'template' => [
+				'name' => $template->name,
+				'class' => $template->class,
+				'method' => $template->method,
+				'params' => $template->params,
+				'template_name' => $template->template_name,
+				'layout' => $template->layout,
+			]
+		];
 
-        foreach ($data->detail as $detail) {
-        	$page['vars'][$detail->templateDetail->first()->var] = $detail->data;
-        }
+		foreach ($data->detail as $detail) {
+			$page['vars'][$detail->templateDetail->first()->var] = $detail->data;
+		}
 
-        return $page;
-    }
+		return $page;
+	}
 }

app/LaravelRestCms/Template/TemplateTransformer.php

Doc Comments +1 added lines, -2 removed lines

@@ -17,7 +17,6 @@ 
     /**
      * Transforms a Page model
      * 
-     * @param  \App\LaravelRestCms\BaseModel $page
      * @return array
      */
     public function transform(BaseModel $template)
@@ -37,7 +36,7 @@ 
      * Include Template Detail
      * 
      * @param \App\LaravelRestCms\Template\Template $template
-     * @return \League\Fractal\ItemResource
+     * @return \League\Fractal\Resource\Collection
      */
     public function includeDetail(Template $template)
     {

Indentation +28 added lines, -28 removed lines

@@ -14,33 +14,33 @@
 		'detail',
 	];
 
-    /**
-     * Transforms a Page model
-     * 
-     * @param  \App\LaravelRestCms\BaseModel $page
-     * @return array
-     */
-    public function transform(BaseModel $template)
-    {
-        return [
-            'id' => (int) $template->id,
-            'name' => $template->name,
-            'class' => $template->class,
-            'method' => $template->method,
-            'params' => $template->params,
-            'template_name' => $template->template_name,
-            'layout' => $template->layout,
-        ];
-    }  
+	/**
+	 * Transforms a Page model
+	 * 
+	 * @param  \App\LaravelRestCms\BaseModel $page
+	 * @return array
+	 */
+	public function transform(BaseModel $template)
+	{
+		return [
+			'id' => (int) $template->id,
+			'name' => $template->name,
+			'class' => $template->class,
+			'method' => $template->method,
+			'params' => $template->params,
+			'template_name' => $template->template_name,
+			'layout' => $template->layout,
+		];
+	}  
     
-    /**
-     * Include Template Detail
-     * 
-     * @param \App\LaravelRestCms\Template\Template $template
-     * @return \League\Fractal\ItemResource
-     */
-    public function includeDetail(Template $template)
-    {
-        return $this->collection($template->detail, new TemplateDetailTransformer);
-    }
+	/**
+	 * Include Template Detail
+	 * 
+	 * @param \App\LaravelRestCms\Template\Template $template
+	 * @return \League\Fractal\ItemResource
+	 */
+	public function includeDetail(Template $template)
+	{
+		return $this->collection($template->detail, new TemplateDetailTransformer);
+	}
 }

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

Indentation +31 added lines, -31 removed lines

@@ -39,40 +39,40 @@
 		],
 	];
 
-    /**
-     * Returns a page and associated detail and template data
-     * 
-     * @param  string $slug
-     * @return \Illuminate\Http\JsonResponse
-     */
-    public function showBySlug($slug)
-    {        
-        try {
-            return \Response::json($this->model->showBySlug($slug));
+	/**
+	 * Returns a page and associated detail and template data
+	 * 
+	 * @param  string $slug
+	 * @return \Illuminate\Http\JsonResponse
+	 */
+	public function showBySlug($slug)
+	{        
+		try {
+			return \Response::json($this->model->showBySlug($slug));
         
-        } catch (\Exception $e) {
+		} catch (\Exception $e) {
 
-            return $this->respondNotFound();
-        }
-    }
+			return $this->respondNotFound();
+		}
+	}
 
-    /**
-     * Returns a page and associated detail and template data
-     * 
-     * @param  mixed $id
-     * @return \Illuminate\Http\JsonResponse
-     */
-    public function showWithDetail($id)
-    {        
-        $this->manager->parseIncludes([
-        	'parent',
-        	'detail',
-        	'detail.template_detail',
-        	'template',
-        	//'detail.template_detail.parent',
-        ]);
+	/**
+	 * Returns a page and associated detail and template data
+	 * 
+	 * @param  mixed $id
+	 * @return \Illuminate\Http\JsonResponse
+	 */
+	public function showWithDetail($id)
+	{        
+		$this->manager->parseIncludes([
+			'parent',
+			'detail',
+			'detail.template_detail',
+			'template',
+			//'detail.template_detail.parent',
+		]);
 
-        return $this->show($id);
-    }
+		return $this->show($id);
+	}
 
 }
\ No newline at end of file