SherifElfadaly / Laravel-Api-Skeleton

src/Modules/Acl/Repositories/GroupRepository.php

Indentation +1 added lines, -1 removed lines

@@ -29,6 +29,6 @@
 			$group->permissions()->attach($permissionIds);
 		});
 
-        return $this->find($groupId);
+		return $this->find($groupId);
 	}
 }

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/Acl/Repositories/OauthClientRepository.php

Indentation +31 added lines, -31 removed lines

@@ -4,37 +4,37 @@
 
 class OauthClientRepository extends AbstractRepository
 {
-    /**
-     * Return the model full namespace.
-     * 
-     * @return string
-     */
-    protected function getModel()
-    {
-        return 'App\Modules\Acl\OauthClient';
-    }
+	/**
+	 * Return the model full namespace.
+	 * 
+	 * @return string
+	 */
+	protected function getModel()
+	{
+		return 'App\Modules\Acl\OauthClient';
+	}
 
-    /**
-     * Revoke the given client.
-     *
-     * @param  integer  $clientId
-     * @return void
-     */
-    public function revoke($clientId)
-    {
-        $client = $this->find($clientId);
-        $client->tokens()->update(['revoked' => true]);
-        $this->save(['id'=> $clientId, 'revoked' => true]);
-    }
+	/**
+	 * Revoke the given client.
+	 *
+	 * @param  integer  $clientId
+	 * @return void
+	 */
+	public function revoke($clientId)
+	{
+		$client = $this->find($clientId);
+		$client->tokens()->update(['revoked' => true]);
+		$this->save(['id'=> $clientId, 'revoked' => true]);
+	}
 
-    /**
-     * Un revoke the given client.
-     *
-     * @param  integer  $clientId
-     * @return void
-     */
-    public function unRevoke($clientId)
-    {
-        $this->save(['id'=> $clientId, 'revoked' => false]);
-    }
+	/**
+	 * Un revoke the given client.
+	 *
+	 * @param  integer  $clientId
+	 * @return void
+	 */
+	public function unRevoke($clientId)
+	{
+		$this->save(['id'=> $clientId, 'revoked' => false]);
+	}
 }

src/Modules/Core/Utl/CoreConfig.php

Indentation +4 added lines, -4 removed lines

@@ -2,9 +2,9 @@ 
 
 class CoreConfig
 {
-    public function getConfig()
-    {
-        return [
+	public function getConfig()
+	{
+		return [
 			/**
 			 * Specify what relations should be used for every model.
 			 */
@@ -133,5 +133,5 @@ 
 				]
 			]
 		];
-    }
+	}
 }
\ No newline at end of file

src/Modules/Core/Utl/Media.php

Indentation +55 added lines, -55 removed lines

@@ -2,67 +2,67 @@
 
 class Media
 {
-    /**
-     * Upload the given image.
-     * 
-     * @param  object  $image
-     * @param  string  $dir
-     * @return string
-     */
-    public function uploadImage($image, $dir) 
-    {
-       $response        = [];
-       $image           = $image;
-       $imageName       =  str_slug('image' . uniqid() . time() . '_' . $image->getClientOriginalName());
-       $destinationPath = 'media' . DIRECTORY_SEPARATOR . $dir . DIRECTORY_SEPARATOR;
+	/**
+	 * Upload the given image.
+	 * 
+	 * @param  object  $image
+	 * @param  string  $dir
+	 * @return string
+	 */
+	public function uploadImage($image, $dir) 
+	{
+	   $response        = [];
+	   $image           = $image;
+	   $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);
+	   ! file_exists($destinationPath) ? \File::makeDirectory($destinationPath) : false;
+	   $image->move($destinationPath, $imageName);
 
-       return url($destinationPath . $imageName);
-    }
+	   return url($destinationPath . $imageName);
+	}
 
