SherifElfadaly / Laravel-Api-Skeleton

src/Modules/Acl/Repositories/UserRepository.php

Doc Comments +1 added lines, -1 removed lines

@@ -151,7 +151,7 @@
 	 * 
 	 * @param  array   $credentials
 	 * @param  boolean $skipConfirmEmail
-	 * @return array
+	 * @return boolean
 	 */
 	public function register($credentials, $skipConfirmEmail = false)
 	{

src/Modules/Core/AbstractRepositories/AbstractRepository.php

Doc Comments +7 added lines, -7 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 mixed
+	 * @return boolean
 	 */
 	public function save(array $data)
 	{
@@ -531,7 +531,7 @@ 
 	 * @param  array   $conditions array of conditions
 	 * @param  array   $relations
 	 * @param  string  $sortBy
-	 * @param  boolean $desc
+	 * @param  integer $desc
 	 * @param  array   $columns
 	 * @return collection
 	 */
@@ -563,7 +563,7 @@ 
 	 * @param  array   $conditions array of conditions
 	 * @param  integer $perPage
 	 * @param  string  $sortBy
-	 * @param  boolean $desc
+	 * @param  integer $desc
 	 * @param  array   $columns
 	 * @return collection
 	 */

Braces +7 added lines, -14 removed lines

@@ -621,14 +621,12 @@ 
 				$conditions       = $this->constructConditions($value, $model);
 				$conditionString .= str_replace('{op}', 'and', $conditions['conditionString']).' {op} ';
 				$conditionValues  = array_merge($conditionValues, $conditions['conditionValues']);
-			}
-			else if ($key == 'or')
+			} else if ($key == 'or')
 			{
 				$conditions       = $this->constructConditions($value, $model);
 				$conditionString .= str_replace('{op}', 'or', $conditions['conditionString']).' {op} ';
 				$conditionValues  = array_merge($conditionValues, $conditions['conditionValues']);
-			}
-			else
+			} else
 			{
 				if (is_array($value)) 
 				{
@@ -653,29 +651,24 @@ 
 
 					$conditionString  .= $key.' <= ? {op} ';
 					$conditionValues[] = $value2;
-				}
-				elseif (strtolower($operator) == 'in') 
+				} 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') 
+				} elseif (strtolower($operator) == 'null') 
 				{
 					$conditionString .= $key.' is null {op} ';
-				}
-				elseif (strtolower($operator) == 'not null') 
+				} elseif (strtolower($operator) == 'not null') 
 				{
 					$conditionString .= $key.' is not null {op} ';
-				}
-				elseif (strtolower($operator) == 'has') 
+				} 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
+				} else
 				{
 					$conditionString  .= $key.' '.$operator.' ? {op} ';
 					$conditionValues[] = $value;

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

Doc Comments +1 added lines, -1 removed lines

@@ -217,7 +217,7 @@
 	/**
 	 * Get the given method body code.
 	 * 
-	 * @param  object $reflectionMethod
+	 * @param  \ReflectionMethod $reflectionMethod
 	 * @return string
 	 */
 	protected function getMethodBody($reflectionMethod)

Braces +2 added lines, -4 removed lines

@@ -174,14 +174,12 @@
 					if (strpos($rule, 'unique'))
 					{
 						$rule = substr($rule, 0, strpos($rule, 'unique') + 6);
-					}
-					elseif (strpos($rule, 'exists'))
+					} elseif (strpos($rule, 'exists'))
 					{
 						$rule = substr($rule, 0, strpos($rule, 'exists') - 1);
 					}
 				}
-			}
-			else
+			} else
 			{
 				$route['body'] = 'conditions';
 			}

src/Modules/Acl/Database/Migrations/2015_12_20_124153_users.php

Indentation +14 added lines, -14 removed lines

@@ -13,24 +13,24 @@ 
 	public function up()
 	{
 		Schema::create('users', function(Blueprint $table) {
-            $table->increments('id');
-            $table->string('profile_picture', 150)->nullable();
-            $table->string('name', 100)->nullable();
-            $table->string('email')->unique();
-            $table->string('password', 60)->nullable();
-            $table->boolean('blocked')->default(0);
-            $table->boolean('confirmed')->default(0);
-            $table->string('confirmation_code')->nullable();
-            $table->softDeletes();
-            $table->rememberToken();
-            $table->timestamps();
-        });
+			$table->increments('id');
+			$table->string('profile_picture', 150)->nullable();
+			$table->string('name', 100)->nullable();
+			$table->string('email')->unique();
+			$table->string('password', 60)->nullable();
+			$table->boolean('blocked')->default(0);
+			$table->boolean('confirmed')->default(0);
+			$table->string('confirmation_code')->nullable();
+			$table->softDeletes();
+			$table->rememberToken();
+			$table->timestamps();
+		});
 
 		/**
 		 * Create Default users.
 		 */
 		\DB::table('users')->insertGetId(
-            [
+			[
 			'name'       => 'Admin',
 			'email'      => 'admin@user.com',
 			'password'   => bcrypt('123456'),
@@ -38,7 +38,7 @@ 
 			'created_at' => \DB::raw('NOW()'),
 			'updated_at' => \DB::raw('NOW()')
 			]
-        );
+		);
 	}
 
 	/**

src/Modules/Core/Http/Controllers/BaseApiController.php

Braces +2 added lines, -4 removed lines

@@ -227,10 +227,8 @@
 			}
 
 			if ($isPasswordClient && (in_array($permission, $this->skipPermissionCheck) || \Core::users()->can($permission, $this->model)))
-			{}
-			elseif ( ! $isPasswordClient && $user->tokenCan($this->model.'-'.$permission)) 
-			{}
-			else
+			{} elseif ( ! $isPasswordClient && $user->tokenCan($this->model.'-'.$permission)) 
+			{} else
 			{
 
 				\ErrorHandler::noPermissions();

src/Modules/Reporting/Repositories/ReportRepository.php

Braces +1 added lines, -2 removed lines

@@ -39,8 +39,7 @@
 		if ( ! $report) 
 		{
 			\ErrorHandler::notFound('report');
-		}
-		else if ( ! $skipPermission && ! \Core::users()->can($report->view_name, 'reports'))
+		} else if ( ! $skipPermission && ! \Core::users()->can($report->view_name, 'reports'))
 		{
 			\ErrorHandler::noPermissions();
 		}