SherifElfadaly / Laravel-Api-Skeleton

src/Modules/Acl/Http/Controllers/PermissionsController.php

Indentation +6 added lines, -6 removed lines

@@ -7,10 +7,10 @@
 
 class PermissionsController extends BaseApiController
 {
-    /**
-     * The name of the model that is used by the base api controller 
-     * to preform actions like (add, edit ... etc).
-     * @var string
-     */
-    protected $model = 'permissions';
+	/**
+	 * The name of the model that is used by the base api controller 
+	 * to preform actions like (add, edit ... etc).
+	 * @var string
+	 */
+	protected $model = 'permissions';
 }

src/Modules/Core/Interfaces/RepositoryContainerInterface.php

Indentation +8 added lines, -8 removed lines

@@ -4,13 +4,13 @@
 {
 	/**
 	 * Construct the repository class name based on
-     * the method name called, search in the 
-     * given namespaces for the class and 
-     * return an instance.
-     * 
-     * @param  string $name the called method name
-     * @param  array  $arguments the method arguments
-     * @return object
-     */
+	 * the method name called, search in the 
+	 * given namespaces for the class and 
+	 * return an instance.
+	 * 
+	 * @param  string $name the called method name
+	 * @param  array  $arguments the method arguments
+	 * @return object
+	 */
 	public function __call($name, $arguments);
 }
\ No newline at end of file

src/Modules/Reporting/Database/Migrations/2016_01_19_112603_sampel_report.php

Indentation +5 added lines, -5 removed lines

@@ -22,15 +22,15 @@
 			");
 		
 		DB::table('reports')->insert(
-        	[
-	        	[
+			[
+				[
 				'report_name' => 'admin_count',
 				'view_name'   => 'admin_count',
 				'created_at'  => \DB::raw('NOW()'),
 				'updated_at'  => \DB::raw('NOW()')
-	        	]
-        	]
-        );
+				]
+			]
+		);
 	}
 
 	/**

src/Modules/Reporting/Database/Migrations/2016_01_19_112350_reports.php

Indentation +1 added lines, -1 removed lines

@@ -18,7 +18,7 @@
 			$table->string('view_name',100);
 			$table->softDeletes();
 			$table->timestamps();
-        });
+		});
 	}
 
 	/**

src/Modules/Core/AbstractRepositories/AbstractRepository.php

Doc Comments +8 added lines, -8 removed lines

@@ -32,7 +32,7 @@ 
      *
      * @param  array   $relations
      * @param  string  $sortBy
-     * @param  boolean $desc
+     * @param  integer $desc
      * @param  array   $columns
      * @return collection
      */
@@ -50,7 +50,7 @@ 
      * @param  integer $perPage
      * @param  array   $relations
      * @param  string  $sortBy
-     * @param  boolean $desc
+     * @param  integer $desc
      * @param  array   $columns
      * @return collection
      */
@@ -164,7 +164,7 @@ 
      * @param  integer $perPage
      * @param  array   $relations
      * @param  string  $sortBy
-     * @param  boolean $desc
+     * @param  integer $desc
      * @param  array   $columns
      * @return collection
      */
@@ -182,7 +182,7 @@ 
      * @param  integer $perPage
      * @param  array   $relations
      * @param  string  $sortBy
-     * @param  boolean $desc
+     * @param  integer $desc
      * @param  array   $columns
      * @return collection
      */
@@ -198,7 +198,7 @@ 
      * Save the given model to the storage.
      * 
      * @param  array   $data
