SherifElfadaly / Laravel-Api-Skeleton

src/Modules/Core/Http/Middleware/SetSessions.php

Indentation +32 added lines, -32 removed lines

@@ -8,40 +8,40 @@
 
 class SetSessions
 {
-    protected $app;
-    protected $session;
+	protected $app;
+	protected $session;
     
-    /**
-     * Init new object.
-     *
-     * @param   App      $app
-     * @param   Session  $session
-     *
-     * @return  void
-     */
-    public function __construct(App $app, Session $session)
-    {
-        $this->app = $app;
-        $this->session = $session;
-    }
+	/**
+	 * Init new object.
+	 *
+	 * @param   App      $app
+	 * @param   Session  $session
+	 *
+	 * @return  void
+	 */
+	public function __construct(App $app, Session $session)
+	{
+		$this->app = $app;
+		$this->session = $session;
+	}
 
-    /**
-     * Handle an incoming request.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  \Closure  $next
-     * @return mixed
-     */
-    public function handle($request, Closure $next)
-    {
-        $locale = $request->header('Accept-Language', 'en');
-        $locale = $locale == 'ar' || $locale == 'all' ? $locale : 'en';
-        $timeZone = $request->header('time-zone', 0);
+	/**
+	 * Handle an incoming request.
+	 *
+	 * @param  \Illuminate\Http\Request  $request
+	 * @param  \Closure  $next
+	 * @return mixed
+	 */
+	public function handle($request, Closure $next)
+	{
+		$locale = $request->header('Accept-Language', 'en');
+		$locale = $locale == 'ar' || $locale == 'all' ? $locale : 'en';
+		$timeZone = $request->header('time-zone', 0);
 
-        $this->session->put('time-zone', $timeZone);
-        $this->session->put('locale', $locale);
-        $this->app->setLocale($locale);
+		$this->session->put('time-zone', $timeZone);
+		$this->session->put('locale', $locale);
+		$this->app->setLocale($locale);
 
-        return $next($request);
-    }
+		return $next($request);
+	}
 }

src/Modules/Core/Http/Middleware/SetRelations.php

Indentation +32 added lines, -32 removed lines

@@ -8,39 +8,39 @@
 
 class SetRelations
 {
-    protected $arr;
-    protected $route;
+	protected $arr;
+	protected $route;
     
-    /**
-     * Init new object.
-     *
-     * @param   Route  $route
-     * @param   Arr    $arr
-     *
-     * @return  void
-     */
-    public function __construct(Route $route, Arr $arr)
-    {
-        $this->arr = $arr;
-        $this->route = $route;
-    }
+	/**
+	 * Init new object.
+	 *
+	 * @param   Route  $route
+	 * @param   Arr    $arr
+	 *
+	 * @return  void
+	 */
+	public function __construct(Route $route, Arr $arr)
+	{
+		$this->arr = $arr;
+		$this->route = $route;
+	}
 
-    /**
-     * Handle an incoming request.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  \Closure  $next
-     * @return mixed
-     */
-    public function handle($request, Closure $next)
-    {
-        $routeActions       = explode('@', $this->route->currentRouteAction());
-        $modelName          = explode('\\', $routeActions[0]);
-        $modelName          = lcfirst(str_replace('Controller', '', end($modelName)));
-        $route              = explode('@', $this->route->currentRouteAction())[1];
-        $relations          = $this->arr->get(config('core.relations'), $modelName, false);
-        $request->relations = $relations && isset($relations[$route]) ? $relations[$route] : [];
+	/**
+	 * Handle an incoming request.
+	 *
+	 * @param  \Illuminate\Http\Request  $request
+	 * @param  \Closure  $next
+	 * @return mixed
+	 */
+	public function handle($request, Closure $next)
+	{
+		$routeActions       = explode('@', $this->route->currentRouteAction());
+		$modelName          = explode('\\', $routeActions[0]);
+		$modelName          = lcfirst(str_replace('Controller', '', end($modelName)));
+		$route              = explode('@', $this->route->currentRouteAction())[1];
+		$relations          = $this->arr->get(config('core.relations'), $modelName, false);
+		$request->relations = $relations && isset($relations[$route]) ? $relations[$route] : [];
 
-        return $next($request);
-    }
+		return $next($request);
+	}
 }

src/Modules/Core/Http/Middleware/CheckPermissions.php

Indentation +58 added lines, -58 removed lines

