SherifElfadaly / Laravel-Api-Skeleton

src/Modules/Core/Providers/ModuleServiceProvider.php

Indentation +46 added lines, -46 removed lines

@@ -6,51 +6,51 @@
 
 class ModuleServiceProvider extends ServiceProvider
 {
-    /**
-     * Bootstrap the module services.
-     *
-     * @return void
-     */
-    public function boot()
-    {
-        $this->loadTranslationsFrom(__DIR__.'/../Resources/Lang', 'core');
-        $this->loadViewsFrom(__DIR__.'/../Resources/Views', 'core');
-
-        $this->loadMigrationsFrom(module_path('core', 'Database/Migrations', 'app'));
-        $this->loadFactoriesFrom(module_path('core', 'Database/Factories', 'app'));
-        if (!$this->app->configurationIsCached()) {
-            $this->loadConfigsFrom(module_path('core', 'Config', 'app'));
-        }
-    }
-
-    /**
-     * Register the module services.
-     *
-     * @return void
-     */
-    public function register()
-    {
-        //Bind Core Facade to the Service Container
-        $this->app->singleton('Core', function () {
-            return new \App\Modules\Core\Core;
-        });
-
-        //Bind Errors Facade to the Service Container
-        $this->app->singleton('Errors', function () {
-            return new \App\Modules\Core\Errors\Errors;
-        });
-
-        //Bind Media Facade to the Service Container
-        $this->app->singleton('Media', function () {
-            return new \App\Modules\Core\Utl\Media;
-        });
-
-        //Bind ApiConsumer Facade to the Service Container
-        $this->app->singleton('ApiConsumer', function () {
-            $app = app();
-            return new \App\Modules\Core\Utl\ApiConsumer($app, $app['request'], $app['router']);
-        });
+	/**
+	 * Bootstrap the module services.
+	 *
+	 * @return void
+	 */
+	public function boot()
+	{
+		$this->loadTranslationsFrom(__DIR__.'/../Resources/Lang', 'core');
+		$this->loadViewsFrom(__DIR__.'/../Resources/Views', 'core');
+
+		$this->loadMigrationsFrom(module_path('core', 'Database/Migrations', 'app'));
+		$this->loadFactoriesFrom(module_path('core', 'Database/Factories', 'app'));
+		if (!$this->app->configurationIsCached()) {
+			$this->loadConfigsFrom(module_path('core', 'Config', 'app'));
+		}
+	}
+
+	/**
+	 * Register the module services.
+	 *
+	 * @return void
+	 */
+	public function register()
+	{
+		//Bind Core Facade to the Service Container
+		$this->app->singleton('Core', function () {
+			return new \App\Modules\Core\Core;
+		});
+
+		//Bind Errors Facade to the Service Container
+		$this->app->singleton('Errors', function () {
+			return new \App\Modules\Core\Errors\Errors;
+		});
+
+		//Bind Media Facade to the Service Container
+		$this->app->singleton('Media', function () {
+			return new \App\Modules\Core\Utl\Media;
+		});
+
+		//Bind ApiConsumer Facade to the Service Container
+		$this->app->singleton('ApiConsumer', function () {
+			$app = app();
+			return new \App\Modules\Core\Utl\ApiConsumer($app, $app['request'], $app['router']);
+		});
         
-        $this->app->register(RouteServiceProvider::class);
-    }
+		$this->app->register(RouteServiceProvider::class);
+	}
 }

Spacing +5 added lines, -5 removed lines

@@ -18,7 +18,7 @@ 
 
         $this->loadMigrationsFrom(module_path('core', 'Database/Migrations', 'app'));
         $this->loadFactoriesFrom(module_path('core', 'Database/Factories', 'app'));
-        if (!$this->app->configurationIsCached()) {
+        if ( ! $this->app->configurationIsCached()) {
             $this->loadConfigsFrom(module_path('core', 'Config', 'app'));
         }
     }
