SherifElfadaly / Laravel-Api-Skeleton

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

Unused Use Statements -1 removed lines

@@ -2,7 +2,6 @@
 namespace App\Modules\Core\Http\Controllers;
 
 use App\Http\Controllers\Controller;
-use Illuminate\Http\Request;
 
 class ApiDocumentController extends Controller
 {

Spacing +7 added lines, -7 removed lines

@@ -20,27 +20,27 @@ 
 			],
 			[
 				'title'   => 'email equal John@Doe.com and user is blocked:',
-				'content' => ['and' => ['email' => 'John@Doe.com','blocked' => 1]]
+				'content' => ['and' => ['email' => 'John@Doe.com', 'blocked' => 1]]
 			],
 			[
 				'title'   => 'email equal John@Doe.com or user is blocked:',
-				'content' => ['or' => ['email' => 'John@Doe.com','blocked' => 1]]
+				'content' => ['or' => ['email' => 'John@Doe.com', 'blocked' => 1]]
 			],
 			[
 				'title'   => 'email contain John:',
-				'content' => ['email' => ['op' => 'like','val' => '%John%']]
+				'content' => ['email' => ['op' => 'like', 'val' => '%John%']]
 			],
 			[
 				'title'   => 'user created after 2016-10-25:',
-				'content' => ['created_at' => ['op' => '>','val' => '2016-10-25']]
+				'content' => ['created_at' => ['op' => '>', 'val' => '2016-10-25']]
 			],
 			[
 				'title'   => 'user created between 2016-10-20 and 2016-10-25:',
-				'content' => ['created_at' => ['op' => 'between','val1' => '2016-10-20','val2' => '2016-10-25']]
+				'content' => ['created_at' => ['op' => 'between', 'val1' => '2016-10-20', 'val2' => '2016-10-25']]
 			],
 			[
 				'title'   => 'user id in 1,2,3:',
-				'content' => ['id' => ['op' => 'in','val' => [1, 2, 3]]]
+				'content' => ['id' => ['op' => 'in', 'val' => [1, 2, 3]]]
 			],
 			[
 				'title'   => 'user name is null:',
@@ -52,7 +52,7 @@ 
 			],
 			[
 				'title'   => 'user has group admin:',
-				'content' => ['groups' => ['op' => 'has','val' => ['name' => 'Admin']]]
+				'content' => ['groups' => ['op' => 'has', 'val' => ['name' => 'Admin']]]
 			]
 		];
 

src/Modules/Notifications/Notifications/ResetPassword.php

Unused Use Statements -1 removed lines

@@ -6,7 +6,6 @@
 use Illuminate\Notifications\Notification;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Notifications\Messages\MailMessage;
-use Illuminate\Notifications\Messages\BroadcastMessage;
 
 class ResetPassword extends Notification implements ShouldQueue
 {

Spacing +1 added lines, -1 removed lines

@@ -45,6 +45,6 @@
 			->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);
+			->action('Reset password', config('skeleton.reset_password_url').'/'.$this->token);
 	}
 }
\ No newline at end of file

Doc Comments +1 added lines, -1 removed lines

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

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

Spacing +2 added lines, -2 removed lines