-    /**
-     * Upload the given image.
-     * 
-     * @param  object  $image
-     * @param  string  $dir
-     * @return string
-     */
-    public function uploadImageBas64($image, $dir) 
-    {
-        if (! strlen($image)) 
-        {
-            return null;
-        }
+	/**
+	 * Upload the given image.
+	 * 
+	 * @param  object  $image
+	 * @param  string  $dir
+	 * @return string
+	 */
+	public function uploadImageBas64($image, $dir) 
+	{
+		if (! strlen($image)) 
+		{
+			return null;
+		}
         
-        $response        = [];
-        $image           = $image;
-        $imageName       = 'image' . uniqid() . time() . '.jpg';
-        $destinationPath = 'media' . DIRECTORY_SEPARATOR . $dir . DIRECTORY_SEPARATOR;
+		$response        = [];
+		$image           = $image;
+		$imageName       = 'image' . uniqid() . time() . '.jpg';
+		$destinationPath = 'media' . DIRECTORY_SEPARATOR . $dir . DIRECTORY_SEPARATOR;
 
-        ! file_exists($destinationPath) ? \File::makeDirectory($destinationPath) : false;
+		! file_exists($destinationPath) ? \File::makeDirectory($destinationPath) : false;
 
-        $base  = base64_decode(preg_replace('#^data:image/\w+;base64,#i', '', $image));
-        $image = \Image::make($base)->save($destinationPath . $imageName);
+		$base  = base64_decode(preg_replace('#^data:image/\w+;base64,#i', '', $image));
+		$image = \Image::make($base)->save($destinationPath . $imageName);
 
-        return url($destinationPath . $imageName);
-    }
+		return url($destinationPath . $imageName);
+	}
 
-    /**
-     * Delete the given image.
-     * 
-     * @param  object  $path
-     * @param  string  $dir
-     * @return void
-     */
-    public function deleteImage($path, $dir) 
-    {   
-        $arr      = explode('/', $path);
-        $path     = 'media' . DIRECTORY_SEPARATOR . $dir . DIRECTORY_SEPARATOR . end($arr);
-        if (\File::exists($path)) 
-        {
-            \File::delete($path);
-        }
-    }
+	/**
+	 * Delete the given image.
+	 * 
+	 * @param  object  $path
+	 * @param  string  $dir
+	 * @return void
+	 */
+	public function deleteImage($path, $dir) 
+	{   
+		$arr      = explode('/', $path);
+		$path     = 'media' . DIRECTORY_SEPARATOR . $dir . DIRECTORY_SEPARATOR . end($arr);
+		if (\File::exists($path)) 
+		{
+			\File::delete($path);
+		}
+	}
 }

Spacing +9 added lines, -9 removed lines