@@ -11,68 +11,68 @@
 
 class CheckPermissions
 {
-    protected $route;
-    protected $auth;
-    protected $authMiddleware;
-    protected $userService;
-    protected $arr;
+	protected $route;
+	protected $auth;
+	protected $authMiddleware;
+	protected $userService;
+	protected $arr;
     
-    /**
-     * Init new object.
-     *
-     * @param   Route          $route
-     * @param   Auth           $auth
-     * @param   AuthMiddleware $authMiddleware
-     * @param   UserService    $userService
-     * @param   Arr            $arr
-     *
-     * @return  void
-     */
-    public function __construct(Route $route, Auth $auth, AuthMiddleware $authMiddleware, UserService $userService, Arr $arr)
-    {
-        $this->route = $route;
-        $this->auth = $auth;
-        $this->authMiddleware = $authMiddleware;
-        $this->userService = $userService;
-        $this->arr = $arr;
-    }
+	/**
+	 * Init new object.
+	 *
+	 * @param   Route          $route
+	 * @param   Auth           $auth
+	 * @param   AuthMiddleware $authMiddleware
+	 * @param   UserService    $userService
+	 * @param   Arr            $arr
+	 *
+	 * @return  void
+	 */
+	public function __construct(Route $route, Auth $auth, AuthMiddleware $authMiddleware, UserService $userService, Arr $arr)
+	{
+		$this->route = $route;
+		$this->auth = $auth;
+		$this->authMiddleware = $authMiddleware;
+		$this->userService = $userService;
+		$this->arr = $arr;
+	}
 
-    /**
-     * Handle an incoming request.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  \Closure  $next
-     * @return mixed
-     */
-    public function handle($request, Closure $next)
-    {
-        $routeActions        = explode('@', $this->route->currentRouteAction());
-        $reflectionClass     = new \ReflectionClass($routeActions[0]);
-        $classProperties     = $reflectionClass->getDefaultProperties();
-        $skipPermissionCheck = $this->arr->get($classProperties, 'skipPermissionCheck', []);
-        $skipLoginCheck      = $this->arr->get($classProperties, 'skipLoginCheck', []);
-        $modelName           = explode('\\', $routeActions[0]);
-        $modelName           = lcfirst(str_replace('Controller', '', end($modelName)));
-        $permission          = $routeActions[1];
+	/**
+	 * Handle an incoming request.
+	 *
+	 * @param  \Illuminate\Http\Request  $request
+	 * @param  \Closure  $next
+	 * @return mixed
+	 */
+	public function handle($request, Closure $next)
+	{
+		$routeActions        = explode('@', $this->route->currentRouteAction());
+		$reflectionClass     = new \ReflectionClass($routeActions[0]);
+		$classProperties     = $reflectionClass->getDefaultProperties();
+		$skipPermissionCheck = $this->arr->get($classProperties, 'skipPermissionCheck', []);
+		$skipLoginCheck      = $this->arr->get($classProperties, 'skipLoginCheck', []);
+		$modelName           = explode('\\', $routeActions[0]);
+		$modelName           = lcfirst(str_replace('Controller', '', end($modelName)));
+		$permission          = $routeActions[1];
 
-        $this->auth->shouldUse('api');
-        if (! in_array($permission, $skipLoginCheck)) {
-            $this->authMiddleware->handle($request, function ($request) use ($modelName, $skipPermissionCheck, $permission) {
-                $user             = $this->auth->user();
-                $isPasswordClient = $user->token()->client->password_client;
+		$this->auth->shouldUse('api');
+		if (! in_array($permission, $skipLoginCheck)) {
+			$this->authMiddleware->handle($request, function ($request) use ($modelName, $skipPermissionCheck, $permission) {
+				$user             = $this->auth->user();
+				$isPasswordClient = $user->token()->client->password_client;
     
-                if ($user->blocked) {
-                    \Errors::userIsBlocked();
-                }
+				if ($user->blocked) {
+					\Errors::userIsBlocked();
+				}
     
-                if ($isPasswordClient && (in_array($permission, $skipPermissionCheck) || $this->userService->can($permission, $modelName))) {
-                } elseif (! $isPasswordClient && $user->tokenCan($modelName.'-'.$permission)) {
-                } else {
-                    \Errors::noPermissions();
-                }
-            });
-        }
+				if ($isPasswordClient && (in_array($permission, $skipPermissionCheck) || $this->userService->can($permission, $modelName))) {
+				} elseif (! $isPasswordClient && $user->tokenCan($modelName.'-'.$permission)) {
+				} else {
+					\Errors::noPermissions();
+				}
+			});
+		}
 
-        return $next($request);
-    }
+		return $next($request);
+	}
 }