-     * @return object
+     * @return boolean
      */
     public function save(array $data)
     {
@@ -516,7 +516,7 @@ 
      * id.
      * 
      * @param  integer $id
-     * @param  array   $relations
+     * @param  string[]   $relations
      * @param  array   $columns
      * @return object
      */
@@ -532,7 +532,7 @@ 
      * @param  array   $conditions array of conditions
      * @param  array   $relations
      * @param  string  $sortBy
-     * @param  boolean $desc
+     * @param  integer $desc
      * @param  array   $columns
      * @return collection
      */
@@ -564,7 +564,7 @@ 
      * @param  array   $conditions array of conditions
      * @param  integer $perPage
      * @param  string  $sortBy
-     * @param  boolean $desc
+     * @param  integer $desc
      * @param  array   $columns
      * @return collection
      */

Indentation +700 added lines, -700 removed lines

@@ -4,717 +4,717 @@
 
 abstract class AbstractRepository implements RepositoryInterface
 {
-    /**
-     * The model implementation.
-     * 
-     * @var object
-     */
-    public $model;
+	/**
+	 * The model implementation.
+	 * 
+	 * @var object
+	 */
+	public $model;
     
-    /**
-     * The config implementation.
-     * 
-     * @var array
-     */
-    protected $config;
+	/**
+	 * The config implementation.
+	 * 
+	 * @var array
+	 */
+	protected $config;
     
-    /**
-     * Create new AbstractRepository instance.
-     */
-    public function __construct()
-    {   
-        $this->config = \CoreConfig::getConfig();
-        $this->model  = \App::make($this->getModel());
-    }
-
-    /**
-     * Fetch all records with relations from the storage.
-     *
-     * @param  array   $relations
-     * @param  string  $sortBy
-     * @param  boolean $desc
-     * @param  array   $columns
-     * @return collection
-     */
-    public function all($relations = [], $sortBy = 'created_at', $desc = 1, $columns = array('*'))
-    {
-        $sort = $desc ? 'desc' : 'asc';
-        return call_user_func_array("{$this->getModel()}::with", array($relations))->orderBy($sortBy, $sort)->get($columns);
-    }
-
-    /**
-     * Fetch all records with relations from storage in pages 
-     * that matche the given query.
-     * 
-     * @param  string  $query
-     * @param  integer $perPage
-     * @param  array   $relations
-     * @param  string  $sortBy
-     * @param  boolean $desc
-     * @param  array   $columns
-     * @return collection
-     */
-    public function search($query, $perPage = 15, $relations = [], $sortBy = 'created_at', $desc = 1, $columns = array('*'))
-    {
-        $model            = call_user_func_array("{$this->getModel()}::with", array($relations));
-        $conditionColumns = $this->model->searchable;
-        $sort             = $desc ? 'desc' : 'asc';
-
-        /**
-         * Construct the select conditions for the model.
-         */
-        $model->where(function ($q) use ($query, $conditionColumns, $relations){
-
-            if (count($conditionColumns)) 
-            {
-                $column = 'LOWER(' . array_shift($conditionColumns) . ')';
-                if (str_contains($column, '->')) 
-                {
-                    $column = $this->wrapJsonSelector($column);
-                }
-
-                /**
-                 * Use the first element in the model columns to construct the first condition.
-                 */
-                $q->where(\DB::raw($column), 'LIKE', '%' . strtolower($query) . '%');
-            }
-
-            /**
-             * Loop through the rest of the columns to construct or where conditions.
-             */
-            foreach ($conditionColumns as $column) 
-            {
-                $column = 'LOWER(' . $column . ')';
-                if (str_contains($column, '->')) 
-                {
-                    $column = $this->wrapJsonSelector($column);
-                }
-
-                $q->orWhere(\DB::raw($column), 'LIKE', '%' . strtolower($query) . '%');
-            }
-
-            /**
-             * Loop through the model relations.
-             */
-            foreach ($relations as $relation) 
-            {
-                /**
-                 * Remove the sub relation if exists.
-                 */
-                $relation = explode('.', $relation)[0];
-
-                /**
-                 * Try to fetch the relation repository from the core.
-                 */
-                if (\Core::$relation()) 
-                {
-                    /**
-                     * Construct the relation condition.
-                     */
-                    $q->orWhereHas($relation, function ($subModel) use ($query, $relation){
-
-                        $subModel->where(function ($q) use ($query, $relation){
-
-                            /**
-                             * Get columns of the relation.
-                             */
-                            $subConditionColumns = \Core::$relation()->model->searchable;
-
-                            if (count($subConditionColumns)) 
-                            {
-
-                                $column = 'LOWER(' . array_shift($subConditionColumns) . ')';
-                                if (str_contains($column, '->')) 
-                                {
-                                    $column = $this->wrapJsonSelector($column);
-                                }
-
-                                /**
-                                * Use the first element in the relation model columns to construct the first condition.
-                                 */
-                                $q->where(\DB::raw($column), 'LIKE', '%' . strtolower($query) . '%');
-                            }
-
-                            /**
-                             * Loop through the rest of the columns to construct or where conditions.
-                             */
-                            foreach ($subConditionColumns as $subConditionColumn)
-                            {
-                                $column = 'LOWER(' . $subConditionColumn . ')';
-                                if (str_contains($column, '->')) 
-                                {
-                                    $column = $this->wrapJsonSelector($column);
-                                }
+	/**
+	 * Create new AbstractRepository instance.
+	 */
+	public function __construct()
+	{   
+		$this->config = \CoreConfig::getConfig();
+		$this->model  = \App::make($this->getModel());
+	}
+
+	/**
+	 * Fetch all records with relations from the storage.
+	 *
+	 * @param  array   $relations
+	 * @param  string  $sortBy
+	 * @param  boolean $desc
+	 * @param  array   $columns
+	 * @return collection
+	 */
+	public function all($relations = [], $sortBy = 'created_at', $desc = 1, $columns = array('*'))
+	{
+		$sort = $desc ? 'desc' : 'asc';
+		return call_user_func_array("{$this->getModel()}::with", array($relations))->orderBy($sortBy, $sort)->get($columns);
+	}
+
+	/**
+	 * Fetch all records with relations from storage in pages 
+	 * that matche the given query.
+	 * 
+	 * @param  string  $query
+	 * @param  integer $perPage
+	 * @param  array   $relations
+	 * @param  string  $sortBy
+	 * @param  boolean $desc
+	 * @param  array   $columns
+	 * @return collection
+	 */
+	public function search($query, $perPage = 15, $relations = [], $sortBy = 'created_at', $desc = 1, $columns = array('*'))
+	{
+		$model            = call_user_func_array("{$this->getModel()}::with", array($relations));
+		$conditionColumns = $this->model->searchable;
+		$sort             = $desc ? 'desc' : 'asc';
+
+		/**
+		 * Construct the select conditions for the model.
+		 */
+		$model->where(function ($q) use ($query, $conditionColumns, $relations){
+
+			if (count($conditionColumns)) 
+			{
+				$column = 'LOWER(' . array_shift($conditionColumns) . ')';
+				if (str_contains($column, '->')) 
+				{
+					$column = $this->wrapJsonSelector($column);
+				}
+
+				/**
+				 * Use the first element in the model columns to construct the first condition.
+				 */
+				$q->where(\DB::raw($column), 'LIKE', '%' . strtolower($query) . '%');
+			}
+
+			/**
+			 * Loop through the rest of the columns to construct or where conditions.
+			 */
+			foreach ($conditionColumns as $column) 
+			{
+				$column = 'LOWER(' . $column . ')';
+				if (str_contains($column, '->')) 
+				{
+					$column = $this->wrapJsonSelector($column);
+				}
+
+				$q->orWhere(\DB::raw($column), 'LIKE', '%' . strtolower($query) . '%');
+			}
+
+			/**
+			 * Loop through the model relations.
+			 */
+			foreach ($relations as $relation) 
+			{
+				/**
+				 * Remove the sub relation if exists.
+				 */
+				$relation = explode('.', $relation)[0];
+
+				/**
+				 * Try to fetch the relation repository from the core.
+				 */
+				if (\Core::$relation()) 
+				{
+					/**
+					 * Construct the relation condition.
+					 */
+					$q->orWhereHas($relation, function ($subModel) use ($query, $relation){
+
+						$subModel->where(function ($q) use ($query, $relation){
+
+							/**
+							 * Get columns of the relation.
+							 */
+							$subConditionColumns = \Core::$relation()->model->searchable;
+
+							if (count($subConditionColumns)) 
+							{
+
+								$column = 'LOWER(' . array_shift($subConditionColumns) . ')';
+								if (str_contains($column, '->')) 
+								{
+									$column = $this->wrapJsonSelector($column);
+								}
+
+								/**
+								 * Use the first element in the relation model columns to construct the first condition.
+								 */
+								$q->where(\DB::raw($column), 'LIKE', '%' . strtolower($query) . '%');
+							}
+
+							/**
+							 * Loop through the rest of the columns to construct or where conditions.
+							 */
+							foreach ($subConditionColumns as $subConditionColumn)
+							{
+								$column = 'LOWER(' . $subConditionColumn . ')';
+								if (str_contains($column, '->')) 
+								{
+									$column = $this->wrapJsonSelector($column);
+								}
                                 
-                                $q->orWhere(\DB::raw($column), 'LIKE', '%' . strtolower($query) . '%');
-                            } 
-                        });
-
-                    });
-                }
-            }
-        });
+								$q->orWhere(\DB::raw($column), 'LIKE', '%' . strtolower($query) . '%');
+							} 
+						});
+
+					});
+				}
+			}
+		});
         
-        return $model->orderBy($sortBy, $sort)->paginate($perPage, $columns);
-    }
+		return $model->orderBy($sortBy, $sort)->paginate($perPage, $columns);
+	}
     
-    /**
-     * Fetch all records with relations from storage in pages.
-     * 
-     * @param  integer $perPage
-     * @param  array   $relations
-     * @param  string  $sortBy
-     * @param  boolean $desc
-     * @param  array   $columns
-     * @return collection
-     */
-    public function paginate($perPage = 15, $relations = [], $sortBy = 'created_at', $desc = 1, $columns = array('*'))
-    {
-        $sort = $desc ? 'desc' : 'asc';
-        return call_user_func_array("{$this->getModel()}::with", array($relations))->orderBy($sortBy, $sort)->paginate($perPage, $columns);
-    }
-
-    /**
-     * Fetch all records with relations based on
-     * the given condition from storage in pages.
-     * 
-     * @param  array   $conditions array of conditions
-     * @param  integer $perPage
-     * @param  array   $relations
-     * @param  string  $sortBy
-     * @param  boolean $desc
-     * @param  array   $columns
-     * @return collection
-     */
-    public function paginateBy($conditions, $perPage = 15, $relations = [], $sortBy = 'created_at', $desc = 1, $columns = array('*'))
-    {
-        unset($conditions['page']);
-        $conditions = $this->constructConditions($conditions, $this->model);
-        $sort       = $desc ? 'desc' : 'asc';
-        return call_user_func_array("{$this->getModel()}::with", array($relations))->whereRaw($conditions['conditionString'], $conditions['conditionValues'])->orderBy($sortBy, $sort)->paginate($perPage, $columns);
-    }
+	/**
+	 * Fetch all records with relations from storage in pages.
+	 * 
+	 * @param  integer $perPage
+	 * @param  array   $relations
+	 * @param  string  $sortBy
+	 * @param  boolean $desc
+	 * @param  array   $columns
+	 * @return collection
+	 */
+	public function paginate($perPage = 15, $relations = [], $sortBy = 'created_at', $desc = 1, $columns = array('*'))
+	{
+		$sort = $desc ? 'desc' : 'asc';
+		return call_user_func_array("{$this->getModel()}::with", array($relations))->orderBy($sortBy, $sort)->paginate($perPage, $columns);
+	}
+
+	/**
+	 * Fetch all records with relations based on
+	 * the given condition from storage in pages.
+	 * 
+	 * @param  array   $conditions array of conditions
+	 * @param  integer $perPage
+	 * @param  array   $relations
+	 * @param  string  $sortBy
+	 * @param  boolean $desc
+	 * @param  array   $columns
+	 * @return collection
+	 */
+	public function paginateBy($conditions, $perPage = 15, $relations = [], $sortBy = 'created_at', $desc = 1, $columns = array('*'))
+	{
+		unset($conditions['page']);
+		$conditions = $this->constructConditions($conditions, $this->model);
+		$sort       = $desc ? 'desc' : 'asc';
+		return call_user_func_array("{$this->getModel()}::with", array($relations))->whereRaw($conditions['conditionString'], $conditions['conditionValues'])->orderBy($sortBy, $sort)->paginate($perPage, $columns);
+	}
     
-    /**
-     * Save the given model to the storage.
-     * 
-     * @param  array   $data
-     * @return object
-     */
-    public function save(array $data)
-    {
-        \Session::put('locale', 'all');
-        $model      = false;
-        $modelClass = $this->model;
-        $relations  = [];
-
-        \DB::transaction(function () use (&$model, &$relations, $data, $modelClass) {
-            /**
-             * If the id is present in the data then select the model for updating,
-             * else create new model.
-             * @var array
-             */
-            $model = array_key_exists('id', $data) ? $modelClass->lockForUpdate()->find($data['id']) : new $modelClass;
-            if ( ! $model) 
-            {
-                \ErrorHandler::notFound(class_basename($modelClass) . ' with id : ' . $data['id']);
-            }
-
-            /**
-             * Construct the model object with the given data,
-             * and if there is a relation add it to relations array,
-             * then save the model.
-             */
-            foreach ($data as $key => $value) 
-            {
-                /**
-                 * If the attribute is a relation.
-                 */
-                $relation = camel_case($key);
-                if (method_exists($model, $relation) && \Core::$relation())
-                {
-                    /**
-                     * Check if the relation is a collection.
-                     */
-                    if (class_basename($model->$relation) == 'Collection') 
-                    {   
-                        /**
-                         * If the relation has no value then marke the relation data 
-                         * related to the model to be deleted.
-                         */
-                        if ( ! $value || ! count($value)) 
-                        {
-                            $relations[$relation] = 'delete';
-                        }   
-                    }
-                    if (is_array($value)) 
-                    {
-                        /**
-                         * Loop through the relation data.
-                         */
-                        foreach ($value as $attr => $val) 
-                        {
-                            /**
-                             * Get the relation model.
-                             */
-                            $relationBaseModel = \Core::$relation()->model;
-
-                            /**
-                             * Check if the relation is a collection.
-                             */
-                            if (class_basename($model->$relation) == 'Collection')
-                            {
-                                /**
-                                 * If the id is present in the data then select the relation model for updating,
-                                 * else create new model.
-                                 */
-                                $relationModel = array_key_exists('id', $val) ? $relationBaseModel->lockForUpdate()->find($val['id']) : new $relationBaseModel;
-
-                                /**
-                                 * If model doesn't exists.
-                                 */
-                                if ( ! $relationModel) 
-                                {
-                                    \ErrorHandler::notFound(class_basename($relationBaseModel) . ' with id : ' . $val['id']);
-                                }
-
-                                /**
-                                 * Loop through the relation attributes.
-                                 */
-                                foreach ($val as $attr => $val) 
-                                {
-                                    /**
-                                     * Prevent the sub relations or attributes not in the fillable.
-                                     */
-                                    if (gettype($val) !== 'object' && gettype($val) !== 'array' &&  array_search($attr, $relationModel->getFillable(), true) !== false)
-                                    {
-                                        $relationModel->$attr = $val;
-                                    }
-                                }
-
-                                $relations[$relation][] = $relationModel;
-                            }
-                            /**
-                             * If not collection.
-                             */
-                            else
-                            {
-                                /**
-                                 * Prevent the sub relations.
-                                 */
-                                if (gettype($val) !== 'object' && gettype($val) !== 'array') 
-                                {
-
-                                    /**
-                                     * If the id is present in the data then select the relation model for updating,
-                                     * else create new model.
-                                     */
-                                    $relationModel = array_key_exists('id', $value) ? $relationBaseModel->lockForUpdate()->find($value['id']) : new $relationBaseModel;
-
-                                    /**
-                                     * If model doesn't exists.
-                                     */
-                                    if ( ! $relationModel) 
-                                    {
-                                        \ErrorHandler::notFound(class_basename($relationBaseModel) . ' with id : ' . $value['id']);
-                                    }
-
-                                    foreach ($value as $relationAttribute => $relationValue) 
-                                    {
-                                        /**
-                                         * Prevent attributes not in the fillable.
-                                         */
-                                        if (array_search($relationAttribute, $relationModel->getFillable(), true) !== false) 
-                                        {
-                                            $relationModel->$relationAttribute = $relationValue;
-                                        }
-                                    }
-
-                                    $relations[$relation] = $relationModel;
-                                }
-                            }
-                        }
-                    }
-                }
-                /**
-                 * If the attribute isn't a relation and prevent attributes not in the fillable.
-                 */
-                else if (array_search($key, $model->getFillable(), true) !== false)
-                {
-                    $model->$key = $value;   
-                }
-            }
-
-            /**
-             * Loop through the relations array.
-             */
-            foreach ($relations as $key => $value) 
-            {
-                /**
-                 * If the relation is marked for delete then delete it.
-                 */
-                if ($value == 'delete' && $model->$key()->count())
-                {
-                    $model->$key()->delete();
-                }
-                /**
-                 * If the relation is an array.
-                 */
-                else if (gettype($value) == 'array') 
-                {
-                    /**
-                     * Save the model.
-                     */
-                    $model->save();
-                    $ids = [];
-
-                    /**
-                     * Loop through the relations.
-                     */
-                    foreach ($value as $val) 
-                    {
-                        switch (class_basename($model->$key())) 
-                        {
-                            /**
-                             * If the relation is one to many then update it's foreign key with
-                             * the model id and save it then add its id to ids array to delete all 
-                             * relations who's id isn't in the ids array.
-                             */
-                            case 'HasMany':
-                                $foreignKeyName       = $model->$key()->getForeignKeyName();
-                                $val->$foreignKeyName = $model->id;
-                                $val->save();
-                                $ids[] = $val->id;
-                                break;
-
-                            /**
-                             * If the relation is many to many then add it's id to the ids array to
-                             * attache these ids to the model.
-                             */
-                            case 'BelongsToMany':
-                                $val->save();
-                                $ids[] = $val->id;
-                                break;
-                        }
-                    }
-                    switch (class_basename($model->$key())) 
-                    {
-                        /**
-                         * If the relation is one to many then delete all 
-                         * relations who's id isn't in the ids array.
-                         */
-                        case 'HasMany':
-                            $model->$key()->whereNotIn('id', $ids)->delete();
-                            break;
-
-                        /**
-                         * If the relation is many to many then 
-                         * detach the previous data and attach 
-                         * the ids array to the model.
-                         */
-                        case 'BelongsToMany':
-                            $model->$key()->detach();
-                            $model->$key()->attach($ids);
-                            break;
-                    }
-                }
-                /**
-                 * If the relation isn't array.
-                 */
-                else
-                {
-                    switch (class_basename($model->$key())) 
-                    {
-                        /**
-                         * If the relation is one to one.
-                         */
-                        case 'HasOne':
-                            /**
-                             * Save the model.
-                             */
-                            $model->save();
-                            $foreignKeyName         = $model->$key()->getForeignKeyName();
-                            $value->$foreignKeyName = $model->id;
-                            $value->save();
-                            break;
-                        case 'BelongsTo':
-                            /**
-                             * Save the model.
-                             */
-                            $value->save();
-                            $model->$key()->associate($value);
-                            break;
-                    }
-                }
-            }
-
-            /**
-             * Save the model.
-             */
-            $model->save();
-        });
+	/**
+	 * Save the given model to the storage.
+	 * 
+	 * @param  array   $data
+	 * @return object
+	 */
+	public function save(array $data)
+	{
+		\Session::put('locale', 'all');
+		$model      = false;
+		$modelClass = $this->model;
+		$relations  = [];
+
+		\DB::transaction(function () use (&$model, &$relations, $data, $modelClass) {
+			/**
+			 * If the id is present in the data then select the model for updating,
+			 * else create new model.
+			 * @var array
+			 */
+			$model = array_key_exists('id', $data) ? $modelClass->lockForUpdate()->find($data['id']) : new $modelClass;
+			if ( ! $model) 
+			{
+				\ErrorHandler::notFound(class_basename($modelClass) . ' with id : ' . $data['id']);
+			}
+
+			/**
+			 * Construct the model object with the given data,
+			 * and if there is a relation add it to relations array,
+			 * then save the model.
+			 */
+			foreach ($data as $key => $value) 
+			{
+				/**
+				 * If the attribute is a relation.
+				 */
+				$relation = camel_case($key);
+				if (method_exists($model, $relation) && \Core::$relation())
+				{
+					/**
+					 * Check if the relation is a collection.
+					 */
+					if (class_basename($model->$relation) == 'Collection') 
+					{   
+						/**
+						 * If the relation has no value then marke the relation data 
+						 * related to the model to be deleted.
+						 */
+						if ( ! $value || ! count($value)) 
+						{
+							$relations[$relation] = 'delete';
+						}   
+					}
+					if (is_array($value)) 
+					{
+						/**
+						 * Loop through the relation data.
+						 */
+						foreach ($value as $attr => $val) 
+						{
+							/**
+							 * Get the relation model.
+							 */
+							$relationBaseModel = \Core::$relation()->model;
+
+							/**
+							 * Check if the relation is a collection.
+							 */
+							if (class_basename($model->$relation) == 'Collection')
+							{
+								/**
+								 * If the id is present in the data then select the relation model for updating,
+								 * else create new model.
+								 */
+								$relationModel = array_key_exists('id', $val) ? $relationBaseModel->lockForUpdate()->find($val['id']) : new $relationBaseModel;
+
+								/**
+								 * If model doesn't exists.
+								 */
+								if ( ! $relationModel) 
+								{
+									\ErrorHandler::notFound(class_basename($relationBaseModel) . ' with id : ' . $val['id']);
+								}
+
+								/**
+								 * Loop through the relation attributes.
+								 */
+								foreach ($val as $attr => $val) 
+								{
+									/**
+									 * Prevent the sub relations or attributes not in the fillable.
+									 */
+									if (gettype($val) !== 'object' && gettype($val) !== 'array' &&  array_search($attr, $relationModel->getFillable(), true) !== false)
+									{
+										$relationModel->$attr = $val;
+									}
+								}
+
+								$relations[$relation][] = $relationModel;
+							}
+							/**
+							 * If not collection.
+							 */
+							else
+							{
+								/**
+								 * Prevent the sub relations.
+								 */
+								if (gettype($val) !== 'object' && gettype($val) !== 'array') 
+								{
+
+									/**
+									 * If the id is present in the data then select the relation model for updating,
+									 * else create new model.
+									 */
+									$relationModel = array_key_exists('id', $value) ? $relationBaseModel->lockForUpdate()->find($value['id']) : new $relationBaseModel;
+
+									/**
+									 * If model doesn't exists.
+									 */
+									if ( ! $relationModel) 
+									{
+										\ErrorHandler::notFound(class_basename($relationBaseModel) . ' with id : ' . $value['id']);
+									}
+
+									foreach ($value as $relationAttribute => $relationValue) 
+									{
+										/**
+										 * Prevent attributes not in the fillable.
+										 */
+										if (array_search($relationAttribute, $relationModel->getFillable(), true) !== false) 
+										{
+											$relationModel->$relationAttribute = $relationValue;
+										}
+									}
+
+									$relations[$relation] = $relationModel;
+								}
+							}
+						}
+					}
+				}
+				/**
+				 * If the attribute isn't a relation and prevent attributes not in the fillable.
+				 */
+				else if (array_search($key, $model->getFillable(), true) !== false)
+				{
+					$model->$key = $value;   
+				}
+			}
+
+			/**
+			 * Loop through the relations array.
+			 */
+			foreach ($relations as $key => $value) 
+			{
+				/**
+				 * If the relation is marked for delete then delete it.
+				 */
+				if ($value == 'delete' && $model->$key()->count())
+				{
+					$model->$key()->delete();
+				}
+				/**
+				 * If the relation is an array.
+				 */
+				else if (gettype($value) == 'array') 
+				{
+					/**
+					 * Save the model.
+					 */
+					$model->save();
+					$ids = [];
+
+					/**
+					 * Loop through the relations.
+					 */
+					foreach ($value as $val) 
+					{
+						switch (class_basename($model->$key())) 
+						{
+							/**
+							 * If the relation is one to many then update it's foreign key with
+							 * the model id and save it then add its id to ids array to delete all 
+							 * relations who's id isn't in the ids array.
+							 */
+							case 'HasMany':
+								$foreignKeyName       = $model->$key()->getForeignKeyName();
+								$val->$foreignKeyName = $model->id;
+								$val->save();
+								$ids[] = $val->id;
+								break;
+
+							/**
+							 * If the relation is many to many then add it's id to the ids array to
+							 * attache these ids to the model.
+							 */
+							case 'BelongsToMany':
+								$val->save();
+								$ids[] = $val->id;
+								break;
+						}
+					}
+					switch (class_basename($model->$key())) 
+					{
+						/**
+						 * If the relation is one to many then delete all 
+						 * relations who's id isn't in the ids array.
+						 */
+						case 'HasMany':
+							$model->$key()->whereNotIn('id', $ids)->delete();
+							break;
+
+						/**
+						 * If the relation is many to many then 
+						 * detach the previous data and attach 
+						 * the ids array to the model.
+						 */
+						case 'BelongsToMany':
+							$model->$key()->detach();
+							$model->$key()->attach($ids);
+							break;
+					}
+				}
+				/**
+				 * If the relation isn't array.
+				 */
+				else
+				{
+					switch (class_basename($model->$key())) 
+					{
+						/**
+						 * If the relation is one to one.
+						 */
+						case 'HasOne':
+							/**
+							 * Save the model.
+							 */
+							$model->save();
+							$foreignKeyName         = $model->$key()->getForeignKeyName();
+							$value->$foreignKeyName = $model->id;
+							$value->save();
+							break;
+						case 'BelongsTo':
+							/**
+							 * Save the model.
+							 */
+							$value->save();
+							$model->$key()->associate($value);
+							break;
+					}
+				}
+			}
+
+			/**
+			 * Save the model.
+			 */
+			$model->save();
+		});
             
-        return $model;
-    }
+		return $model;
+	}
     
-    /**
-     * Update record in the storage based on the given
-     * condition.
-     * 
-     * @param  var $value condition value
-     * @param  array $data
-     * @param  string $attribute condition column name
-     * @return void
-     */
-    public function update($value, array $data, $attribute = 'id')
-    {
-        if ($attribute == 'id') 
-        {
-            $model = $this->model->lockForUpdate()->find($value);
-            $model ? $model->update($data) : 0;
-        }
-        else
-        {
-            call_user_func_array("{$this->getModel()}::where", array($attribute, '=', $value))->lockForUpdate()->get()->each(function ($model) use ($data){
-                $model->update($data);
-            });
-        }
-    }
-
-    /**
-     * Delete record from the storage based on the given
-     * condition.
-     * 
-     * @param  var $value condition value
-     * @param  string $attribute condition column name
-     * @return void
-     */
-    public function delete($value, $attribute = 'id')
-    {
-        if ($attribute == 'id') 
-        {
-            \DB::transaction(function () use ($value, $attribute, &$result) {
-                $model = $this->model->lockForUpdate()->find($value);
-                if ( ! $model) 
-                {
-                    \ErrorHandler::notFound(class_basename($this->model) . ' with id : ' . $value);
-                }
+	/**
+	 * Update record in the storage based on the given
+	 * condition.
+	 * 
+	 * @param  var $value condition value
+	 * @param  array $data
+	 * @param  string $attribute condition column name
+	 * @return void
+	 */
+	public function update($value, array $data, $attribute = 'id')
+	{
+		if ($attribute == 'id') 
+		{
+			$model = $this->model->lockForUpdate()->find($value);
+			$model ? $model->update($data) : 0;
+		}
+		else
+		{
+			call_user_func_array("{$this->getModel()}::where", array($attribute, '=', $value))->lockForUpdate()->get()->each(function ($model) use ($data){
+				$model->update($data);
+			});
+		}
+	}
+
+	/**
+	 * Delete record from the storage based on the given
+	 * condition.
+	 * 
+	 * @param  var $value condition value
+	 * @param  string $attribute condition column name
+	 * @return void
+	 */
+	public function delete($value, $attribute = 'id')
+	{
+		if ($attribute == 'id') 
+		{
+			\DB::transaction(function () use ($value, $attribute, &$result) {
+				$model = $this->model->lockForUpdate()->find($value);
+				if ( ! $model) 
+				{
+					\ErrorHandler::notFound(class_basename($this->model) . ' with id : ' . $value);
+				}
                 
-                $model->delete();
-            });
-        }
-        else
-        {
-            \DB::transaction(function () use ($value, $attribute, &$result) {
-                call_user_func_array("{$this->getModel()}::where", array($attribute, '=', $value))->lockForUpdate()->get()->each(function ($model){
-                    $model->delete();
-                });
-            });   
-        }
-    }
+				$model->delete();
+			});
+		}
+		else
+		{
+			\DB::transaction(function () use ($value, $attribute, &$result) {
+				call_user_func_array("{$this->getModel()}::where", array($attribute, '=', $value))->lockForUpdate()->get()->each(function ($model){
+					$model->delete();
+				});
+			});   
+		}
+	}
     
-    /**
-     * Fetch records from the storage based on the given
-     * id.
-     * 
-     * @param  integer $id
-     * @param  array   $relations
-     * @param  array   $columns
-     * @return object
-     */
-    public function find($id, $relations = [], $columns = array('*'))
-    {
-        return call_user_func_array("{$this->getModel()}::with", array($relations))->find($id, $columns);
-    }
+	/**
+	 * Fetch records from the storage based on the given
+	 * id.
+	 * 
+	 * @param  integer $id
+	 * @param  array   $relations
+	 * @param  array   $columns
+	 * @return object
+	 */
+	public function find($id, $relations = [], $columns = array('*'))
+	{
+		return call_user_func_array("{$this->getModel()}::with", array($relations))->find($id, $columns);
+	}
     
-    /**
-     * Fetch records from the storage based on the given
-     * condition.
-     * 
-     * @param  array   $conditions array of conditions
-     * @param  array   $relations
-     * @param  string  $sortBy
-     * @param  boolean $desc
-     * @param  array   $columns
-     * @return collection
-     */
-    public function findBy($conditions, $relations = [], $sortBy = 'created_at', $desc = 1, $columns = array('*'))
-    {
-        $conditions = $this->constructConditions($conditions, $this->model);
-        $sort       = $desc ? 'desc' : 'asc';
-        return call_user_func_array("{$this->getModel()}::with",  array($relations))->whereRaw($conditions['conditionString'], $conditions['conditionValues'])->orderBy($sortBy, $sort)->get($columns);
-    }
-
-    /**
-     * Fetch the first record from the storage based on the given
-     * condition.
-     *
-     * @param  array   $conditions array of conditions
-     * @param  array   $relations
-     * @param  array   $columns
-     * @return object
-     */
-    public function first($conditions, $relations = [], $columns = array('*'))
-    {
-        $conditions = $this->constructConditions($conditions, $this->model);
-        return call_user_func_array("{$this->getModel()}::with", array($relations))->whereRaw($conditions['conditionString'], $conditions['conditionValues'])->first($columns);  
-    }
-
-    /**
-     * Return the deleted models in pages based on the given conditions.
-     * 
-     * @param  array   $conditions array of conditions
-     * @param  integer $perPage
-     * @param  string  $sortBy
-     * @param  boolean $desc
-     * @param  array   $columns
-     * @return collection
-     */
-    public function deleted($conditions, $perPage = 15, $sortBy = 'created_at', $desc = 1, $columns = array('*'))
-    {
-        unset($conditions['page']);
-        $conditions = $this->constructConditions($conditions, $this->model);
-        $sort       = $desc ? 'desc' : 'asc';
-        $model      = $this->model->onlyTrashed();
-
-        if (count($conditions['conditionValues']))
-        {
-            $model->whereRaw($conditions['conditionString'], $conditions['conditionValues']);
-        }
-
-        return $model->orderBy($sortBy, $sort)->paginate($perPage, $columns);;
-    }
-
-    /**
-     * Restore the deleted model.
-     * 
-     * @param  integer $id
-     * @return void
-     */
-    public function restore($id)
-    {
-        $model = $this->model->onlyTrashed()->find($id);
-
-        if ( ! $model) 
-        {
-            \ErrorHandler::notFound(class_basename($this->model) . ' with id : ' . $id);
-        }
-
-        $model->restore();
-    }
-
-    /**
-     * Build the conditions recursively for the retrieving methods.
-     * @param  array $conditions
-     * @return array
-     */
-    protected function constructConditions($conditions, $model)
-    {   
-        $conditionString = '';
-        $conditionValues = [];
-        foreach ($conditions as $key => $value) 
-        {
-            if (str_contains($key, '->')) 
-            {
-                $key = $this->wrapJsonSelector($key);
-            }
-
-            if ($key == 'and') 
-            {
-                $conditions       = $this->constructConditions($value, $model);
-                $conditionString .= str_replace('{op}', 'and', $conditions['conditionString']) . ' {op} ';
-                $conditionValues  = array_merge($conditionValues, $conditions['conditionValues']);
-            }
-            else if ($key == 'or')
-            {
-                $conditions       = $this->constructConditions($value, $model);
-                $conditionString .= str_replace('{op}', 'or', $conditions['conditionString']) . ' {op} ';
-                $conditionValues  = array_merge($conditionValues, $conditions['conditionValues']);
-            }
-            else
-            {
-                if (is_array($value)) 
-                {
-                    $operator = $value['op'];
-                    if (strtolower($operator) == 'between') 
-                    {
-                        $value1 = $value['val1'];
-                        $value2 = $value['val2'];
-                    }
-                    else
-                    {
-                        $value = array_key_exists('val', $value) ? $value['val'] : '';
-                    }
-                }
-                else
-                {
-                    $operator = '=';
-                }
+	/**
+	 * Fetch records from the storage based on the given
+	 * condition.
+	 * 
+	 * @param  array   $conditions array of conditions
+	 * @param  array   $relations
+	 * @param  string  $sortBy
+	 * @param  boolean $desc
+	 * @param  array   $columns
+	 * @return collection
+	 */
+	public function findBy($conditions, $relations = [], $sortBy = 'created_at', $desc = 1, $columns = array('*'))
+	{
+		$conditions = $this->constructConditions($conditions, $this->model);
+		$sort       = $desc ? 'desc' : 'asc';
+		return call_user_func_array("{$this->getModel()}::with",  array($relations))->whereRaw($conditions['conditionString'], $conditions['conditionValues'])->orderBy($sortBy, $sort)->get($columns);
+	}
+
+	/**
+	 * Fetch the first record from the storage based on the given
+	 * condition.
+	 *
+	 * @param  array   $conditions array of conditions
+	 * @param  array   $relations
+	 * @param  array   $columns
+	 * @return object
+	 */
+	public function first($conditions, $relations = [], $columns = array('*'))
+	{
+		$conditions = $this->constructConditions($conditions, $this->model);
+		return call_user_func_array("{$this->getModel()}::with", array($relations))->whereRaw($conditions['conditionString'], $conditions['conditionValues'])->first($columns);  
+	}
+
+	/**
+	 * Return the deleted models in pages based on the given conditions.
+	 * 
+	 * @param  array   $conditions array of conditions
+	 * @param  integer $perPage
+	 * @param  string  $sortBy
+	 * @param  boolean $desc
+	 * @param  array   $columns
+	 * @return collection
+	 */
+	public function deleted($conditions, $perPage = 15, $sortBy = 'created_at', $desc = 1, $columns = array('*'))
+	{
+		unset($conditions['page']);
+		$conditions = $this->constructConditions($conditions, $this->model);
+		$sort       = $desc ? 'desc' : 'asc';
+		$model      = $this->model->onlyTrashed();
+
+		if (count($conditions['conditionValues']))
+		{
+			$model->whereRaw($conditions['conditionString'], $conditions['conditionValues']);
+		}
+
+		return $model->orderBy($sortBy, $sort)->paginate($perPage, $columns);;
+	}
+
+	/**
+	 * Restore the deleted model.
+	 * 
+	 * @param  integer $id
+	 * @return void
+	 */
+	public function restore($id)
+	{
+		$model = $this->model->onlyTrashed()->find($id);
+
+		if ( ! $model) 
+		{
+			\ErrorHandler::notFound(class_basename($this->model) . ' with id : ' . $id);
+		}
+
+		$model->restore();
+	}
+
+	/**
+	 * Build the conditions recursively for the retrieving methods.
+	 * @param  array $conditions
+	 * @return array
+	 */
+	protected function constructConditions($conditions, $model)
+	{   
+		$conditionString = '';
+		$conditionValues = [];
+		foreach ($conditions as $key => $value) 
+		{
+			if (str_contains($key, '->')) 
+			{
+				$key = $this->wrapJsonSelector($key);
+			}
+
+			if ($key == 'and') 
+			{
+				$conditions       = $this->constructConditions($value, $model);
+				$conditionString .= str_replace('{op}', 'and', $conditions['conditionString']) . ' {op} ';
+				$conditionValues  = array_merge($conditionValues, $conditions['conditionValues']);
+			}
+			else if ($key == 'or')
+			{
+				$conditions       = $this->constructConditions($value, $model);
+				$conditionString .= str_replace('{op}', 'or', $conditions['conditionString']) . ' {op} ';
+				$conditionValues  = array_merge($conditionValues, $conditions['conditionValues']);
+			}
+			else
+			{
+				if (is_array($value)) 
+				{
+					$operator = $value['op'];
+					if (strtolower($operator) == 'between') 
+					{
+						$value1 = $value['val1'];
+						$value2 = $value['val2'];
+					}
+					else
+					{
+						$value = array_key_exists('val', $value) ? $value['val'] : '';
+					}
+				}
+				else
+				{
+					$operator = '=';
+				}
                 
-                if (strtolower($operator) == 'between') 
-                {
-                    $conditionString  .= $key . ' >= ? and ';
-                    $conditionValues[] = $value1;
-
-                    $conditionString  .= $key . ' <= ? {op} ';
-                    $conditionValues[] = $value2;
-                }
-                elseif (strtolower($operator) == 'in') 
-                {
-                    $conditionValues  = array_merge($conditionValues, $value);
-                    $inBindingsString = rtrim(str_repeat('?,', count($value)), ',');
-                    $conditionString .= $key . ' in (' . rtrim($inBindingsString, ',') . ') {op} ';
-                }
-                elseif (strtolower($operator) == 'null') 
-                {
-                    $conditionString .= $key . ' is null {op} ';
-                }
-                elseif (strtolower($operator) == 'not null') 
-                {
-                    $conditionString .= $key . ' is not null {op} ';
-                }
-                elseif (strtolower($operator) == 'has') 
-                {
-                    $sql              = $model->withTrashed()->has($key)->toSql();
-                    $conditions       = $this->constructConditions($value, $model->$key()->getRelated());
-                    $conditionString .= rtrim(substr($sql, strpos($sql, 'exists')), ')') . ' and ' . $conditions['conditionString'] . ') {op} ';
-                    $conditionValues  = array_merge($conditionValues, $conditions['conditionValues']);
-                }
-                else
-                {
-                    $conditionString  .= $key . ' ' . $operator . ' ? {op} ';
-                    $conditionValues[] = $value;
-                }
-            }
-        }
-        $conditionString = '(' . rtrim($conditionString, '{op} ') . ')';
-        return ['conditionString' => $conditionString, 'conditionValues' => $conditionValues];
-    }
-
-    /**
-     * Wrap the given JSON selector.
-     *
-     * @param  string  $value
-     * @return string
-     */
-    protected function wrapJsonSelector($value)
-    {
-        $removeLast = strpos($value, ')');
-        $value      = $removeLast === false ? $value : substr($value, 0, $removeLast);
-        $path       = explode('->', $value);
-        $field      = array_shift($path);
-        $result     = sprintf('%s->\'$.%s\'', $field, collect($path)->map(function ($part) {
-            return '"'.$part.'"';
-        })->implode('.'));
+				if (strtolower($operator) == 'between') 
+				{
+					$conditionString  .= $key . ' >= ? and ';
+					$conditionValues[] = $value1;
+
+					$conditionString  .= $key . ' <= ? {op} ';
+					$conditionValues[] = $value2;
+				}
+				elseif (strtolower($operator) == 'in') 
+				{
+					$conditionValues  = array_merge($conditionValues, $value);
+					$inBindingsString = rtrim(str_repeat('?,', count($value)), ',');
+					$conditionString .= $key . ' in (' . rtrim($inBindingsString, ',') . ') {op} ';
+				}
+				elseif (strtolower($operator) == 'null') 
+				{
+					$conditionString .= $key . ' is null {op} ';
+				}
+				elseif (strtolower($operator) == 'not null') 
+				{
+					$conditionString .= $key . ' is not null {op} ';
+				}
+				elseif (strtolower($operator) == 'has') 
+				{
+					$sql              = $model->withTrashed()->has($key)->toSql();
+					$conditions       = $this->constructConditions($value, $model->$key()->getRelated());
+					$conditionString .= rtrim(substr($sql, strpos($sql, 'exists')), ')') . ' and ' . $conditions['conditionString'] . ') {op} ';
+					$conditionValues  = array_merge($conditionValues, $conditions['conditionValues']);
+				}
+				else
+				{
+					$conditionString  .= $key . ' ' . $operator . ' ? {op} ';
+					$conditionValues[] = $value;
+				}
+			}
+		}
+		$conditionString = '(' . rtrim($conditionString, '{op} ') . ')';
+		return ['conditionString' => $conditionString, 'conditionValues' => $conditionValues];
+	}
+
+	/**
+	 * Wrap the given JSON selector.
+	 *
+	 * @param  string  $value
+	 * @return string
+	 */
+	protected function wrapJsonSelector($value)
+	{
+		$removeLast = strpos($value, ')');
+		$value      = $removeLast === false ? $value : substr($value, 0, $removeLast);
+		$path       = explode('->', $value);
+		$field      = array_shift($path);
+		$result     = sprintf('%s->\'$.%s\'', $field, collect($path)->map(function ($part) {
+			return '"'.$part.'"';
+		})->implode('.'));
         
-        return $removeLast === false ? $result : $result . ')';
-    }
-
-    /**
-     * Abstract method that return the necessary 
-     * information (full model namespace)
-     * needed to preform the previous actions.
-     * 
-     * @return string
-     */
-    abstract protected function getModel();
+		return $removeLast === false ? $result : $result . ')';
+	}
+
+	/**
+	 * Abstract method that return the necessary 
+	 * information (full model namespace)
+	 * needed to preform the previous actions.
+	 * 
+	 * @return string
+	 */
+	abstract protected function getModel();
 }
\ No newline at end of file

src/Modules/Core/Console/Commands/GenerateDoc.php

Doc Comments +2 added lines, -1 removed lines

@@ -123,6 +123,7 @@ 
      * 
      * @param  array  &$route
      * @param  object $reflectionMethod]