@@ -13,13 +13,13 @@ 
     {
        $response        = [];
        $image           = $image;
-       $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);
     }
 
     /**
@@ -31,22 +31,22 @@ 
      */
     public function uploadImageBas64($image, $dir) 
     {
-        if (! strlen($image)) 
+        if ( ! strlen($image)) 
         {
             return null;
         }
         
         $response        = [];
         $image           = $image;
-        $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 = \Image::make($base)->save($destinationPath . $imageName);
+        $image = \Image::make($base)->save($destinationPath.$imageName);
 
-        return url($destinationPath . $imageName);
+        return url($destinationPath.$imageName);
     }
 
     /**
@@ -59,7 +59,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/Utl/ErrorHandler.php

Indentation +113 added lines, -113 removed lines

@@ -2,117 +2,117 @@
 
 class ErrorHandler
 {
-    public function unAuthorized()
-    {
-        $error = ['status' => 401, 'message' => trans('errors.unAuthorized')];
-        abort($error['status'], $error['message']);
-    }
-
-    public function invalidRefreshToken()
-    {
-        $error = ['status' => 400, 'message' => trans('errors.invalidRefreshToken')];
-        abort($error['status'], $error['message']);
-    }
-
-     public function noPermissions()
-    {
-        $error = ['status' => 403, 'message' => trans('errors.noPermissions')];
-        abort($error['status'], $error['message']);
-    }
-
-    public function loginFailed()
-    {
-        $error = ['status' => 400, 'message' => trans('errors.loginFailed')];
-        abort($error['status'], $error['message']);
-    }
-
-    public function noSocialEmail()
-    {
-        $error = ['status' => 400, 'message' => trans('errors.noSocialEmail')];
-        abort($error['status'], $error['message']);
-    }
-
-    public function userAlreadyRegistered()
-    {
-        $error = ['status' => 400, 'message' => trans('errors.userAlreadyRegistered')];
-        abort($error['status'], $error['message']);
-    }
-
-    public function connectionError()
-    {
-        $error = ['status' => 400, 'message' => trans('errors.connectionError')];
-        abort($error['status'], $error['message']);
-    }
-
-    public function redisNotRunning()
-    {
-        $error = ['status' => 400, 'message' => trans('errors.redisNotRunning')];
-        abort($error['status'], $error['message']);
-    }
-
-    public function dbQueryError()
-    {
-        $error = ['status' => 400, 'message' => trans('errors.dbQueryError')];
-        abort($error['status'], $error['message']);
-    }
-
-    public function cannotCreateSetting()
-    {
-        $error = ['status' => 400, 'message' => trans('errors.cannotCreateSetting')];
-        abort($error['status'], $error['message']);
-    }
-
-    public function cannotUpdateSettingKey()
-    {
-        $error = ['status' => 400, 'message' => trans('errors.cannotUpdateSettingKey')];
-        abort($error['status'], $error['message']);
-    }
-
-    public function userIsBlocked()
-    {
-        $error = ['status' => 403, 'message' => trans('errors.userIsBlocked')];
-        abort($error['status'], $error['message']);
-    }
-
-    public function emailNotConfirmed()
-    {
-        $error = ['status' => 403, 'message' => trans('errors.emailNotConfirmed')];
-        abort($error['status'], $error['message']);
-    }
-
-    public function emailAlreadyConfirmed()
-    {
-        $error = ['status' => 403, 'message' => trans('errors.emailAlreadyConfirmed')];
-        abort($error['status'], $error['message']);
-    }
-
-    public function invalidResetToken()
-    {
-        $error = ['status' => 400, 'message' => trans('errors.invalidResetToken')];
-        abort($error['status'], $error['message']);
-    }
-
-    public function invalidResetPassword()
-    {
-        $error = ['status' => 400, 'message' => trans('errors.invalidResetPassword')];
-        abort($error['status'], $error['message']);
-    }
-
-    public function invalidOldPassword()
-    {
-        $error = ['status' => 400, 'message' => trans('errors.invalidOldPassword')];
-        abort($error['status'], $error['message']);
-    }
-
-    public function notFound($text)
-    {
-        $error = ['status' => 404, 'message' => trans('errors.notFound', ['replace' => $text])];
-        abort($error['status'], $error['message']);
-    }
-
-    public function generalError()
-    {
-        $error = ['status' => 400, 'message' => trans('errors.generalError')];
-        abort($error['status'], $error['message']);
-    }
+	public function unAuthorized()
+	{
+		$error = ['status' => 401, 'message' => trans('errors.unAuthorized')];
+		abort($error['status'], $error['message']);
+	}
+
+	public function invalidRefreshToken()
+	{
+		$error = ['status' => 400, 'message' => trans('errors.invalidRefreshToken')];
+		abort($error['status'], $error['message']);
+	}
+
+	 public function noPermissions()
+	{
+		$error = ['status' => 403, 'message' => trans('errors.noPermissions')];
+		abort($error['status'], $error['message']);
+	}
+
+	public function loginFailed()
+	{
+		$error = ['status' => 400, 'message' => trans('errors.loginFailed')];
+		abort($error['status'], $error['message']);
+	}
+
+	public function noSocialEmail()
+	{
+		$error = ['status' => 400, 'message' => trans('errors.noSocialEmail')];
+		abort($error['status'], $error['message']);
+	}
+
+	public function userAlreadyRegistered()
+	{
+		$error = ['status' => 400, 'message' => trans('errors.userAlreadyRegistered')];
+		abort($error['status'], $error['message']);
+	}
+
+	public function connectionError()
+	{
+		$error = ['status' => 400, 'message' => trans('errors.connectionError')];
+		abort($error['status'], $error['message']);
+	}
+
+	public function redisNotRunning()
+	{
+		$error = ['status' => 400, 'message' => trans('errors.redisNotRunning')];
+		abort($error['status'], $error['message']);
+	}
+
+	public function dbQueryError()
+	{
+		$error = ['status' => 400, 'message' => trans('errors.dbQueryError')];
+		abort($error['status'], $error['message']);
+	}
+
+	public function cannotCreateSetting()
+	{
+		$error = ['status' => 400, 'message' => trans('errors.cannotCreateSetting')];
+		abort($error['status'], $error['message']);
+	}
+
+	public function cannotUpdateSettingKey()
+	{
+		$error = ['status' => 400, 'message' => trans('errors.cannotUpdateSettingKey')];
+		abort($error['status'], $error['message']);
+	}
+
+	public function userIsBlocked()
+	{
+		$error = ['status' => 403, 'message' => trans('errors.userIsBlocked')];
+		abort($error['status'], $error['message']);
+	}
+
+	public function emailNotConfirmed()
+	{
+		$error = ['status' => 403, 'message' => trans('errors.emailNotConfirmed')];
+		abort($error['status'], $error['message']);
+	}
+
+	public function emailAlreadyConfirmed()
+	{
+		$error = ['status' => 403, 'message' => trans('errors.emailAlreadyConfirmed')];
+		abort($error['status'], $error['message']);
+	}
+
+	public function invalidResetToken()
+	{
+		$error = ['status' => 400, 'message' => trans('errors.invalidResetToken')];
+		abort($error['status'], $error['message']);
+	}
+
+	public function invalidResetPassword()
+	{
+		$error = ['status' => 400, 'message' => trans('errors.invalidResetPassword')];
+		abort($error['status'], $error['message']);
+	}
+
+	public function invalidOldPassword()
+	{
+		$error = ['status' => 400, 'message' => trans('errors.invalidOldPassword')];
+		abort($error['status'], $error['message']);
+	}
+
+	public function notFound($text)
+	{
+		$error = ['status' => 404, 'message' => trans('errors.notFound', ['replace' => $text])];
+		abort($error['status'], $error['message']);
+	}
+
+	public function generalError()
+	{
+		$error = ['status' => 400, 'message' => trans('errors.generalError')];
+		abort($error['status'], $error['message']);
+	}
 }
\ No newline at end of file

src/Modules/Core/Providers/RouteServiceProvider.php

Indentation +61 added lines, -61 removed lines

@@ -8,72 +8,72 @@
 class RouteServiceProvider extends ServiceProvider
 {
 	/**
-     * This namespace is applied to your controller routes.
-     *
-     * In addition, it is set as the URL generator's root namespace.
-     *
-     * @var string
-     */
-    protected $namespace = 'App\Modules\Core\Http\Controllers';
+	 * This namespace is applied to your controller routes.
+	 *
+	 * In addition, it is set as the URL generator's root namespace.
+	 *
+	 * @var string
+	 */
+	protected $namespace = 'App\Modules\Core\Http\Controllers';
 