@@ -31,22 +31,22 @@ 
     public function register()
     {
         //Bind Core Facade to the Service Container
-        $this->app->singleton('Core', function () {
+        $this->app->singleton('Core', function() {
             return new \App\Modules\Core\Core;
         });
 
         //Bind Errors Facade to the Service Container
-        $this->app->singleton('Errors', function () {
+        $this->app->singleton('Errors', function() {
             return new \App\Modules\Core\Errors\Errors;
         });
 
         //Bind Media Facade to the Service Container
-        $this->app->singleton('Media', function () {
+        $this->app->singleton('Media', function() {
             return new \App\Modules\Core\Utl\Media;
         });
 
         //Bind ApiConsumer Facade to the Service Container
-        $this->app->singleton('ApiConsumer', function () {
+        $this->app->singleton('ApiConsumer', function() {
             $app = app();
             return new \App\Modules\Core\Utl\ApiConsumer($app, $app['request'], $app['router']);
         });

src/Modules/Core/Console/Commands/Stubs/Module/Providers/ModuleServiceProvider.php

Indentation +24 added lines, -24 removed lines

@@ -6,30 +6,30 @@
 
 class ModuleServiceProvider extends ServiceProvider
 {
-    /**
-     * Bootstrap the module services.
-     *
-     * @return void
-     */
-    public function boot()
-    {
-        $this->loadTranslationsFrom(__DIR__.'/../Resources/Lang', 'DummyModuleSlug');
-        $this->loadViewsFrom(__DIR__.'/../Resources/Views', 'DummyModuleSlug');
+	/**
+	 * Bootstrap the module services.
+	 *
+	 * @return void
+	 */
+	public function boot()
+	{
+		$this->loadTranslationsFrom(__DIR__.'/../Resources/Lang', 'DummyModuleSlug');
+		$this->loadViewsFrom(__DIR__.'/../Resources/Views', 'DummyModuleSlug');
 
-        $this->loadMigrationsFrom(module_path('DummyModuleSlug', 'Database/Migrations', 'app'));
-        $this->loadFactoriesFrom(module_path('DummyModuleSlug', 'Database/Factories', 'app'));
-        if (!$this->app->configurationIsCached()) {
-            $this->loadConfigsFrom(module_path('DummyModuleSlug', 'Config', 'app'));
-        }
-    }
+		$this->loadMigrationsFrom(module_path('DummyModuleSlug', 'Database/Migrations', 'app'));
+		$this->loadFactoriesFrom(module_path('DummyModuleSlug', 'Database/Factories', 'app'));
+		if (!$this->app->configurationIsCached()) {
+			$this->loadConfigsFrom(module_path('DummyModuleSlug', 'Config', 'app'));
+		}
+	}
 
-    /**
-     * Register the module services.
-     *
-     * @return void
-     */
-    public function register()
-    {
-        $this->app->register(RouteServiceProvider::class);
-    }
+	/**
+	 * Register the module services.
+	 *
+	 * @return void
+	 */
+	public function register()
+	{
+		$this->app->register(RouteServiceProvider::class);
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -18,7 +18,7 @@
 
         $this->loadMigrationsFrom(module_path('DummyModuleSlug', 'Database/Migrations', 'app'));
         $this->loadFactoriesFrom(module_path('DummyModuleSlug', 'Database/Factories', 'app'));
-        if (!$this->app->configurationIsCached()) {
+        if ( ! $this->app->configurationIsCached()) {
             $this->loadConfigsFrom(module_path('DummyModuleSlug', 'Config', 'app'));
         }
     }

src/Modules/Core/Routes/web.php

Indentation +1 added lines, -1 removed lines

@@ -11,5 +11,5 @@
 |
 */
 if (\App::environment('local')) {
-    Route::get('/docs', 'ApiDocumentController@index');
+	Route::get('/docs', 'ApiDocumentController@index');
 }

src/Modules/Permissions/Providers/ModuleServiceProvider.php

Indentation +24 added lines, -24 removed lines

@@ -6,30 +6,30 @@
 
 class ModuleServiceProvider extends ServiceProvider
 {
-    /**
-     * Bootstrap the module services.
-     *
-     * @return void
-     */
-    public function boot()
-    {
-        $this->loadTranslationsFrom(__DIR__.'/../Resources/Lang', 'permissions');
-        $this->loadViewsFrom(__DIR__.'/../Resources/Views', 'permissions');
+	/**
+	 * Bootstrap the module services.
+	 *
+	 * @return void
+	 */
+	public function boot()
+	{
+		$this->loadTranslationsFrom(__DIR__.'/../Resources/Lang', 'permissions');
+		$this->loadViewsFrom(__DIR__.'/../Resources/Views', 'permissions');
 
-        $this->loadMigrationsFrom(module_path('permissions', 'Database/Migrations', 'app'));
-        $this->loadFactoriesFrom(module_path('permissions', 'Database/Factories', 'app'));
-        if (!$this->app->configurationIsCached()) {
-            $this->loadConfigsFrom(module_path('permissions', 'Config', 'app'));
-        }
-    }
+		$this->loadMigrationsFrom(module_path('permissions', 'Database/Migrations', 'app'));
+		$this->loadFactoriesFrom(module_path('permissions', 'Database/Factories', 'app'));
+		if (!$this->app->configurationIsCached()) {
+			$this->loadConfigsFrom(module_path('permissions', 'Config', 'app'));
+		}
+	}
 
-    /**
-     * Register the module services.
-     *
-     * @return void
-     */
-    public function register()
-    {
-        $this->app->register(RouteServiceProvider::class);
-    }
+	/**
+	 * Register the module services.
+	 *
+	 * @return void
+	 */
+	public function register()
+	{
+		$this->app->register(RouteServiceProvider::class);
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -18,7 +18,7 @@
 
         $this->loadMigrationsFrom(module_path('permissions', 'Database/Migrations', 'app'));
         $this->loadFactoriesFrom(module_path('permissions', 'Database/Factories', 'app'));
-        if (!$this->app->configurationIsCached()) {
+        if ( ! $this->app->configurationIsCached()) {
             $this->loadConfigsFrom(module_path('permissions', 'Config', 'app'));
         }
     }

src/Modules/Users/Providers/ModuleServiceProvider.php

Indentation +24 added lines, -24 removed lines

@@ -6,30 +6,30 @@
 
 class ModuleServiceProvider extends ServiceProvider
 {
-    /**
-     * Bootstrap the module services.
-     *
-     * @return void
-     */
-    public function boot()
-    {
-        $this->loadTranslationsFrom(__DIR__.'/../Resources/Lang', 'users');
-        $this->loadViewsFrom(__DIR__.'/../Resources/Views', 'users');
+	/**
+	 * Bootstrap the module services.
+	 *
+	 * @return void
+	 */
+	public function boot()
+	{
+		$this->loadTranslationsFrom(__DIR__.'/../Resources/Lang', 'users');
+		$this->loadViewsFrom(__DIR__.'/../Resources/Views', 'users');
 
-        $this->loadMigrationsFrom(module_path('users', 'Database/Migrations', 'app'));
-        $this->loadFactoriesFrom(module_path('users', 'Database/Factories', 'app'));
-        if (!$this->app->configurationIsCached()) {
-            $this->loadConfigsFrom(module_path('users', 'Config', 'app'));
-        }
-    }
+		$this->loadMigrationsFrom(module_path('users', 'Database/Migrations', 'app'));
+		$this->loadFactoriesFrom(module_path('users', 'Database/Factories', 'app'));
+		if (!$this->app->configurationIsCached()) {
+			$this->loadConfigsFrom(module_path('users', 'Config', 'app'));
+		}
+	}
 
-    /**
-     * Register the module services.
-     *
-     * @return void
-     */
-    public function register()
-    {
-        $this->app->register(RouteServiceProvider::class);
-    }
+	/**
+	 * Register the module services.
+	 *
+	 * @return void
+	 */
+	public function register()
+	{
+		$this->app->register(RouteServiceProvider::class);
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -18,7 +18,7 @@
 
         $this->loadMigrationsFrom(module_path('users', 'Database/Migrations', 'app'));
         $this->loadFactoriesFrom(module_path('users', 'Database/Factories', 'app'));
-        if (!$this->app->configurationIsCached()) {
+        if ( ! $this->app->configurationIsCached()) {
             $this->loadConfigsFrom(module_path('users', 'Config', 'app'));
         }
     }

src/Modules/Reporting/Report.php

Indentation +11 added lines, -11 removed lines

@@ -9,16 +9,16 @@
 class Report extends Model
 {
 
-    use SoftDeletes;
-    protected $table = 'reports';
-    protected $dates = ['created_at', 'updated_at', 'deleted_at'];
-    protected $hidden = ['deleted_at'];
-    protected $guarded = ['id'];
-    public $fillable = ['report_name', 'view_name'];
+	use SoftDeletes;
+	protected $table = 'reports';
+	protected $dates = ['created_at', 'updated_at', 'deleted_at'];
+	protected $hidden = ['deleted_at'];
+	protected $guarded = ['id'];
+	public $fillable = ['report_name', 'view_name'];
     
-    public static function boot()
-    {
-        parent::boot();
-        Report::observe(ReportObserver::class);
-    }
+	public static function boot()
+	{
+		parent::boot();
+		Report::observe(ReportObserver::class);
+	}
 }

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

Indentation +24 added lines, -24 removed lines

@@ -5,29 +5,29 @@
 
 class Reports extends Migration
 {
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        Schema::create('reports', function (Blueprint $table) {
-            increments('id');
-            $table->string('report_name', 100);
-            $table->string('view_name', 100);
-            $table->softDeletes();
-            $table->timestamps();
-        });
-    }
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		Schema::create('reports', function (Blueprint $table) {
+			increments('id');
+			$table->string('report_name', 100);
+			$table->string('view_name', 100);
+			$table->softDeletes();
+			$table->timestamps();
+		});
+	}
 
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        Schema::dropIfExists('reports');
-    }
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		Schema::dropIfExists('reports');
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -12,7 +12,7 @@
      */
     public function up()
     {
-        Schema::create('reports', function (Blueprint $table) {
+        Schema::create('reports', function(Blueprint $table) {
             increments('id');
             $table->string('report_name', 100);
             $table->string('view_name', 100);

src/Modules/Users/AclUser.php

Indentation +107 added lines, -107 removed lines

@@ -12,112 +12,112 @@
 
 class AclUser extends User
 {
-    use SoftDeletes, HasApiTokens;
-    protected $table = 'users';
-    protected $dates = ['created_at', 'updated_at', 'deleted_at'];
-    protected $hidden = ['password', 'remember_token', 'deleted_at'];
-    protected $guarded = ['id'];
-    public $fillable = ['profile_picture', 'name', 'email', 'password', 'locale', 'timezone'];
-
-    /**
-     * Encrypt the password attribute before
-     * saving it in the storage.
-     *
-     * @param string $value
-     */
-    public function setPasswordAttribute($value)
-    {
-        $this->attributes['password'] = \Hash::make($value);
-    }
-
-    /**
-     * Get the entity's notifications.
-     */
-    public function notifications()
-    {
-        return $this->morphMany(Notification::class, 'notifiable')->orderBy('created_at', 'desc');
-    }
-
-    /**
-     * Get the entity's read notifications.
-     */
-    public function readNotifications()
-    {
-        return $this->notifications()->whereNotNull('read_at');
-    }
-
-    /**
-     * Get the entity's unread notifications.
-     */
-    public function unreadNotifications()
-    {
-        return $this->notifications()->whereNull('read_at');
-    }
-
-    public function roles()
-    {
-        return $this->belongsToMany(Role::class, 'role_user', 'user_id', 'role_id')->whereNull('role_user.deleted_at')->withTimestamps();
-    }
-
-    public function oauthClients()
-    {
-        return $this->hasMany(OauthClient::class, 'user_id');
-    }
-
-    public function setProfilePictureAttribute($value) {
-        $this->attributes['profile_picture'] = \Media::uploadImageBas64($value, 'users/profile_pictures');
-    }
-
-    /**
-     * Return fcm device tokens that will be used in sending fcm notifications.
-     *
-     * @return array
-     */
-    public function routeNotificationForFCM()
-    {
-        $devices = \Core::pushNotificationDevices()->findBy(['user_id' => $this->id]);
-        $tokens  = [];
-
-        foreach ($devices as $device) {
-            if (\Core::oauthClients()->accessTokenExpiredOrRevoked($device->access_token)) {
-                $device->forceDelete();
-                continue;
-            }
-
-            $tokens[] = $device->device_token;
-        }
-
-        return $tokens;
-    }
-
-    /**
-     * The channels the user receives notification broadcasts on.
-     *
-     * @return string
-     */
-    public function receivesBroadcastNotificationsOn()
-    {
-        return 'users.'.$this->id;
-    }
-
-    /**
-     * Custom password validation.
-     *
-     * @param  string $password
-     * @return boolean
-     */
-    public function validateForPassportPasswordGrant($password)
-    {
-        if ($password == config('user.social_pass')) {
-            return true;
-        }
-
-        return \Hash::check($password, $this->password);
-    }
+	use SoftDeletes, HasApiTokens;
+	protected $table = 'users';
+	protected $dates = ['created_at', 'updated_at', 'deleted_at'];
+	protected $hidden = ['password', 'remember_token', 'deleted_at'];
+	protected $guarded = ['id'];
+	public $fillable = ['profile_picture', 'name', 'email', 'password', 'locale', 'timezone'];
+
+	/**
+	 * Encrypt the password attribute before
+	 * saving it in the storage.
+	 *
+	 * @param string $value
+	 */
+	public function setPasswordAttribute($value)
+	{
+		$this->attributes['password'] = \Hash::make($value);
+	}
+
+	/**
+	 * Get the entity's notifications.
+	 */
+	public function notifications()
+	{
+		return $this->morphMany(Notification::class, 'notifiable')->orderBy('created_at', 'desc');
+	}
+
+	/**
+	 * Get the entity's read notifications.
+	 */
+	public function readNotifications()
+	{
+		return $this->notifications()->whereNotNull('read_at');
+	}
+
+	/**
+	 * Get the entity's unread notifications.
+	 */
+	public function unreadNotifications()
+	{
+		return $this->notifications()->whereNull('read_at');
+	}
+
+	public function roles()
+	{
+		return $this->belongsToMany(Role::class, 'role_user', 'user_id', 'role_id')->whereNull('role_user.deleted_at')->withTimestamps();
+	}
+
+	public function oauthClients()
+	{
+		return $this->hasMany(OauthClient::class, 'user_id');
+	}
+
+	public function setProfilePictureAttribute($value) {
+		$this->attributes['profile_picture'] = \Media::uploadImageBas64($value, 'users/profile_pictures');
+	}
+
+	/**
+	 * Return fcm device tokens that will be used in sending fcm notifications.
+	 *
+	 * @return array
+	 */
+	public function routeNotificationForFCM()
+	{
+		$devices = \Core::pushNotificationDevices()->findBy(['user_id' => $this->id]);
+		$tokens  = [];
+
+		foreach ($devices as $device) {
+			if (\Core::oauthClients()->accessTokenExpiredOrRevoked($device->access_token)) {
+				$device->forceDelete();
+				continue;
+			}
+
+			$tokens[] = $device->device_token;
+		}
+
+		return $tokens;
+	}
+
+	/**
+	 * The channels the user receives notification broadcasts on.
+	 *
+	 * @return string
+	 */
+	public function receivesBroadcastNotificationsOn()
+	{
+		return 'users.'.$this->id;
+	}
+
+	/**
+	 * Custom password validation.
+	 *
+	 * @param  string $password
+	 * @return boolean
+	 */
+	public function validateForPassportPasswordGrant($password)
+	{
+		if ($password == config('user.social_pass')) {
+			return true;
+		}
+
+		return \Hash::check($password, $this->password);
+	}
     
-    public static function boot()
-    {
-        parent::boot();
-        AclUser::observe(AclUserObserver::class);
-    }
+	public static function boot()
+	{
+		parent::boot();
+		AclUser::observe(AclUserObserver::class);
+	}
 }

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

Indentation +32 added lines, -32 removed lines

@@ -5,37 +5,37 @@
 
 class Users extends Migration
 {
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        Schema::create('users', function (Blueprint $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) {
+			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();
+		});
+	}
 
-    /**
-     * 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) {
             increments('id');
             $table->string('profile_picture', 150)->nullable();
             $table->string('name', 100)->nullable();