+     * @param \ReflectionMethod $reflectionMethod
      * @return void
      */
     protected function processDocBlock(&$route, $reflectionMethod)
@@ -145,7 +146,7 @@ 
      * Generate post body for the given route.
      * 
      * @param  array  &$route
-     * @param  object $reflectionMethod
+     * @param  \ReflectionMethod $reflectionMethod
      * @param  array  $validationRules
      * @return void
      */

Indentation +244 added lines, -244 removed lines

@@ -6,276 +6,276 @@
 
 class GenerateDoc extends Command
 {
-    /**
-     * The name and signature of the console command.
-     *
-     * @var string
-     */
-    protected $signature = 'doc:generate';
+	/**
+	 * The name and signature of the console command.
+	 *
+	 * @var string
+	 */
+	protected $signature = 'doc:generate';
 
-    /**
-     * The console command description.
-     *
-     * @var string
-     */
-    protected $description = 'Generate api documentation';
+	/**
+	 * The console command description.
+	 *
+	 * @var string
+	 */
+	protected $description = 'Generate api documentation';
 
-    /**
-     * Create a new command instance.
-     *
-     * @return void
-     */
-    public function __construct()
-    {
-        parent::__construct();
-    }
+	/**
+	 * Create a new command instance.
+	 *
+	 * @return void
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+	}
 
-    /**
-     * Execute the console command.
-     *
-     * @return mixed
-     */
-    public function handle()
-    {
-        $docData           = [];
-        $docData['models'] = [];
-        $routes            = $this->getRoutes();
-        foreach ($routes as $route) 
-        {
-            if ($route) 
-            {
-                $actoinArray = explode('@', $route['action']);
-                if(array_get($actoinArray, 1, false))
-                {
-                    $controller       = $actoinArray[0];
-                    $method           = $actoinArray[1];
-                    $route['name']    = $method !== 'index' ? $method : 'list';
+	/**
+	 * Execute the console command.
+	 *
+	 * @return mixed
+	 */
+	public function handle()
+	{
+		$docData           = [];
+		$docData['models'] = [];
+		$routes            = $this->getRoutes();
+		foreach ($routes as $route) 
+		{
+			if ($route) 
+			{
+				$actoinArray = explode('@', $route['action']);
+				if(array_get($actoinArray, 1, false))
+				{
+					$controller       = $actoinArray[0];
+					$method           = $actoinArray[1];
+					$route['name']    = $method !== 'index' ? $method : 'list';
                     
-                    $reflectionClass  = new \ReflectionClass($controller);
-                    $reflectionMethod = $reflectionClass->getMethod($method);
-                    $classProperties  = $reflectionClass->getDefaultProperties();
-                    $skipLoginCheck   = array_key_exists('skipLoginCheck', $classProperties) ? $classProperties['skipLoginCheck'] : false;
-                    $validationRules  = array_key_exists('validationRules', $classProperties) ? $classProperties['validationRules'] : false;
+					$reflectionClass  = new \ReflectionClass($controller);
+					$reflectionMethod = $reflectionClass->getMethod($method);
+					$classProperties  = $reflectionClass->getDefaultProperties();
+					$skipLoginCheck   = array_key_exists('skipLoginCheck', $classProperties) ? $classProperties['skipLoginCheck'] : false;
+					$validationRules  = array_key_exists('validationRules', $classProperties) ? $classProperties['validationRules'] : false;
 
-                    $this->processDocBlock($route, $reflectionMethod);
-                    $this->getHeaders($route, $method, $skipLoginCheck);
-                    $this->getPostData($route, $reflectionMethod, $validationRules);
+					$this->processDocBlock($route, $reflectionMethod);
+					$this->getHeaders($route, $method, $skipLoginCheck);
+					$this->getPostData($route, $reflectionMethod, $validationRules);
 
-                    $route['response'] = $this->getResponseObject($classProperties['model'], $route['name'], $route['returnDocBlock']);
+					$route['response'] = $this->getResponseObject($classProperties['model'], $route['name'], $route['returnDocBlock']);
 
-                    preg_match('/api\/([^#]+)\//iU', $route['uri'], $module);
-                    $docData['modules'][$module[1]][substr($route['prefix'], strlen('/api/' . $module[1] . '/') - 1)][] = $route;
+					preg_match('/api\/([^#]+)\//iU', $route['uri'], $module);
+					$docData['modules'][$module[1]][substr($route['prefix'], strlen('/api/' . $module[1] . '/') - 1)][] = $route;
 
-                    $this->getModels($classProperties['model'], $docData);   
-                }
-            }
-        }
+					$this->getModels($classProperties['model'], $docData);   
+				}
+			}
+		}
         
-        $docData['errors']  = $this->getErrors();
-        $docData['reports'] = \Core::reports()->all();
-        \File::put(app_path('Modules/Core/Resources/api.json'), json_encode($docData));
-    }
+		$docData['errors']  = $this->getErrors();
+		$docData['reports'] = \Core::reports()->all();
+		\File::put(app_path('Modules/Core/Resources/api.json'), json_encode($docData));
+	}
 
-    /**
-     * Get list of all registered routes.
-     * 
-     * @return collection
-     */
-    protected function getRoutes()
-    {
-        return collect(\Route::getRoutes())->map(function ($route) {
-            if (strpos($route->uri(), 'api') !== false) 
-            {
-                return [
-                    'method' => $route->methods()[0],
-                    'uri'    => $route->uri(),
-                    'action' => $route->getActionName(),
-                    'prefix' => $route->getPrefix()
-                ];
-            }
-            return false;
-        })->all();
-    }
+	/**
+	 * Get list of all registered routes.
+	 * 
+	 * @return collection
+	 */
+	protected function getRoutes()
+	{
+		return collect(\Route::getRoutes())->map(function ($route) {
+			if (strpos($route->uri(), 'api') !== false) 
+			{
+				return [
+					'method' => $route->methods()[0],
+					'uri'    => $route->uri(),
+					'action' => $route->getActionName(),
+					'prefix' => $route->getPrefix()
+				];
+			}
+			return false;
+		})->all();
+	}
 
-    /**
-     * Generate headers for the given route.
-     * 
-     * @param  array  &$route
-     * @param  string $method
-     * @param  array  $skipLoginCheck
-     * @return void
-     */
-    protected function getHeaders(&$route, $method, $skipLoginCheck)
-    {
-        $route['headers'] = [
-        'Accept'       => 'application/json',
-        'Content-Type' => 'application/json',
-        'locale'       => 'The language of the returned data: ar, en or all.',
-        'time-zone'    => 'Your locale time zone',
-        ];
+	/**
+	 * Generate headers for the given route.
+	 * 
+	 * @param  array  &$route
+	 * @param  string $method
+	 * @param  array  $skipLoginCheck
+	 * @return void
+	 */
+	protected function getHeaders(&$route, $method, $skipLoginCheck)
+	{
+		$route['headers'] = [
+		'Accept'       => 'application/json',
+		'Content-Type' => 'application/json',
+		'locale'       => 'The language of the returned data: ar, en or all.',
+		'time-zone'    => 'Your locale time zone',
+		];
 
 
-        if (! $skipLoginCheck || ! in_array($method, $skipLoginCheck)) 
-        {
-            $route['headers']['Authorization'] = 'Bearer {token}';
-        }
-    }
+		if (! $skipLoginCheck || ! in_array($method, $skipLoginCheck)) 
+		{
+			$route['headers']['Authorization'] = 'Bearer {token}';
+		}
+	}
 
-    /**
-     * Generate description and params for the given route
-     * based on the docblock.
-     * 
-     * @param  array  &$route
-     * @param  object $reflectionMethod]
-     * @return void
-     */
-    protected function processDocBlock(&$route, $reflectionMethod)
-    {
-        $factory                 = \phpDocumentor\Reflection\DocBlockFactory::createInstance();
-        $docblock                = $factory->create($reflectionMethod->getDocComment());
-        $route['description']    = trim(preg_replace('/\s+/', ' ', $docblock->getSummary()));
-        $params                  = $docblock->getTagsByName('param');
-        $route['returnDocBlock'] = $docblock->getTagsByName('return')[0]->getType()->getFqsen()->getName();
-        foreach ($params as $param) 
-        {
-            $name = $param->getVariableName();
-            if ($name !== 'request') 
-            {
-                $route['parametars'][$param->getVariableName()] = $param->getDescription()->render();
-            }
-        }
-    }
+	/**
+	 * Generate description and params for the given route
+	 * based on the docblock.
+	 * 
+	 * @param  array  &$route
+	 * @param  object $reflectionMethod]
+	 * @return void
+	 */
+	protected function processDocBlock(&$route, $reflectionMethod)
+	{
+		$factory                 = \phpDocumentor\Reflection\DocBlockFactory::createInstance();
+		$docblock                = $factory->create($reflectionMethod->getDocComment());
+		$route['description']    = trim(preg_replace('/\s+/', ' ', $docblock->getSummary()));
+		$params                  = $docblock->getTagsByName('param');
+		$route['returnDocBlock'] = $docblock->getTagsByName('return')[0]->getType()->getFqsen()->getName();
+		foreach ($params as $param) 
+		{
+			$name = $param->getVariableName();
+			if ($name !== 'request') 
+			{
+				$route['parametars'][$param->getVariableName()] = $param->getDescription()->render();
+			}
+		}
+	}
 
-    /**
-     * Generate post body for the given route.
-     * 
-     * @param  array  &$route
-     * @param  object $reflectionMethod
-     * @param  array  $validationRules
-     * @return void
-     */
-    protected function getPostData(&$route, $reflectionMethod, $validationRules)
-    {
-        if ($route['method'] == 'POST') 
-        {
-            $body = $this->getMethodBody($reflectionMethod);
+	/**
+	 * Generate post body for the given route.
+	 * 
+	 * @param  array  &$route
+	 * @param  object $reflectionMethod
+	 * @param  array  $validationRules
+	 * @return void
+	 */
+	protected function getPostData(&$route, $reflectionMethod, $validationRules)
+	{
+		if ($route['method'] == 'POST') 
+		{
+			$body = $this->getMethodBody($reflectionMethod);
 
-            preg_match('/\$this->validate\(\$request,([^#]+)\);/iU', $body, $match);
-            if (count($match)) 
-            {
-                if ($match[1] == '$this->validationRules')
-                {
-                    $route['body'] = $validationRules;
-                }
-                else
-                {
-                    $route['body'] = eval('return ' . str_replace(',\'.$request->get(\'id\')', ',{id}\'', $match[1]) . ';');
-                }
+			preg_match('/\$this->validate\(\$request,([^#]+)\);/iU', $body, $match);
+			if (count($match)) 
+			{
+				if ($match[1] == '$this->validationRules')
+				{
+					$route['body'] = $validationRules;
+				}
+				else
+				{
+					$route['body'] = eval('return ' . str_replace(',\'.$request->get(\'id\')', ',{id}\'', $match[1]) . ';');
+				}
 
-                foreach ($route['body'] as &$rule) 
-                {
-                    if(strpos($rule, 'unique'))
-                    {
-                        $rule = substr($rule, 0, strpos($rule, 'unique') + 6);
-                    }
-                    elseif(strpos($rule, 'exists'))
-                    {
-                        $rule = substr($rule, 0, strpos($rule, 'exists') - 1);
-                    }
-                }
-            }
-            else
-            {
-                $route['body'] = 'conditions';
-            }
-        }
-    }
+				foreach ($route['body'] as &$rule) 
+				{
+					if(strpos($rule, 'unique'))
+					{
+						$rule = substr($rule, 0, strpos($rule, 'unique') + 6);
+					}
+					elseif(strpos($rule, 'exists'))
+					{
+						$rule = substr($rule, 0, strpos($rule, 'exists') - 1);
+					}
+				}
+			}
+			else
+			{
+				$route['body'] = 'conditions';
+			}
+		}
+	}
 
-    /**
-     * Generate application errors.
-     * 
-     * @return array
-     */
-    protected function getErrors()
-    {
-        $errors          = [];
-        $reflectionClass = new \ReflectionClass('App\Modules\Core\Utl\ErrorHandler');
-        foreach ($reflectionClass->getMethods() as $method) 
-        {
-            $methodName       = $method->getName();
-            $reflectionMethod = $reflectionClass->getMethod($methodName);
-            $body             = $this->getMethodBody($reflectionMethod);
+	/**
+	 * Generate application errors.
+	 * 
+	 * @return array
+	 */
+	protected function getErrors()
+	{
+		$errors          = [];
+		$reflectionClass = new \ReflectionClass('App\Modules\Core\Utl\ErrorHandler');
+		foreach ($reflectionClass->getMethods() as $method) 
+		{
+			$methodName       = $method->getName();
+			$reflectionMethod = $reflectionClass->getMethod($methodName);
+			$body             = $this->getMethodBody($reflectionMethod);
 
-            preg_match('/\$error=\[\'status\'=>([^#]+)\,/iU', $body, $match);
+			preg_match('/\$error=\[\'status\'=>([^#]+)\,/iU', $body, $match);
 
-            if (count($match)) 
-            {
-                $errors[$match[1]][] = $methodName;
-            }
-        }
+			if (count($match)) 
+			{
+				$errors[$match[1]][] = $methodName;
+			}
+		}
 
-        return $errors;
-    }
+		return $errors;
+	}
 
-    /**
-     * Get the given method body code.
-     * 
-     * @param  object $reflectionMethod
-     * @return string
-     */
-    protected function getMethodBody($reflectionMethod)
-    {
-        $filename   = $reflectionMethod->getFileName();
-        $start_line = $reflectionMethod->getStartLine() - 1;
-        $end_line   = $reflectionMethod->getEndLine();
-        $length     = $end_line - $start_line;         
-        $source     = file($filename);
-        $body       = implode("", array_slice($source, $start_line, $length));
-        $body       = trim(preg_replace('/\s+/', '', $body));
+	/**
+	 * Get the given method body code.
+	 * 
+	 * @param  object $reflectionMethod
+	 * @return string
+	 */
+	protected function getMethodBody($reflectionMethod)
+	{
+		$filename   = $reflectionMethod->getFileName();
+		$start_line = $reflectionMethod->getStartLine() - 1;
+		$end_line   = $reflectionMethod->getEndLine();
+		$length     = $end_line - $start_line;         
+		$source     = file($filename);
+		$body       = implode("", array_slice($source, $start_line, $length));
+		$body       = trim(preg_replace('/\s+/', '', $body));
 
-        return $body;
-    }
+		return $body;
+	}
 
-    /**
-     * Get example object of all availble models.
-     * 
-     * @param  string $modelName
-     * @param  array  $docData
-     * @return string
-     */
-    protected function getModels($modelName, &$docData)
-    {
-        if ($modelName && ! array_key_exists($modelName, $docData['models'])) 
-        {
-            $modelClass = call_user_func_array("\Core::{$modelName}", [])->modelClass;
-            $model      = factory($modelClass)->make();
-            $modelArr   = $model->toArray();
+	/**
+	 * Get example object of all availble models.
+	 * 
+	 * @param  string $modelName
+	 * @param  array  $docData
+	 * @return string
+	 */
+	protected function getModels($modelName, &$docData)
+	{
+		if ($modelName && ! array_key_exists($modelName, $docData['models'])) 
+		{
+			$modelClass = call_user_func_array("\Core::{$modelName}", [])->modelClass;
+			$model      = factory($modelClass)->make();
+			$modelArr   = $model->toArray();
 
-            if ( $model->trans && ! $model->trans->count()) 
-            {
-                $modelArr['trans'] = [
-                    'en' => factory($modelClass . 'Translation')->make()->toArray()
-                ];
-            }
+			if ( $model->trans && ! $model->trans->count()) 
+			{
+				$modelArr['trans'] = [
+					'en' => factory($modelClass . 'Translation')->make()->toArray()
+				];
+			}
 
-            $docData['models'][$modelName] = json_encode($modelArr, JSON_PRETTY_PRINT);
-        }
-    }
+			$docData['models'][$modelName] = json_encode($modelArr, JSON_PRETTY_PRINT);
+		}
+	}
 
-    /**
-     * Get the route response object type.
-     * 
-     * @param  string $modelName
-     * @param  string $method
-     * @param  string $returnDocBlock
-     * @return array
-     */
-    protected function getResponseObject($modelName, $method, $returnDocBlock)
-    {
-        $config    = \CoreConfig::getConfig();
-        $relations = array_key_exists($modelName, $config['relations']) ? array_key_exists($method, $config['relations'][$modelName]) ? $config['relations'][$modelName] : false : false;
-        $modelName = call_user_func_array("\Core::{$returnDocBlock}", []) ? $returnDocBlock : $modelName;
+	/**
+	 * Get the route response object type.
+	 * 
+	 * @param  string $modelName
+	 * @param  string $method
+	 * @param  string $returnDocBlock
+	 * @return array
+	 */
+	protected function getResponseObject($modelName, $method, $returnDocBlock)
+	{
+		$config    = \CoreConfig::getConfig();
+		$relations = array_key_exists($modelName, $config['relations']) ? array_key_exists($method, $config['relations'][$modelName]) ? $config['relations'][$modelName] : false : false;
+		$modelName = call_user_func_array("\Core::{$returnDocBlock}", []) ? $returnDocBlock : $modelName;
 
-        return $relations ? [$modelName => $relations && $relations[$method] ? $relations[$method] : []] : false;
-    }
+		return $relations ? [$modelName => $relations && $relations[$method] ? $relations[$method] : []] : false;
+	}
 }