-    /**
-     * Define your route model bindings, pattern filters, etc.
-     *
-     * @return void
-     */
-    public function boot()
-    {
-        //
+	/**
+	 * Define your route model bindings, pattern filters, etc.
+	 *
+	 * @return void
+	 */
+	public function boot()
+	{
+		//
 
-        parent::boot();
-    }
+		parent::boot();
+	}
 
-    /**
-     * Define the routes for the module.
-     *
-     * @return void
-     */
-    public function map()
-    {
-        $this->mapWebRoutes();
+	/**
+	 * Define the routes for the module.
+	 *
+	 * @return void
+	 */
+	public function map()
+	{
+		$this->mapWebRoutes();
 
-        $this->mapApiRoutes();
+		$this->mapApiRoutes();
 
-        //
-    }
+		//
+	}
 
-    /**
-     * Define the "web" routes for the module.
-     *
-     * These routes all receive session state, CSRF protection, etc.
-     *
-     * @return void
-     */
-    protected function mapWebRoutes()
-    {
-        Route::group([
-            'middleware' => 'web',
-            'namespace'  => $this->namespace,
-        ], function ($router) {
-            require module_path('core', 'Routes/web.php');
-        });
-    }
+	/**
+	 * Define the "web" routes for the module.
+	 *
+	 * These routes all receive session state, CSRF protection, etc.
+	 *
+	 * @return void
+	 */
+	protected function mapWebRoutes()
+	{
+		Route::group([
+			'middleware' => 'web',
+			'namespace'  => $this->namespace,
+		], function ($router) {
+			require module_path('core', 'Routes/web.php');
+		});
+	}
 