@@ -12,7 +12,7 @@ 
 	 */
 	public function up()
 	{
-		DB::statement( "CREATE VIEW admin_count AS  
+		DB::statement("CREATE VIEW admin_count AS  
 			select count(u.id)
 			from users u, groups g ,users_groups ug
 			where
@@ -39,6 +39,6 @@ 
 	 */
 	public function down()
 	{
-		DB::statement( "DROP VIEW IF EXISTS admin_count");
+		DB::statement("DROP VIEW IF EXISTS admin_count");
 	}
 }
\ No newline at end of file

src/Modules/Notifications/Database/Migrations/2016_01_24_111942_push_notifications_devices.php

Spacing +1 added lines, -1 removed lines

@@ -12,7 +12,7 @@
 	 */
 	public function up()
 	{
-		Schema::create('push_notifications_devices', function (Blueprint $table) {
+		Schema::create('push_notifications_devices', function(Blueprint $table) {
 			$table->increments('id');
 			$table->string('device_token');
 			$table->integer('user_id');

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

Spacing +1 added lines, -1 removed lines

@@ -12,7 +12,7 @@
 	 */
 	public function up()
 	{
-		Schema::create('users', function (Blueprint $table) {
+		Schema::create('users', function(Blueprint $table) {
             $table->increments('id');
             $table->string('profile_picture', 150)->nullable();
             $table->string('name', 100)->nullable();

Indentation +14 added lines, -14 removed lines

@@ -13,31 +13,31 @@
 	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'),
 			'created_at' => \DB::raw('NOW()'),
 			'updated_at' => \DB::raw('NOW()')
 			]
-        );
+		);
 	}
 
 	/**

src/Modules/Acl/Repositories/GroupRepository.php

Spacing +1 added lines, -1 removed lines

@@ -23,7 +23,7 @@
 	 */
 	public function assignPermissions($groupId, $permissionIds)
 	{
-		\DB::transaction(function () use ($groupId, $permissionIds) {
+		\DB::transaction(function() use ($groupId, $permissionIds) {
 			$group = $this->find($groupId);
 			$group->permissions()->detach();
 			$group->permissions()->attach($permissionIds);

src/Modules/Core/Core.php

Spacing +1 added lines, -1 removed lines

@@ -2,7 +2,7 @@
 
 use App\Modules\Core\AbstractRepositories\AbstractRepositoryContainer;
 
-class Core extends AbstractRepositoryContainer{
+class Core extends AbstractRepositoryContainer {
 	/**
 	 * Specify module repositories name space.
 	 * 

src/Modules/Notifications/Notifications/ConfirmEmail.php

Unused Use Statements -1 removed lines

@@ -6,7 +6,6 @@
 use Illuminate\Notifications\Notification;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Notifications\Messages\MailMessage;
-use Illuminate\Notifications\Messages\BroadcastMessage;
 
 class ConfirmEmail extends Notification implements ShouldQueue
 {

Doc Comments +1 added lines, -1 removed lines

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

Spacing +1 added lines, -1 removed lines

@@ -43,6 +43,6 @@
 			->subject('Email verification')
 			->line('Email verification')
 			->line('To validate your email click on the button below')
-			->action('Verify your email', config('skeleton.confrim_email_url') . '/' . $notifiable->confirmation_code);
+			->action('Verify your email', config('skeleton.confrim_email_url').'/'.$notifiable->confirmation_code);
 	}
 }
\ No newline at end of file

src/Modules/Acl/Repositories/UserRepository.php

Doc Comments +3 added lines, -3 removed lines

@@ -61,7 +61,7 @@ 
 	/**
 	 * Check if the logged in user has the given group.
 	 * 
-	 * @param  array $groups
+	 * @param  string[] $groups
 	 * @param  mixed $user
 	 * @return boolean
 	 */
@@ -155,7 +155,7 @@ 
 	 * 
 	 * @param  array   $credentials
 	 * @param  boolean $skipConfirmEmail
-	 * @return array
+	 * @return boolean
 	 */
 	public function register($credentials, $skipConfirmEmail = false)
 	{
@@ -246,7 +246,7 @@ 
 	 * Reset the given user's password.
 	 *
 	 * @param  array  $credentials
-	 * @return array
+	 * @return string|null
 	 */
 	public function resetPassword($credentials)
 	{

Spacing +4 added lines, -4 removed lines

@@ -28,7 +28,7 @@ 
 		$user        = \Core::users()->find(\Auth::id(), $relations);
 		foreach ($user->groups()->get() as $group)
 		{
-			$group->permissions->each(function ($permission) use (&$permissions){
+			$group->permissions->each(function($permission) use (&$permissions){
 				$permissions[$permission->model][$permission->id] = $permission->name;
 			});
 		}
@@ -51,7 +51,7 @@ 
 		$user        = $user ?: $this->find(\Auth::id(), ['groups.permissions']);
 		$permissions = [];
 
-		$user->groups->pluck('permissions')->each(function ($permission) use (&$permissions, $model){
+		$user->groups->pluck('permissions')->each(function($permission) use (&$permissions, $model){
 			$permissions = array_merge($permissions, $permission->where('model', $model)->pluck('name')->toArray()); 
 		});
         
@@ -80,7 +80,7 @@ 
 	 */
 	public function assignGroups($userId, $groupIds)
 	{
-		\DB::transaction(function () use ($userId, $groupIds) {
+		\DB::transaction(function() use ($userId, $groupIds) {
 			$user = $this->find($userId);
 			$user->groups()->detach();
 			$user->groups()->attach($groupIds);
@@ -250,7 +250,7 @@ 
 	 */
 	public function resetPassword($credentials)
 	{
-		$response = \Password::reset($credentials, function ($user, $password) {
+		$response = \Password::reset($credentials, function($user, $password) {
 			$user->password = $password;
 			$user->save();
 		});

Braces +7 added lines, -14 removed lines

@@ -102,20 +102,16 @@ 
 		if ( ! $user = $this->first(['email' => $credentials['email']])) 
 		{
 			\ErrorHandler::loginFailed();
-		}
-		else if ($adminLogin && ! $user->groups->whereIn('name', ['Admin'])->count()) 
+		} else if ($adminLogin && ! $user->groups->whereIn('name', ['Admin'])->count()) 
 		{
 			\ErrorHandler::loginFailed();
-		}
-		else if ( ! $adminLogin && $user->groups->whereIn('name', ['Admin'])->count()) 
+		} else if ( ! $adminLogin && $user->groups->whereIn('name', ['Admin'])->count()) 
 		{
 			\ErrorHandler::loginFailed();
-		}
-		else if ($user->blocked)
+		} else if ($user->blocked)
 		{
 			\ErrorHandler::userIsBlocked();
-		}
-		else if ( ! config('skeleton.disable_confirm_email') && ! $user->confirmed)
+		} else if ( ! config('skeleton.disable_confirm_email') && ! $user->confirmed)
 		{
 			\ErrorHandler::emailNotConfirmed();
 		}
@@ -165,8 +161,7 @@ 
 		{
 			$user->confirmed = 1;
 			$user->save();
-		}
-		else if ( ! config('skeleton.disable_confirm_email'))  
+		} else if ( ! config('skeleton.disable_confirm_email'))  
 		{
 			$this->sendConfirmationEmail($user->email);
 		}
@@ -189,12 +184,10 @@ 
 		if ( ! $this->hasGroup(['Admin']))
 		{
 			\ErrorHandler::noPermissions();
-		}
-		else if (\Auth::id() == $userId)
+		} else if (\Auth::id() == $userId)
 		{
 			\ErrorHandler::noPermissions();
-		}
-		else if ($user->groups->pluck('name')->search('Admin', true) !== false) 
+		} else if ($user->groups->pluck('name')->search('Admin', true) !== false) 
 		{
 			\ErrorHandler::noPermissions();
 		}