src/Modules/Notifications/Notifications/ResetPassword.php

Doc Comments +1 added lines, -1 removed lines

@@ -28,7 +28,7 @@
      * Get the notification's delivery channels.
      *
      * @param  mixed  $notifiable
-     * @return array
+     * @return string[]
      */
     public function via($notifiable)
     {

Indentation +35 added lines, -35 removed lines

@@ -10,43 +10,43 @@
 
 class ResetPassword extends Notification implements ShouldQueue
 {
-    use Queueable;
+	use Queueable;
 
-    protected $token;
+	protected $token;
 
-    /**
-     * Create a new notification instance.
-     *
-     * @return void
-     */
-    public function __construct($token)
-    {
-        $this->token = $token;
-    }
+	/**
+	 * Create a new notification instance.
+	 *
+	 * @return void
+	 */
+	public function __construct($token)
+	{
+		$this->token = $token;
+	}
 
-    /**
-     * Get the notification's delivery channels.
-     *
-     * @param  mixed  $notifiable
-     * @return array
-     */
-    public function via($notifiable)
-    {
-        return ['mail'];
-    }
+	/**
+	 * Get the notification's delivery channels.
+	 *
+	 * @param  mixed  $notifiable
+	 * @return array
+	 */
+	public function via($notifiable)
+	{
+		return ['mail'];
+	}
 
-    /**
-     * Get the mail representation of the notification.
-     *
-     * @param  mixed  $notifiable
-     * @return \Illuminate\Notifications\Messages\MailMessage
-     */
-    public function toMail($notifiable)
-    {
-        return (new MailMessage)
-            ->subject('Reset passowrd')
-            ->line('Reset passowrd')
-            ->line('To reset your password click on the button below')
-            ->action('Reset password', config('skeleton.reset_password_url') . '/' . $this->token);
-    }
+	/**
+	 * Get the mail representation of the notification.
+	 *
+	 * @param  mixed  $notifiable
+	 * @return \Illuminate\Notifications\Messages\MailMessage
+	 */
+	public function toMail($notifiable)
+	{
+		return (new MailMessage)
+			->subject('Reset passowrd')
+			->line('Reset passowrd')
+			->line('To reset your password click on the button below')
+			->action('Reset password', config('skeleton.reset_password_url') . '/' . $this->token);
+	}
 }
\ No newline at end of file

src/Modules/Notifications/Repositories/PushNotificationDeviceRepository.php

Doc Comments +1 added lines, -1 removed lines

@@ -21,7 +21,7 @@
      * Register the given device to the logged in user.
      *
      * @param  string $data
-     * @return void
+     * @return boolean
      */
     public function registerDevice($data)
     {

Indentation +52 added lines, -52 removed lines

@@ -7,56 +7,56 @@
 
 class PushNotificationDeviceRepository extends AbstractRepository
 {
-    /**
-    * Return the model full namespace.
-    * 
-    * @return string
-    */
-    protected function getModel()
-    {
-        return 'App\Modules\Notifications\PushNotificationDevice';
-    }
-
-    /**
-     * Register the given device to the logged in user.
-     *
-     * @param  string $data
-     * @return void
-     */
-    public function registerDevice($data)
-    {
-        $data['access_token'] = \Auth::user()->token();
-        $data['user_id']      = \Auth::id();
-        if ($device = $this->model->where('device_token', $data['device_token'])->where('user_id', $data['user_id'])->first()) 
-        {
-            $data['id'] = $device->id;
-        }
-
-        return $this->save($data);
-    }
-
-    /**
-     * Generate the given message data.
-     *
-     * @param  string $title
-     * @param  string $message
-     * @param  string $data
-     * @return void
-     */
-    public function generateMessageData($title, $message, $data = [])
-    {
-        $optionBuilder       = new OptionsBuilder();
-        $notificationBuilder = new PayloadNotificationBuilder($title);
-        $dataBuilder         = new PayloadDataBuilder();
-
-        $optionBuilder->setTimeToLive(60*20);
-        $notificationBuilder->setBody($message);
-        $dataBuilder->addData($data);
-
-        $options             = $optionBuilder->build();
-        $notification        = $notificationBuilder->build();
-        $data                = $dataBuilder->build();
-
-        return compact('options', 'notification', 'data');
-    }
+	/**
+	 * Return the model full namespace.
+	 * 
+	 * @return string
+	 */
+	protected function getModel()
+	{
+		return 'App\Modules\Notifications\PushNotificationDevice';
+	}
+
+	/**
+	 * Register the given device to the logged in user.
+	 *
+	 * @param  string $data
+	 * @return void
+	 */
+	public function registerDevice($data)
+	{
+		$data['access_token'] = \Auth::user()->token();
+		$data['user_id']      = \Auth::id();
+		if ($device = $this->model->where('device_token', $data['device_token'])->where('user_id', $data['user_id'])->first()) 
+		{
+			$data['id'] = $device->id;
+		}
+
+		return $this->save($data);
+	}
+
+	/**
+	 * Generate the given message data.
+	 *
+	 * @param  string $title
+	 * @param  string $message
+	 * @param  string $data
+	 * @return void
+	 */
+	public function generateMessageData($title, $message, $data = [])
+	{
+		$optionBuilder       = new OptionsBuilder();
+		$notificationBuilder = new PayloadNotificationBuilder($title);
+		$dataBuilder         = new PayloadDataBuilder();
+
+		$optionBuilder->setTimeToLive(60*20);
+		$notificationBuilder->setBody($message);
+		$dataBuilder->addData($data);
+
+		$options             = $optionBuilder->build();
+		$notification        = $notificationBuilder->build();
+		$data                = $dataBuilder->build();
+
+		return compact('options', 'notification', 'data');
+	}
 }

src/Modules/Reporting/Report.php

Indentation +18 added lines, -18 removed lines

@@ -5,32 +5,32 @@
 
 class Report extends Model{
 
-    use SoftDeletes;
+	use SoftDeletes;
 	protected $table    = 'reports';
 	protected $dates    = ['created_at', 'updated_at', 'deleted_at'];
 	protected $hidden   = ['deleted_at'];
 	protected $guarded  = ['id'];
 	protected $fillable = ['report_name', 'view_name'];
-    public $searchable  = ['report_name', 'view_name'];
+	public $searchable  = ['report_name', 'view_name'];
 
 	public function getCreatedAtAttribute($value)
-    {
-        return \Carbon\Carbon::parse($value)->tz(\Session::get('time-zone'))->toDateTimeString();
-    }
+	{
+		return \Carbon\Carbon::parse($value)->tz(\Session::get('time-zone'))->toDateTimeString();
+	}
 
-    public function getUpdatedAtAttribute($value)
-    {
-        return \Carbon\Carbon::parse($value)->tz(\Session::get('time-zone'))->toDateTimeString();
-    }
+	public function getUpdatedAtAttribute($value)
+	{
+		return \Carbon\Carbon::parse($value)->tz(\Session::get('time-zone'))->toDateTimeString();
+	}
 
-    public function getDeletedAtAttribute($value)
-    {
-        return \Carbon\Carbon::parse($value)->tz(\Session::get('time-zone'))->toDateTimeString();
-    }
+	public function getDeletedAtAttribute($value)
+	{
+		return \Carbon\Carbon::parse($value)->tz(\Session::get('time-zone'))->toDateTimeString();
+	}
     
-    public static function boot()
-    {
-        parent::boot();
-        parent::observe(\App::make('App\Modules\Reporting\ModelObservers\ReprotObserver'));
-    }
+	public static function boot()
+	{
+		parent::boot();
+		parent::observe(\App::make('App\Modules\Reporting\ModelObservers\ReprotObserver'));
+	}
 }