-    /**
-     * Define the "api" routes for the module.
-     *
-     * These routes are typically stateless.
-     *
-     * @return void
-     */
-    protected function mapApiRoutes()
-    {
-        Route::group([
-            'middleware' => 'api',
-            'namespace'  => $this->namespace,
-            'prefix'     => 'api',
-        ], function ($router) {
-            require module_path('core', 'Routes/api.php');
-        });
-    }
+	/**
+	 * Define the "api" routes for the module.
+	 *
+	 * These routes are typically stateless.
+	 *
+	 * @return void
+	 */
+	protected function mapApiRoutes()
+	{
+		Route::group([
+			'middleware' => 'api',
+			'namespace'  => $this->namespace,
+			'prefix'     => 'api',
+		], function ($router) {
+			require module_path('core', 'Routes/api.php');
+		});
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -54,7 +54,7 @@ 
         Route::group([
             'middleware' => 'web',
             'namespace'  => $this->namespace,
-        ], function ($router) {
+        ], function($router) {
             require module_path('core', 'Routes/web.php');
         });
     }
@@ -72,7 +72,7 @@ 
             'middleware' => 'api',
             'namespace'  => $this->namespace,
             'prefix'     => 'api',
-        ], function ($router) {
+        ], function($router) {
             require module_path('core', 'Routes/api.php');
         });
     }

src/Modules/Core/Providers/ModuleServiceProvider.php

Indentation +64 added lines, -64 removed lines

@@ -7,75 +7,75 @@
 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');
+	 * Bootstrap the module services.
+	 *
+	 * @return void
+	 */
+	public function boot()
+	{
+		$this->loadTranslationsFrom(__DIR__.'/../Resources/Lang', 'core');
+		$this->loadViewsFrom(__DIR__.'/../Resources/Views', 'core');
 
-        $factory = app('Illuminate\Database\Eloquent\Factory');
-        $factory->load(__DIR__.'/../Database/Factories');
-    }
+		$factory = app('Illuminate\Database\Eloquent\Factory');
+		$factory->load(__DIR__.'/../Database/Factories');
+	}
 
-    /**
-     * Register the module services.
-     *
-     * @return void
-     */
-    public function register()
-    {
-        //Bind Core Facade to the IoC Container
-        \App::bind('Core', function()
-        {
-            return new \App\Modules\Core\Core;
-        });
+	/**
+	 * Register the module services.
+	 *
+	 * @return void
+	 */
+	public function register()
+	{
+		//Bind Core Facade to the IoC Container
+		\App::bind('Core', function()
+		{
+			return new \App\Modules\Core\Core;
+		});
 
-        //Bind ErrorHandler Facade to the IoC Container
-        \App::bind('ErrorHandler', function()
-        {
-            return new \App\Modules\Core\Utl\ErrorHandler;
-        });
+		//Bind ErrorHandler Facade to the IoC Container
+		\App::bind('ErrorHandler', function()
+		{
+			return new \App\Modules\Core\Utl\ErrorHandler;
+		});
 
-        //Bind CoreConfig Facade to the IoC Container
-        \App::bind('CoreConfig', function()
-        {
-            return new \App\Modules\Core\Utl\CoreConfig;
-        });
+		//Bind CoreConfig Facade to the IoC Container
+		\App::bind('CoreConfig', function()
+		{
+			return new \App\Modules\Core\Utl\CoreConfig;
+		});
 
-        //Bind Mpgs Facade to the IoC Container
-        \App::bind('Media', function()
-        {
-            return new \App\Modules\Core\Utl\Media;
-        });
+		//Bind Mpgs Facade to the IoC Container
+		\App::bind('Media', function()
+		{
+			return new \App\Modules\Core\Utl\Media;
+		});
 
-        \Validator::extend('base64image', function ($attribute, $value, $parameters, $validator) {
-            $explode = explode(',', $value);
-            $allow   = ['png', 'jpg', 'svg'];
-            $format  = str_replace(
-                [
-                    'data:image/',
-                    ';',
-                    'base64',
-                ],
-                [
-                    '', '', '',
-                ],
-                $explode[0]
-            );
-            // check file format
-            if (!in_array($format, $allow)) {
-                return false;
-            }
-            // check base64 format
-            if (!preg_match('%^[a-zA-Z0-9/+]*={0,2}$%', $explode[1])) {
-                return false;
-            }
-            return true;
-        });
+		\Validator::extend('base64image', function ($attribute, $value, $parameters, $validator) {
+			$explode = explode(',', $value);
+			$allow   = ['png', 'jpg', 'svg'];
+			$format  = str_replace(
+				[
+					'data:image/',
+					';',
+					'base64',
+				],
+				[
+					'', '', '',
+				],
+				$explode[0]
+			);
+			// check file format
+			if (!in_array($format, $allow)) {
+				return false;
+			}
+			// check base64 format
+			if (!preg_match('%^[a-zA-Z0-9/+]*={0,2}$%', $explode[1])) {
+				return false;
+			}
+			return true;
+		});
         
-        $this->app->register(RouteServiceProvider::class);
-    }
+		$this->app->register(RouteServiceProvider::class);
+	}
 }