Spacing +3 added lines, -3 removed lines

@@ -56,8 +56,8 @@ 
         $permission          = $routeActions[1];
 
         $this->auth->shouldUse('api');
-        if (! in_array($permission, $skipLoginCheck)) {
-            $this->authMiddleware->handle($request, function ($request) use ($modelName, $skipPermissionCheck, $permission) {
+        if ( ! in_array($permission, $skipLoginCheck)) {
+            $this->authMiddleware->handle($request, function($request) use ($modelName, $skipPermissionCheck, $permission) {
                 $user             = $this->auth->user();
                 $isPasswordClient = $user->token()->client->password_client;
     
@@ -66,7 +66,7 @@ 
                 }
     
                 if ($isPasswordClient && (in_array($permission, $skipPermissionCheck) || $this->userService->can($permission, $modelName))) {
-                } elseif (! $isPasswordClient && $user->tokenCan($modelName.'-'.$permission)) {
+                } elseif ( ! $isPasswordClient && $user->tokenCan($modelName.'-'.$permission)) {
                 } else {
                     \Errors::noPermissions();
                 }

src/Modules/Core/Resources/Lang/en/errors.php

Indentation +10 added lines, -10 removed lines

@@ -2,15 +2,15 @@
 
 return [
     
-    /**
-     * Here goes your error messages.
-     */
-    'connectionError'         => 'Connection error',
-    'redisNotRunning'         => 'Your redis notification server is\'t running',
-    'dbQueryError'            => 'Please check the given inputes',
-    'cannotCreateSetting'     => 'Can\'t create setting',
-    'cannotUpdateSettingKey'  => 'Can\'t update setting key',
-    'notFound'                => 'The requested :replace not found',
-    'cannotUploadImage'       => 'Can\'t upload the given image'
+	/**
+	 * Here goes your error messages.
+	 */
+	'connectionError'         => 'Connection error',
+	'redisNotRunning'         => 'Your redis notification server is\'t running',
+	'dbQueryError'            => 'Please check the given inputes',
+	'cannotCreateSetting'     => 'Can\'t create setting',
+	'cannotUpdateSettingKey'  => 'Can\'t update setting key',
+	'notFound'                => 'The requested :replace not found',
+	'cannotUploadImage'       => 'Can\'t upload the given image'
 
 ];

src/Modules/Core/Resources/Lang/ar/errors.php

Indentation +10 added lines, -10 removed lines

@@ -2,15 +2,15 @@
 
 return [
     
-    /**
-     * Here goes your error messages.
-     */
-    'connectionError'         => 'خطأ في الاتصال',
-    'redisNotRunning'         => 'سيرفير الاشعارات لايعمل',
-    'dbQueryError'            => 'خطا في البيانات',
-    'cannotCreateSetting'     => 'لا يمكن اضافة اعدادات',
-    'cannotUpdateSettingKey'  => 'لا يمكن تعديل اعدادات',
-    'notFound'                => 'ال :replace المطلوب غير موجود',
-    'cannotUploadImage'       => 'لا يمكن رفع هذه الصورة'
+	/**
+	 * Here goes your error messages.
+	 */
+	'connectionError'         => 'خطأ في الاتصال',
+	'redisNotRunning'         => 'سيرفير الاشعارات لايعمل',
+	'dbQueryError'            => 'خطا في البيانات',
+	'cannotCreateSetting'     => 'لا يمكن اضافة اعدادات',
+	'cannotUpdateSettingKey'  => 'لا يمكن تعديل اعدادات',
+	'notFound'                => 'ال :replace المطلوب غير موجود',
+	'cannotUploadImage'       => 'لا يمكن رفع هذه الصورة'
 
 ];

src/Modules/Core/Setting.php

Indentation +15 added lines, -15 removed lines

@@ -9,21 +9,21 @@
 class Setting extends Model
 {
 
-    use SoftDeletes;
-    protected $table = 'settings';
-    protected $dates = ['created_at', 'updated_at', 'deleted_at'];
-    protected $hidden = ['deleted_at'];
-    protected $guarded = ['id', 'key'];
-    public $fillable = ['name', 'value'];
+	use SoftDeletes;
+	protected $table = 'settings';
+	protected $dates = ['created_at', 'updated_at', 'deleted_at'];
+	protected $hidden = ['deleted_at'];
+	protected $guarded = ['id', 'key'];
+	public $fillable = ['name', 'value'];
     
-    public function newCollection(array $models = [])
-    {
-        return parent::newCollection($models)->keyBy('key');
-    }
+	public function newCollection(array $models = [])
+	{
+		return parent::newCollection($models)->keyBy('key');
+	}
 
-    public static function boot()
-    {
-        parent::boot();
-        Setting::observe(SettingsObserver::class);
-    }
+	public static function boot()
+	{
+		parent::boot();
+		Setting::observe(SettingsObserver::class);
+	}
 }

src/Modules/Core/BaseClasses/BaseApiController.php

Indentation +95 added lines, -95 removed lines

@@ -9,109 +9,109 @@
 
 class BaseApiController extends Controller
 {
-    /**
-     * Array of eager loaded relations.
-     *
-     * @var array
-     */
-    protected $relations;
+	/**
+	 * Array of eager loaded relations.
+	 *
+	 * @var array
+	 */
+	protected $relations;
 
-    /**
-     * @var object
-     */
-    protected $service;
+	/**
+	 * @var object
+	 */
+	protected $service;
 
-    /**
-     * Path of the model resource.
-     *
-     * @var string
-     */
-    protected $modelResource;
+	/**
+	 * Path of the model resource.
+	 *
+	 * @var string
+	 */
+	protected $modelResource;
 
-    /**
-     * Path of the sotre form request.
-     *
-     * @var string
-     */
-    protected $storeFormRequest;
+	/**
+	 * Path of the sotre form request.
+	 *
+	 * @var string
+	 */
+	protected $storeFormRequest;
 
-    /**
-     * Init new object.
-     *
-     * @param   mixed      $service
-     * @return  void
-     */
-    public function __construct($service)
-    {
-        $this->service = new CachingDecorator($service, \App::make('Illuminate\Contracts\Cache\Repository'));
-    }
+	/**
+	 * Init new object.
+	 *
+	 * @param   mixed      $service
+	 * @return  void
+	 */
+	public function __construct($service)
+	{
+		$this->service = new CachingDecorator($service, \App::make('Illuminate\Contracts\Cache\Repository'));
+	}
 
-    /**
-     * Fetch all records with relations from storage.
-     *
-     * @param Request $request
-     * @return \Illuminate\Http\Response
-     */
-    public function index(Request $request)
-    {
-        return $this->modelResource::collection($this->service->list($request->relations, $request->query(), $request->query('perPage'), $request->query('sortBy'), $request->query('desc'), $request->query('trashed')));
-    }
+	/**
+	 * Fetch all records with relations from storage.
+	 *
+	 * @param Request $request
+	 * @return \Illuminate\Http\Response
+	 */
+	public function index(Request $request)
+	{
+		return $this->modelResource::collection($this->service->list($request->relations, $request->query(), $request->query('perPage'), $request->query('sortBy'), $request->query('desc'), $request->query('trashed')));
+	}
 
-    /**
-     * Fetch the single object with relations from storage.
-     *
-     * @param  Request $request
-     * @param  integer $id Id of the requested model.
-     * @return \Illuminate\Http\Response
-     */
-    public function show(Request $request, $id)
-    {
-        return new $this->modelResource($this->service->find($id, $request->relations));
-    }
+	/**
+	 * Fetch the single object with relations from storage.
+	 *
+	 * @param  Request $request
+	 * @param  integer $id Id of the requested model.
+	 * @return \Illuminate\Http\Response
+	 */
+	public function show(Request $request, $id)
+	{
+		return new $this->modelResource($this->service->find($id, $request->relations));
+	}
 
-    /**
-     * Insert the given model to storage.
-     *
-     * @return \Illuminate\Http\Response
-     */
-    public function store()
-    {
-        $data = \App::make($this->storeFormRequest)->validated();
-        return new $this->modelResource($this->service->save($data));
-    }
+	/**
+	 * Insert the given model to storage.
+	 *
+	 * @return \Illuminate\Http\Response
+	 */
+	public function store()
+	{
+		$data = \App::make($this->storeFormRequest)->validated();
+		return new $this->modelResource($this->service->save($data));
+	}
 
-    /**
-     * Update the given model to storage.
-     *
-     * @param integer   $id
-     * @return \Illuminate\Http\Response
-     */
-    public function update($id)
-    {
-        $data = \App::make($this->storeFormRequest)->validated();
-        $data['id'] = $id;
-        return new $this->modelResource($this->service->save($data));
-    }
+	/**
+	 * Update the given model to storage.
+	 *
+	 * @param integer   $id
+	 * @return \Illuminate\Http\Response
+	 */
+	public function update($id)
+	{
+		$data = \App::make($this->storeFormRequest)->validated();
+		$data['id'] = $id;
+		return new $this->modelResource($this->service->save($data));
+	}
 
-    /**
-     * Delete by the given id from storage.
-     *
-     * @param  integer $id Id of the deleted model.
-     * @return \Illuminate\Http\Response
-     */
-    public function destroy($id)
-    {
-        return new GeneralResource($this->service->delete($id));
-    }
+	/**
+	 * Delete by the given id from storage.
+	 *
+	 * @param  integer $id Id of the deleted model.
+	 * @return \Illuminate\Http\Response
+	 */
+	public function destroy($id)
+	{
+		return new GeneralResource($this->service->delete($id));
+	}
 
-    /**
-     * Restore the deleted model.
-     *
-     * @param  integer $id Id of the restored model.
-     * @return \Illuminate\Http\Response
-     */
-    public function restore($id)
-    {
-        return new GeneralResource($this->service->restore($id));
-    }
+	/**
+	 * Restore the deleted model.
+	 *
+	 * @param  integer $id Id of the restored model.
+	 * @return \Illuminate\Http\Response
+	 */
+	public function restore($id)
+	{
+		return new GeneralResource($this->service->restore($id));
+	}
 }

src/Modules/Core/Decorators/CachingDecorator.php

Spacing +1 added lines, -1 removed lines

@@ -76,7 +76,7 @@
         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 $this->cache->tags([$this->cacheTag])->rememberForever($cacheKey, function() use ($arguments, $name) {
                 return call_user_func_array([$this->service, $name], $arguments);
             });
         } elseif ($this->cacheConfig) {

Indentation +71 added lines, -71 removed lines

@@ -7,84 +7,84 @@
 
 class CachingDecorator
 {
-    /**
-     * @var String
-     */
-    public $service;
+	/**
+	 * @var String
+	 */
+	public $service;
 
-    /**
-     * @var Cache
-     */
-    protected $cache;
+	/**
+	 * @var Cache
+	 */
+	protected $cache;
 
-    /**
-     * @var mixed
-     */
-    public $cacheConfig;
+	/**
+	 * @var mixed
+	 */
+	public $cacheConfig;
 
-    /**
-     * @var string
-     */
-    public $cacheTag;
+	/**
+	 * @var string
+	 */
+	public $cacheTag;
     
-    /**
-     * Init new object.
-     *
-     * @param  Object $service
-     * @param  Cache  $cache
-     *
-     * @return  void
-     */
-    public function __construct($service, Cache $cache)
-    {
-        $this->service    = $service;
-        $this->cache      = $cache;
-        $serviceClass     = explode('\\', get_class($this->service));
-        $serviceName      = end($serviceClass);
-        $this->cacheTag   = lcfirst(substr($serviceName, 0, strpos($serviceName, 'Service')));
-    }
+	/**
+	 * Init new object.
+	 *
+	 * @param  Object $service
+	 * @param  Cache  $cache
+	 *
+	 * @return  void
+	 */
+	public function __construct($service, Cache $cache)
+	{
+		$this->service    = $service;
+		$this->cache      = $cache;
+		$serviceClass     = explode('\\', get_class($this->service));
+		$serviceName      = end($serviceClass);
+		$this->cacheTag   = lcfirst(substr($serviceName, 0, strpos($serviceName, 'Service')));
+	}
 
-    /**
-     * 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->service, $name], $arguments);
-            });
-        } elseif ($this->cacheConfig) {
-            $this->cache->tags($this->cacheConfig)->flush();
-            return call_user_func_array([$this->service, $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->service, $name], $arguments);
+			});
+		} elseif ($this->cacheConfig) {
+			$this->cache->tags($this->cacheConfig)->flush();
+			return call_user_func_array([$this->service, $name], $arguments);
+		}
 
-        return call_user_func_array([$this->service, $name], $arguments);
-    }
+		return call_user_func_array([$this->service, $name], $arguments);
+	}
 
-    /**
-     * Set cache config based on the called method.
-     *
-     * @param  string $name
-     * @return void
-     */
-    private function setCacheConfig($name)
-    {
-        $cacheConfig       = Arr::get(config('core.cache_config'), $this->cacheTag, false);
-        $this->cacheConfig = false;
+	/**
+	 * Set cache config based on the called method.
+	 *
+	 * @param  string $name
+	 * @return void
+	 */
+	private function setCacheConfig($name)
+	{
+		$cacheConfig       = Arr::get(config('core.cache_config'), $this->cacheTag, false);
+		$this->cacheConfig = false;
 
-        if ($cacheConfig && in_array($name, $cacheConfig['cache'])) {
-            $this->cacheConfig = 'cache';
-        } elseif ($cacheConfig && isset($cacheConfig['clear'][$name])) {
-            $this->cacheConfig = $cacheConfig['clear'][$name];
-        }
-    }
+		if ($cacheConfig && in_array($name, $cacheConfig['cache'])) {
+			$this->cacheConfig = 'cache';
+		} elseif ($cacheConfig && isset($cacheConfig['clear'][$name])) {
+			$this->cacheConfig = $cacheConfig['clear'][$name];
+		}
+	}
 }

src/Modules/Core/Utl/Media.php

Indentation +59 added lines, -59 removed lines

@@ -4,70 +4,70 @@
 
 class Media
 {
-    /**
-     * Upload the given image.
-     *
-     * @param  object  $image
-     * @param  string  $dir
-     * @return string
-     */
-    public function uploadImage($image, $dir)
-    {
-        $image = \Image::make($image);
-        return $this->saveImage($image, $dir);
-    }
+	/**
+	 * Upload the given image.
+	 *
+	 * @param  object  $image
+	 * @param  string  $dir
+	 * @return string
+	 */
+	public function uploadImage($image, $dir)
+	{
+		$image = \Image::make($image);
+		return $this->saveImage($image, $dir);
+	}
 
-    /**
-     * 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;
+		}
 
-        if(filter_var($image, FILTER_VALIDATE_URL)) {
-            return $image;
-        }
+		if(filter_var($image, FILTER_VALIDATE_URL)) {
+			return $image;
+		}
         
-        try {
-            $base  = base64_decode(preg_replace('#^data:image/\w+;base64,#i', '', $image));
-            $image = \Image::make($base);
-        } catch (\Exception $e) {
-            \Errors::cannotUploadImage();
-        }
+		try {
+			$base  = base64_decode(preg_replace('#^data:image/\w+;base64,#i', '', $image));
+			$image = \Image::make($base);
+		} catch (\Exception $e) {
+			\Errors::cannotUploadImage();
+		}
 
-        return $this->saveImage($image, $dir);
-    }
+		return $this->saveImage($image, $dir);
+	}
 
-    /**
-     * Delete the given image.
-     *
-     * @param  object $path
-     * @return void
-     */
-    public function deleteImage($path)
-    {
-        \Storage::delete($path);
-    }
+	/**
+	 * Delete the given image.
+	 *
+	 * @param  object $path
+	 * @return void
+	 */
+	public function deleteImage($path)
+	{
+		\Storage::delete($path);
+	}
 
-    /**
-     * Save the given image.
-     *
-     * @param  object  $image
-     * @param  string  $dir
-     * @return string
-     */
-    protected function saveImage($image, $dir)
-    {
-        $imageName = 'image'.uniqid().time().'.jpg';
-        $path      = 'public'.DIRECTORY_SEPARATOR.'uploads'.DIRECTORY_SEPARATOR.$dir.DIRECTORY_SEPARATOR.$imageName;
-        \Storage::put($path, $image->stream());
+	/**
+	 * Save the given image.
+	 *
+	 * @param  object  $image
+	 * @param  string  $dir
+	 * @return string
+	 */
+	protected function saveImage($image, $dir)
+	{
+		$imageName = 'image'.uniqid().time().'.jpg';
+		$path      = 'public'.DIRECTORY_SEPARATOR.'uploads'.DIRECTORY_SEPARATOR.$dir.DIRECTORY_SEPARATOR.$imageName;
+		\Storage::put($path, $image->stream());
 
-        return $path;
-    }
+		return $path;
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -26,11 +26,11 @@
      */
     public function uploadImageBas64($image, $dir)
     {
-        if (! strlen($image)) {
+        if ( ! strlen($image)) {
             return null;
         }
 
-        if(filter_var($image, FILTER_VALIDATE_URL)) {
+        if (filter_var($image, FILTER_VALIDATE_URL)) {
             return $image;
         }