SherifElfadaly / Laravel-Api-Skeleton

src/Modules/Acl/Database/Factories/UserFactory.php

Indentation +8 added lines, -8 removed lines

@@ -1,12 +1,12 @@
 <?php
 
 $factory->define(App\Modules\Acl\AclUser::class, function (Faker\Generator $faker) {
-    return [
-        'profile_picture' => 'http://lorempixel.com/400/200/',
-        'name'            => $faker->name(),
-        'email'           => $faker->safeEmail(),
-        'password'        => 123456,
-        'created_at'      => $faker->dateTimeBetween('-1 years', 'now'),
-        'updated_at'      => $faker->dateTimeBetween('-1 years', 'now')
-    ];
+	return [
+		'profile_picture' => 'http://lorempixel.com/400/200/',
+		'name'            => $faker->name(),
+		'email'           => $faker->safeEmail(),
+		'password'        => 123456,
+		'created_at'      => $faker->dateTimeBetween('-1 years', 'now'),
+		'updated_at'      => $faker->dateTimeBetween('-1 years', 'now')
+	];
 });

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 
-$factory->define(App\Modules\Acl\AclUser::class, function (Faker\Generator $faker) {
+$factory->define(App\Modules\Acl\AclUser::class, function(Faker\Generator $faker) {
     return [
         'profile_picture' => 'http://lorempixel.com/400/200/',
         'name'            => $faker->name(),

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

Indentation +57 added lines, -57 removed lines

@@ -5,66 +5,66 @@
 
 class Groups extends Migration
 {
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        Schema::create('groups', function (Blueprint $table) {
-            $table->increments('id');
-            $table->string('name', 100)->unique();
-            $table->softDeletes();
-            $table->timestamps();
-        });
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		Schema::create('groups', function (Blueprint $table) {
+			$table->increments('id');
+			$table->string('name', 100)->unique();
+			$table->softDeletes();
+			$table->timestamps();
+		});
         
-        Schema::create('users_groups', function (Blueprint $table) {
-            $table->increments('id');
-            $table->integer('user_id');
-            $table->integer('group_id');
-            $table->softDeletes();
-            $table->timestamps();
+		Schema::create('users_groups', function (Blueprint $table) {
+			$table->increments('id');
+			$table->integer('user_id');
+			$table->integer('group_id');
+			$table->softDeletes();
+			$table->timestamps();
 
-            $table->index(['user_id']);
-        });
+			$table->index(['user_id']);
+		});
         
-        /**
-         * Create Default groups.
-         */
-        \DB::table('groups')->insert(
-            [
-                [
-                    'name'       => 'Admin',
-                    'created_at' => \DB::raw('NOW()'),
-                    'updated_at' => \DB::raw('NOW()')
-                ]
-            ]
-        );
+		/**
+		 * Create Default groups.
+		 */
+		\DB::table('groups')->insert(
+			[
+				[
+					'name'       => 'Admin',
+					'created_at' => \DB::raw('NOW()'),
+					'updated_at' => \DB::raw('NOW()')
+				]
+			]
+		);
         
-        /**
-         * Assign default users to admin groups.
-         */
-        $adminGroupId = \DB::table('groups')->where('name', 'admin')->select('id')->first()->id;
-        $adminUserId  = \DB::table('users')->where('email', 'admin@user.com')->select('id')->first()->id;
-        \DB::table('users_groups')->insert(
-            [
-            'user_id'    => $adminUserId,
-            'group_id'   => $adminGroupId,
-            'created_at' => \DB::raw('NOW()'),
-            'updated_at' => \DB::raw('NOW()')
-            ]
-        );
-    }
+		/**
+		 * Assign default users to admin groups.
+		 */
+		$adminGroupId = \DB::table('groups')->where('name', 'admin')->select('id')->first()->id;
+		$adminUserId  = \DB::table('users')->where('email', 'admin@user.com')->select('id')->first()->id;
+		\DB::table('users_groups')->insert(
+			[
+			'user_id'    => $adminUserId,
+			'group_id'   => $adminGroupId,
+			'created_at' => \DB::raw('NOW()'),
+			'updated_at' => \DB::raw('NOW()')
+			]
+		);
+	}
 
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        Schema::dropIfExists('groups');
-        Schema::dropIfExists('users_groups');
-    }
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		Schema::dropIfExists('groups');
+		Schema::dropIfExists('users_groups');
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -12,14 +12,14 @@
      */
     public function up()
     {
-        Schema::create('groups', function (Blueprint $table) {
+        Schema::create('groups', function(Blueprint $table) {
             $table->increments('id');
             $table->string('name', 100)->unique();
             $table->softDeletes();
             $table->timestamps();
         });
         
-        Schema::create('users_groups', function (Blueprint $table) {
+        Schema::create('users_groups', function(Blueprint $table) {
             $table->increments('id');
             $table->integer('user_id');
             $table->integer('group_id');

src/Modules/Acl/Database/Migrations/2016_01_05_130506_permissions.php

Indentation +34 added lines, -34 removed lines

@@ -5,40 +5,40 @@
 
 class Permissions extends Migration
 {
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        Schema::create('permissions', function (Blueprint $table) {
-            $table->increments('id');
-            $table->string('name', 100);
-            $table->string('model', 100);
-            $table->softDeletes();
-            $table->timestamps();
-            $table->unique(array('name', 'model'));
-        });
-        Schema::create('groups_permissions', function (Blueprint $table) {
-            $table->increments('id');
-            $table->integer('group_id');
-            $table->integer('permission_id');
-            $table->softDeletes();
-            $table->timestamps();
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		Schema::create('permissions', function (Blueprint $table) {
+			$table->increments('id');
+			$table->string('name', 100);
+			$table->string('model', 100);
+			$table->softDeletes();
+			$table->timestamps();
+			$table->unique(array('name', 'model'));
+		});
+		Schema::create('groups_permissions', function (Blueprint $table) {
+			$table->increments('id');
+			$table->integer('group_id');
+			$table->integer('permission_id');
+			$table->softDeletes();
+			$table->timestamps();
 
-            $table->index(['group_id']);
-        });
-    }
+			$table->index(['group_id']);
+		});
+	}
 
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        Schema::dropIfExists('permissions');
-        Schema::dropIfExists('groups_permissions');
-    }
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		Schema::dropIfExists('permissions');
+		Schema::dropIfExists('groups_permissions');
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -12,7 +12,7 @@ 
      */
     public function up()
     {
-        Schema::create('permissions', function (Blueprint $table) {
+        Schema::create('permissions', function(Blueprint $table) {
             $table->increments('id');
             $table->string('name', 100);
             $table->string('model', 100);
@@ -20,7 +20,7 @@ 
             $table->timestamps();
             $table->unique(array('name', 'model'));
         });
-        Schema::create('groups_permissions', function (Blueprint $table) {
+        Schema::create('groups_permissions', function(Blueprint $table) {
             $table->increments('id');
             $table->integer('group_id');
             $table->integer('permission_id');

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

Indentation +45 added lines, -45 removed lines

@@ -5,51 +5,51 @@
 
 class Users extends Migration
 {
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    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->string('locale', 2)->default('en');
-            $table->string('timezone', 50)->default('Africa/Cairo');
-            $table->softDeletes();
-            $table->rememberToken();
-            $table->timestamps();
-        });
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	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->string('locale', 2)->default('en');
+			$table->string('timezone', 50)->default('Africa/Cairo');
+			$table->softDeletes();
+			$table->rememberToken();
+			$table->timestamps();
+		});
 
-        /**
-         * Create Default users.
-         */
-        \DB::table('users')->insertGetId(
-            [
-            'name'       => 'Admin',
-            'email'      => 'admin@user.com',
-            'password'   => bcrypt('123456'),
-            'confirmed'  => 1,
-            'created_at' => \DB::raw('NOW()'),
-            'updated_at' => \DB::raw('NOW()')
-            ]
-        );
-    }
+		/**
+		 * Create Default users.
+		 */
+		\DB::table('users')->insertGetId(
+			[
+			'name'       => 'Admin',
+			'email'      => 'admin@user.com',
+			'password'   => bcrypt('123456'),
+			'confirmed'  => 1,
+			'created_at' => \DB::raw('NOW()'),
+			'updated_at' => \DB::raw('NOW()')
+			]
+		);
+	}
 
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        Schema::dropIfExists('users');
-    }
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		Schema::dropIfExists('users');
+	}
 }

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();

src/Modules/Acl/Database/Seeds/AclDatabaseSeeder.php

Indentation +14 added lines, -14 removed lines

@@ -6,18 +6,18 @@
 
 class AclDatabaseSeeder extends Seeder
 {
-    /**
-     * Run the database seeds.
-     *
-     * @return void
-     */
-    public function run()
-    {
-        $this->call(ClearDataSeeder::class);
-        $this->call(UsersTableSeeder::class);
-        $this->call(GroupsTableSeeder::class);
-        $this->call(PermissionsTableSeeder::class);
-        $this->call(OauthClientsTableSeeder::class);
-        $this->call(AssignRelationsSeeder::class);
-    }
+	/**
+	 * Run the database seeds.
+	 *
+	 * @return void
+	 */
+	public function run()
+	{
+		$this->call(ClearDataSeeder::class);
+		$this->call(UsersTableSeeder::class);
+		$this->call(GroupsTableSeeder::class);
+		$this->call(PermissionsTableSeeder::class);
+		$this->call(OauthClientsTableSeeder::class);
+		$this->call(AssignRelationsSeeder::class);
+	}
 }

src/Modules/Acl/Proxy/LoginProxy.php

Spacing +1 added lines, -1 removed lines

@@ -51,7 +51,7 @@
 
         $response = \ApiConsumer::post('/oauth/token', $data);
 
-        if (! $response->isSuccessful()) {
+        if ( ! $response->isSuccessful()) {
             if ($grantType == 'refresh_token') {
                 \ErrorHandler::invalidRefreshToken();
             }

Indentation +64 added lines, -64 removed lines

@@ -2,77 +2,77 @@
 
 class LoginProxy
 {
-    /**
-     * Attempt to create an access token using user credentials.
-     *
-     * @param  array   $credentials
-     * @param  boolean $adminLogin
-     * @return array
-     */
-    public function login($credentials, $adminLogin = false)
-    {
-        $user = \Core::users()->login($credentials, $adminLogin);
-        $tokens = $this->proxy('password', [
-            'username' => $credentials['email'],
-            'password' => $credentials['password']
-        ]);
+	/**
+	 * Attempt to create an access token using user credentials.
+	 *
+	 * @param  array   $credentials
+	 * @param  boolean $adminLogin
+	 * @return array
+	 */
+	public function login($credentials, $adminLogin = false)
+	{
+		$user = \Core::users()->login($credentials, $adminLogin);
+		$tokens = $this->proxy('password', [
+			'username' => $credentials['email'],
+			'password' => $credentials['password']
+		]);
 
-        return compact('user', 'tokens');
-    }
+		return compact('user', 'tokens');
+	}
 
-    /**
-     * Attempt to refresh the access token useing the given refresh token.
-     *
-     * @param  string $refreshToken
-     * @return array
-     */
-    public function refreshToken($refreshToken)
-    {
-        return $this->proxy('refresh_token', [
-            'refresh_token' => $refreshToken
-        ]);
-    }
+	/**
+	 * Attempt to refresh the access token useing the given refresh token.
+	 *
+	 * @param  string $refreshToken
+	 * @return array
+	 */
+	public function refreshToken($refreshToken)
+	{
+		return $this->proxy('refresh_token', [
+			'refresh_token' => $refreshToken
+		]);
+	}
 
-    /**
-     * Proxy a request to the OAuth server.
-     *
-     * @param string $grantType what type of grant type should be proxied
-     * @param array
-     */
-    public function proxy($grantType, array $data = [])
-    {
-        $data = array_merge($data, [
-            'client_id'     => config('skeleton.passport_client_id'),
-            'client_secret' => config('skeleton.passport_client_secret'),
-            'grant_type'    => $grantType
-        ]);
+	/**
+	 * Proxy a request to the OAuth server.
+	 *
+	 * @param string $grantType what type of grant type should be proxied
+	 * @param array
+	 */
+	public function proxy($grantType, array $data = [])
+	{
+		$data = array_merge($data, [
+			'client_id'     => config('skeleton.passport_client_id'),
+			'client_secret' => config('skeleton.passport_client_secret'),
+			'grant_type'    => $grantType
+		]);
 
-        $response = \ApiConsumer::post('/oauth/token', $data);
+		$response = \ApiConsumer::post('/oauth/token', $data);
 
-        if (! $response->isSuccessful()) {
-            if ($grantType == 'refresh_token') {
-                \ErrorHandler::invalidRefreshToken();
-            }
+		if (! $response->isSuccessful()) {
+			if ($grantType == 'refresh_token') {
+				\ErrorHandler::invalidRefreshToken();
+			}
 
-            \ErrorHandler::loginFailed();
-        }
+			\ErrorHandler::loginFailed();
+		}
 
-        $data = json_decode($response->getContent());
+		$data = json_decode($response->getContent());
 
-        return [
-            'access_token'  => $data->access_token,
-            'refresh_token' => $data->refresh_token,
-            'expires_in'    => $data->expires_in
-        ];
-    }
+		return [
+			'access_token'  => $data->access_token,
+			'refresh_token' => $data->refresh_token,
+			'expires_in'    => $data->expires_in
+		];
+	}
 
-    /**
-     * Logs out the user. We revoke access token and refresh token.
-     *
-     * @return void
-     */
-    public function logout()
-    {
-        \Core::users()->revokeAccessToken(\Auth::user()->token());
-    }
+	/**
+	 * Logs out the user. We revoke access token and refresh token.
+	 *
+	 * @return void
+	 */
+	public function logout()
+	{
+		\Core::users()->revokeAccessToken(\Auth::user()->token());
+	}
 }

src/Modules/Acl/ModelObservers/AclPermissionObserver.php

Indentation +49 added lines, -49 removed lines

@@ -6,53 +6,53 @@
 class AclPermissionObserver
 {
 
-    public function saving($model)
-    {
-        //
-    }
-
-    public function saved($model)
-    {
-        //
-    }
-
-    public function creating($model)
-    {
-        //
-    }
-
-    public function created($model)
-    {
-        //
-    }
-
-    public function updating($model)
-    {
-        //
-    }
-
-    public function updated($model)
-    {
-        //
-    }
-
-    public function deleting($model)
-    {
-        //
-    }
-
-    public function deleted($model)
-    {
-        //
-    }
-
-    public function restoring($model)
-    {
-        //
-    }
-
-    public function restored($model)
-    {
-        //
-    }
+	public function saving($model)
+	{
+		//
+	}
+
+	public function saved($model)
+	{
+		//
+	}
+
+	public function creating($model)
+	{
+		//
+	}
+
+	public function created($model)
+	{
+		//
+	}
+
+	public function updating($model)
+	{
+		//
+	}
+
+	public function updated($model)
+	{
+		//
+	}
+
+	public function deleting($model)
+	{
+		//
+	}
+
+	public function deleted($model)
+	{
+		//
+	}
+
+	public function restoring($model)
+	{
+		//
+	}
+
+	public function restored($model)
+	{
+		//
+	}
 }

src/Modules/Acl/ModelObservers/AclGroupObserver.php

Indentation +56 added lines, -56 removed lines

@@ -6,69 +6,69 @@
 class AclGroupObserver
 {
 
-    public function saving($model)
-    {
-        //
-    }
+	public function saving($model)
+	{
+		//
+	}
 
-    public function saved($model)
-    {
-        //
-    }
+	public function saved($model)
+	{
+		//
+	}
 
-    public function creating($model)
-    {
-        //
-    }
+	public function creating($model)
+	{
+		//
+	}
 
-    public function created($model)
-    {
-        //
-    }
+	public function created($model)
+	{
+		//
+	}
 
-    /**
-     * Prevent updating of the admin group.
-     *
-     * @param  object $model the model beign updated.
-     * @return void
-     */
-    public function updating($model)
-    {
-        if ($model->getOriginal('name') == 'Admin') {
-            \ErrorHandler::noPermissions();
-        }
-    }
+	/**
+	 * Prevent updating of the admin group.
+	 *
+	 * @param  object $model the model beign updated.
+	 * @return void
+	 */
+	public function updating($model)
+	{
+		if ($model->getOriginal('name') == 'Admin') {
+			\ErrorHandler::noPermissions();
+		}
+	}
 
-    public function updated($model)
-    {
-        //
-    }
+	public function updated($model)
+	{
+		//
+	}
 
-    /**
-     * Prevent deleting the admin group.
-     *
-     * @param  object $model the delted model.
-     * @return void
-     */
-    public function deleting($model)
-    {
-        if ($model->getOriginal('name') == 'Admin') {
-            \ErrorHandler::noPermissions();
-        }
-    }
+	/**
+	 * Prevent deleting the admin group.
+	 *
+	 * @param  object $model the delted model.
+	 * @return void
+	 */
+	public function deleting($model)
+	{
+		if ($model->getOriginal('name') == 'Admin') {
+			\ErrorHandler::noPermissions();
+		}
+	}
 
-    public function deleted($model)
-    {
-        //
-    }
+	public function deleted($model)
+	{
+		//
+	}
 
-    public function restoring($model)
-    {
-        //
-    }
+	public function restoring($model)
+	{
+		//
+	}
 
-    public function restored($model)
-    {
-        //
-    }
+	public function restored($model)
+	{
+		//
+	}
 }

src/Modules/Acl/ModelObservers/OauthClientObserver.php

Indentation +49 added lines, -49 removed lines

@@ -8,53 +8,53 @@
 class OauthClientObserver
 {
 
-    public function saving($model)
-    {
-        //
-    }
-
-    public function saved($model)
-    {
-        //
-    }
-
-    public function creating($model)
-    {
-        $model->secret = Str::random(40);
-    }
-
-    public function created($model)
-    {
-        //
-    }
-
-    public function updating($model)
-    {
-        //
-    }
-
-    public function updated($model)
-    {
-        //
-    }
-
-    public function deleting($model)
-    {
-        //
-    }
-
-    public function deleted($model)
-    {
-        //
-    }
-
-    public function restoring($model)
-    {
-        //
-    }
-
-    public function restored($model)
-    {
-        //
-    }
+	public function saving($model)
+	{
+		//
+	}
+
+	public function saved($model)
+	{
+		//
+	}
+
+	public function creating($model)
+	{
+		$model->secret = Str::random(40);
+	}
+
+	public function created($model)
+	{
+		//
+	}
+
+	public function updating($model)
+	{
+		//
+	}
+
+	public function updated($model)
+	{
+		//
+	}
+
+	public function deleting($model)
+	{
+		//
+	}
+
+	public function deleted($model)
+	{
+		//
+	}
+
+	public function restoring($model)
+	{
+		//
+	}
+
+	public function restored($model)
+	{
+		//
+	}
 }