Spacing +3 added lines, -3 removed lines

@@ -51,7 +51,7 @@ 
             return new \App\Modules\Core\Utl\Media;
         });
 
-        \Validator::extend('base64image', function ($attribute, $value, $parameters, $validator) {
+        \Validator::extend('base64image', function($attribute, $value, $parameters, $validator) {
             $explode = explode(',', $value);
             $allow   = ['png', 'jpg', 'svg'];
             $format  = str_replace(
@@ -66,11 +66,11 @@ 
                 $explode[0]
             );
             // check file format
-            if (!in_array($format, $allow)) {
+            if ( ! in_array($format, $allow)) {
                 return false;
             }
             // check base64 format
-            if (!preg_match('%^[a-zA-Z0-9/+]*={0,2}$%', $explode[1])) {
+            if ( ! preg_match('%^[a-zA-Z0-9/+]*={0,2}$%', $explode[1])) {
                 return false;
             }
             return true;

src/Modules/Core/Decorators/CachingDecorator.php

Indentation +101 added lines, -101 removed lines

@@ -2,117 +2,117 @@
 
 class CachingDecorator
 {
-    /**
-     * The repo implementation.
-     * 
-     * @var string
-     */
-    public $repo;
+	/**
+	 * The repo implementation.
+	 * 
+	 * @var string
+	 */
+	public $repo;
 
-    /**
-     * The cache implementation.
-     * 
-     * @var object
-     */
-    protected $cache;
+	/**
+	 * The cache implementation.
+	 * 
+	 * @var object
+	 */
+	protected $cache;
 
-    /**
-     * The modelKey implementation.
-     * 
-     * @var string
-     */
-    public $modelKey;
+	/**
+	 * The modelKey implementation.
+	 * 
+	 * @var string
+	 */
+	public $modelKey;
 
-    /**
-     * The model implementation.
-     * 
-     * @var string
-     */
-    public $model;
+	/**
+	 * The model implementation.
+	 * 
+	 * @var string
+	 */
+	public $model;
 
-    /**
-     * The modelClass implementation.
-     * 
-     * @var string
-     */
-    public $modelClass;
+	/**
+	 * The modelClass implementation.
+	 * 
+	 * @var string
+	 */
+	public $modelClass;
 
-    /**
-     * The cacheConfig implementation.
-     * 
-     * @var array
-     */
-    public $cacheConfig;
+	/**
+	 * The cacheConfig implementation.
+	 * 
+	 * @var array
+	 */
+	public $cacheConfig;
 
-    /**
-     * The cacheTag implementation.
-     * 
-     * @var string
-     */
-    public $cacheTag;
+	/**
+	 * The cacheTag implementation.
+	 * 
+	 * @var string
+	 */
+	public $cacheTag;
     
-    /**
-     * Create new CachingDecorator instance.
-     */
-    public function __construct($repo, $cache)
-    {   
-        $this->repo       = $repo;
-        $this->cache      = $cache;
-        $this->model      = $this->repo->model;
-        $this->modelClass = get_class($this->model);
-        $repoClass        = explode('\\', get_class($this->repo));
-        $repoName         = end($repoClass);
-        $this->cacheTag   = str_plural(lcfirst(substr($repoName, 0, strpos($repoName, 'Repository'))));
-    }
+	/**
+	 * Create new CachingDecorator instance.
+	 */
+	public function __construct($repo, $cache)
+	{   
+		$this->repo       = $repo;
+		$this->cache      = $cache;
+		$this->model      = $this->repo->model;
+		$this->modelClass = get_class($this->model);
+		$repoClass        = explode('\\', get_class($this->repo));
+		$repoName         = end($repoClass);
+		$this->cacheTag   = str_plural(lcfirst(substr($repoName, 0, strpos($repoName, 'Repository'))));
+	}
 
-    /**
-     * Handle the cache mechanism for the called method
-     * based the configurations.
-     * 
-     * @param  string $name the called method name
-     * @param  array  $arguments the method arguments
-     * @return object
-     */
-    public function __call($name, $arguments)
-    {
-        $this->setCacheConfig($name);
+	/**
+	 * Handle the cache mechanism for the called method
+	 * based the configurations.
+	 * 
+	 * @param  string $name the called method name
+	 * @param  array  $arguments the method arguments
+	 * @return object
+	 */
+	public function __call($name, $arguments)
+	{
+		$this->setCacheConfig($name);
 
-        if ($this->cacheConfig && $this->cacheConfig == 'cache') 
-        {
-            $page     = \Request::get('page') !== null ? \Request::get('page') : '1';
-            $cacheKey = $name . $page . \Session::get('locale') . serialize($arguments);
-            return $this->cache->tags([$this->cacheTag])->rememberForever($cacheKey, function() use ($arguments, $name) {
-                return call_user_func_array([$this->repo, $name], $arguments);
-            });
-        }
-        else if ($this->cacheConfig)
-        {
-            $this->cache->tags($this->cacheConfig)->flush();
-            return call_user_func_array([$this->repo, $name], $arguments);
-        }
+		if ($this->cacheConfig && $this->cacheConfig == 'cache') 
+		{
+			$page     = \Request::get('page') !== null ? \Request::get('page') : '1';
+			$cacheKey = $name . $page . \Session::get('locale') . serialize($arguments);
+			return $this->cache->tags([$this->cacheTag])->rememberForever($cacheKey, function() use ($arguments, $name) {
+				return call_user_func_array([$this->repo, $name], $arguments);
+			});
+		}
+		else if ($this->cacheConfig)
+		{
+			$this->cache->tags($this->cacheConfig)->flush();
+			return call_user_func_array([$this->repo, $name], $arguments);
+		}
 
-        return call_user_func_array([$this->repo, $name], $arguments);
-    }
+		return call_user_func_array([$this->repo, $name], $arguments);
+	}
 
-    /**
-     * Set cache config based on the called method.
-     * 
-     * @param  string $name
-     * @return void
-     */
-    private function setCacheConfig($name)
-    {   
-        $config            = \CoreConfig::getConfig();
-        $cacheConfig       = array_key_exists($this->cacheTag, $config['cacheConfig']) ? $config['cacheConfig'][$this->cacheTag] : false;
-        $this->cacheConfig = false;
+	/**
+	 * Set cache config based on the called method.
+	 * 
+	 * @param  string $name
+	 * @return void
+	 */
+	private function setCacheConfig($name)
+	{   
+		$config            = \CoreConfig::getConfig();
+		$cacheConfig       = array_key_exists($this->cacheTag, $config['cacheConfig']) ? $config['cacheConfig'][$this->cacheTag] : false;
+		$this->cacheConfig = false;
 
-        if ($cacheConfig && in_array($name, $cacheConfig['cache']))
-        {
-            $this->cacheConfig = 'cache';
-        }
-        else if ($cacheConfig && isset($cacheConfig['clear'][$name]))
-        {
-            $this->cacheConfig = $cacheConfig['clear'][$name];
-        }
-    }
+		if ($cacheConfig && in_array($name, $cacheConfig['cache']))
+		{
+			$this->cacheConfig = 'cache';
+		}
+		else if ($cacheConfig && isset($cacheConfig['clear'][$name]))
+		{
+			$this->cacheConfig = $cacheConfig['clear'][$name];
+		}
+	}
 }
\ No newline at end of file

Spacing +1 added lines, -1 removed lines

@@ -64,7 +64,7 @@
         if ($this->cacheConfig && $this->cacheConfig == 'cache') 
         {
             $page     = \Request::get('page') !== null ? \Request::get('page') : '1';
-            $cacheKey = $name . $page . \Session::get('locale') . serialize($arguments);
+            $cacheKey = $name.$page.\Session::get('locale').serialize($arguments);
             return $this->cache->tags([$this->cacheTag])->rememberForever($cacheKey, function() use ($arguments, $name) {
                 return call_user_func_array([$this->repo, $name], $arguments);
             });

Braces +2 added lines, -4 removed lines

@@ -68,8 +68,7 @@ 
             return $this->cache->tags([$this->cacheTag])->rememberForever($cacheKey, function() use ($arguments, $name) {
                 return call_user_func_array([$this->repo, $name], $arguments);
             });
-        }
-        else if ($this->cacheConfig)
+        } else if ($this->cacheConfig)
         {
             $this->cache->tags($this->cacheConfig)->flush();
             return call_user_func_array([$this->repo, $name], $arguments);
@@ -93,8 +92,7 @@ 
         if ($cacheConfig && in_array($name, $cacheConfig['cache']))
         {
             $this->cacheConfig = 'cache';
-        }
-        else if ($cacheConfig && isset($cacheConfig['clear'][$name]))
+        } else if ($cacheConfig && isset($cacheConfig['clear'][$name]))
         {
             $this->cacheConfig = $cacheConfig['clear'][$name];
         }

src/Modules/Core/Traits/Translatable.php

Indentation +41 added lines, -41 removed lines

@@ -2,51 +2,51 @@
 
 trait Translatable  
 {
-    /**
-     * Create a new model instance that is existing.
-     *
-     * @param  array  $attributes
-     * @param  string|null  $connection
-     * @return static
-     */
-    public function newFromBuilder($attributes = [], $connection = null)
-    {
-        $model = parent::newFromBuilder($attributes, $connection);
+	/**
+	 * Create a new model instance that is existing.
+	 *
+	 * @param  array  $attributes
+	 * @param  string|null  $connection
+	 * @return static
+	 */
+	public function newFromBuilder($attributes = [], $connection = null)
+	{
+		$model = parent::newFromBuilder($attributes, $connection);
 
-        foreach ($model->attributes AS $key => $value)
-        {
-            if (isset($this->translatable) && in_array($key, $this->translatable)) 
-            {
-                $model->$key = $this->getTranslatedAttribute($key, $value);
-            }
-        }
+		foreach ($model->attributes AS $key => $value)
+		{
+			if (isset($this->translatable) && in_array($key, $this->translatable)) 
+			{
+				$model->$key = $this->getTranslatedAttribute($key, $value);
+			}
+		}
 
-        return $model;
-    }
+		return $model;
+	}
 
-    /**
-     * Returns a translatable model attribute based on the application's locale settings.
-     *
-     * @param $key
-     * @param $values
-     * @return string
-     */
-    protected function getTranslatedAttribute($key, $values)
-    {
-        $values         = json_decode($values);
-        $primaryLocale  = \Session::get('locale');
-        $fallbackLocale = 'en';
+	/**
+	 * Returns a translatable model attribute based on the application's locale settings.
+	 *
+	 * @param $key
+	 * @param $values
+	 * @return string
+	 */
+	protected function getTranslatedAttribute($key, $values)
+	{
+		$values         = json_decode($values);
+		$primaryLocale  = \Session::get('locale');
+		$fallbackLocale = 'en';
 
-        if ($primaryLocale == 'all') 
-        {
-            return $values;
-        }
+		if ($primaryLocale == 'all') 
+		{
+			return $values;
+		}
 
-        if ( ! $primaryLocale || ! is_object($values) || ! property_exists($values, $primaryLocale)) 
-        {
-            return $values ? isset($values->$fallbackLocale) ? $values->$fallbackLocale : $values : '';
-        }
+		if ( ! $primaryLocale || ! is_object($values) || ! property_exists($values, $primaryLocale)) 
+		{
+			return $values ? isset($values->$fallbackLocale) ? $values->$fallbackLocale : $values : '';
+		}
 
-        return $primaryLocale == 'all' ? $values : $values->$primaryLocale;
-    }
+		return $primaryLocale == 'all' ? $values : $values->$primaryLocale;
+	}
 }
\ No newline at end of file