SherifElfadaly / Laravel-Api-Skeleton

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

Spacing +3 added lines, -3 removed lines

@@ -34,9 +34,9 @@ 
 		$this->validationRules     = property_exists($this, 'validationRules') ? $this->validationRules : false;
 		$this->skipPermissionCheck = property_exists($this, 'skipPermissionCheck') ? $this->skipPermissionCheck : [];
 		$this->skipLoginCheck      = property_exists($this, 'skipLoginCheck') ? $this->skipLoginCheck : [];
-		$route                     = explode('@',\Route::currentRouteAction())[1];
+		$route                     = explode('@', \Route::currentRouteAction())[1];
 
-		$this->middleware(function ($request, $next) {
+		$this->middleware(function($request, $next) {
             
 			$this->repo = call_user_func_array("\Core::{$this->model}", []);            
 			return $next($request);
@@ -229,7 +229,7 @@ 
 
 			if ($isPasswordClient && (in_array($permission, $this->skipPermissionCheck) || \Core::users()->can($permission, $this->model)))
 			{}
-			elseif ( ! $isPasswordClient && $user->tokenCan($this->model . '-' . $permission)) 
+			elseif ( ! $isPasswordClient && $user->tokenCan($this->model.'-'.$permission)) 
 			{}
 			else
 			{

Braces +3 added lines, -6 removed lines

@@ -157,8 +157,7 @@ 
 			if ($request->has('id')) 
 			{
 				$rule = str_replace('{id}', $request->get('id'), $rule);
-			}
-			else
+			} else
 			{
 				$rule = str_replace(',{id}', '', $rule);
 			}
@@ -228,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/Core/Http/Controllers/SettingsController.php

Spacing +2 added lines, -2 removed lines

@@ -13,14 +13,14 @@
 	 * to preform actions like (add, edit ... etc).
 	 * @var string
 	 */
-	protected $model               = 'settings';
+	protected $model = 'settings';
 
 	/**
 	 * The validations rules used by the base api controller
 	 * to check before add.
 	 * @var array
 	 */
-	protected $validationRules  = [
+	protected $validationRules = [
 		'id'    => 'required|exists:settings,id',
 		'value' => 'required|string'
 	];

src/Modules/Core/Utl/Media.php

Spacing +10 added lines, -10 removed lines

@@ -11,13 +11,13 @@ 
 	 */
 	public function uploadImage($image, $dir) 
 	{
-	   $imageName       =  str_slug('image' . uniqid() . time() . '_' . $image->getClientOriginalName());
-	   $destinationPath = 'media' . DIRECTORY_SEPARATOR . $dir . DIRECTORY_SEPARATOR;
+	   $imageName       = str_slug('image'.uniqid().time().'_'.$image->getClientOriginalName());
+	   $destinationPath = 'media'.DIRECTORY_SEPARATOR.$dir.DIRECTORY_SEPARATOR;
 
 	   ! file_exists($destinationPath) ? \File::makeDirectory($destinationPath) : false;
 	   $image->move($destinationPath, $imageName);
 
-	   return url($destinationPath . $imageName);
+	   return url($destinationPath.$imageName);
 	}
 
 	/**
@@ -29,20 +29,20 @@ 
 	 */
 	public function uploadImageBas64($image, $dir) 
 	{
-		if (! strlen($image)) 
+		if ( ! strlen($image)) 
 		{
 			return null;
 		}
         
-		$imageName       = 'image' . uniqid() . time() . '.jpg';
-		$destinationPath = 'media' . DIRECTORY_SEPARATOR . $dir . DIRECTORY_SEPARATOR;
+		$imageName       = 'image'.uniqid().time().'.jpg';
+		$destinationPath = 'media'.DIRECTORY_SEPARATOR.$dir.DIRECTORY_SEPARATOR;
 
 		! file_exists($destinationPath) ? \File::makeDirectory($destinationPath) : false;
 
-		$base  = base64_decode(preg_replace('#^data:image/\w+;base64,#i', '', $image));
-		\Image::make($base)->save($destinationPath . $imageName);
+		$base = base64_decode(preg_replace('#^data:image/\w+;base64,#i', '', $image));
+		\Image::make($base)->save($destinationPath.$imageName);
 
-		return url($destinationPath . $imageName);
+		return url($destinationPath.$imageName);
 	}
 
 	/**
@@ -55,7 +55,7 @@ 
 	public function deleteImage($path, $dir) 
 	{   
 		$arr      = explode('/', $path);
-		$path     = 'media' . DIRECTORY_SEPARATOR . $dir . DIRECTORY_SEPARATOR . end($arr);
+		$path     = 'media'.DIRECTORY_SEPARATOR.$dir.DIRECTORY_SEPARATOR.end($arr);
 		if (\File::exists($path)) 
 		{
 			\File::delete($path);

src/Modules/Core/Database/Factories/SettingFactory.php

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 
-$factory->define(App\Modules\Core\Settings::class, function (Faker\Generator $faker) {
+$factory->define(App\Modules\Core\Settings::class, function(Faker\Generator $faker) {
 	return [
 		'name'       => $faker->randomElement(['Company Name', 'Title', 'Header Image']),
 		'value'      => $faker->word(),

src/Modules/Core/Database/Seeds/AssignRelationsSeeder.php

Spacing +1 added lines, -1 removed lines

@@ -18,7 +18,7 @@
 		/**
 		 * Assign the permissions to the admin group.
 		 */
-		\DB::table('permissions')->orderBy('created_at', 'asc')->whereIn('model', ['settings'])->each(function ($permission) use ($adminGroupId) {
+		\DB::table('permissions')->orderBy('created_at', 'asc')->whereIn('model', ['settings'])->each(function($permission) use ($adminGroupId) {
 			\DB::table('groups_permissions')->insert(
 				[
 				'permission_id' => $permission->id,

src/Modules/Core/Database/Migrations/2016_01_24_123630_settings.php

Spacing +3 added lines, -3 removed lines

@@ -12,10 +12,10 @@
 	 */
 	public function up()
 	{
-		Schema::create('settings', function (Blueprint $table) {
+		Schema::create('settings', function(Blueprint $table) {
 			$table->increments('id');
-			$table->string('name',100);
-			$table->string('key',100)->unique();
+			$table->string('name', 100);
+			$table->string('key', 100)->unique();
 			$table->text('value')->nullable();
 			$table->softDeletes();
 			$table->timestamps();

src/Modules/Acl/AclPermission.php

Spacing +1 added lines, -1 removed lines

@@ -30,7 +30,7 @@
     
 	public function groups()
 	{
-		return $this->belongsToMany('\App\Modules\Acl\AclGroup','groups_permissions','permission_id','group_id')->whereNull('groups_permissions.deleted_at')->withTimestamps();
+		return $this->belongsToMany('\App\Modules\Acl\AclGroup', 'groups_permissions', 'permission_id', 'group_id')->whereNull('groups_permissions.deleted_at')->withTimestamps();
 	}
 
 	public static function boot()

src/Modules/Acl/ModelObservers/AclUserObserver.php

Spacing +1 added lines, -1 removed lines

@@ -34,7 +34,7 @@
 	{
 		if ($model->isDirty('blocked') && $model->blocked) 
 		{
-			$model->tokens()->each(function($token){
+			$model->tokens()->each(function($token) {
 
 				\Core::users()->revokeAccessToken($token);
 

src/Modules/Acl/AclUser.php

Spacing +3 added lines, -3 removed lines

@@ -10,7 +10,7 @@ 
 	use SoftDeletes, HasApiTokens;
 	protected $table    = 'users';
 	protected $dates    = ['created_at', 'updated_at', 'deleted_at'];
-	protected $hidden   = ['password', 'remember_token','deleted_at'];
+	protected $hidden   = ['password', 'remember_token', 'deleted_at'];
 	protected $guarded  = ['id'];
 	protected $fillable = ['profile_picture', 'name', 'email', 'password'];
 	public $searchable  = ['name', 'email'];
@@ -67,7 +67,7 @@ 
 
 	public function groups()
 	{
-		return $this->belongsToMany('\App\Modules\Acl\AclGroup','users_groups','user_id','group_id')->whereNull('users_groups.deleted_at')->withTimestamps();
+		return $this->belongsToMany('\App\Modules\Acl\AclGroup', 'users_groups', 'user_id', 'group_id')->whereNull('users_groups.deleted_at')->withTimestamps();
 	}
 
 	public function oauthClients()
@@ -114,7 +114,7 @@ 
 	 */
 	public function receivesBroadcastNotificationsOn()
 	{
-		return 'users.' . $this->id;
+		return 'users.'.$this->id;
 	}
 
 	/**

Braces +1 added lines, -2 removed lines

@@ -97,8 +97,7 @@
 				}
 
 				$tokens[] = $device->device_token;
-			} 
-			catch (\Exception $e) 
+			} catch (\Exception $e) 
 			{
 				$device->forceDelete();
 			}