SherifElfadaly / Laravel-Api-Skeleton

src/Modules/Acl/AclGroup.php

Indentation +38 added lines, -38 removed lines

@@ -5,42 +5,42 @@
 
 class AclGroup extends Model{
 
-    use SoftDeletes;
-    protected $table    = 'groups';
-    protected $dates    = ['created_at', 'updated_at', 'deleted_at'];
-    protected $hidden   = ['deleted_at'];
-    protected $guarded  = ['id'];
-    protected $fillable = ['name'];
-    public $searchable  = ['name'];
-
-    public function getCreatedAtAttribute($value)
-    {
-        return \Carbon\Carbon::parse($value)->tz(\Session::get('time-zone'))->toDateTimeString();
-    }
-
-    public function getUpdatedAtAttribute($value)
-    {
-        return \Carbon\Carbon::parse($value)->tz(\Session::get('time-zone'))->toDateTimeString();
-    }
-
-    public function getDeletedAtAttribute($value)
-    {
-        return \Carbon\Carbon::parse($value)->tz(\Session::get('time-zone'))->toDateTimeString();
-    }
-
-    public function users()
-    {
-        return $this->belongsToMany('\App\Modules\Acl\AclUser','users_groups','group_id','user_id')->whereNull('users_groups.deleted_at')->withTimestamps();
-    }
-
-    public function permissions()
-    {
-        return $this->belongsToMany('\App\Modules\Acl\AclPermission','groups_permissions','group_id','permission_id')->whereNull('groups_permissions.deleted_at')->withTimestamps();
-    }
-
-    public static function boot()
-    {
-        parent::boot();
-        $this->observe(\App::make('App\Modules\Acl\ModelObservers\AclGroupObserver'));
-    }
+	use SoftDeletes;
+	protected $table    = 'groups';
+	protected $dates    = ['created_at', 'updated_at', 'deleted_at'];
+	protected $hidden   = ['deleted_at'];
+	protected $guarded  = ['id'];
+	protected $fillable = ['name'];
+	public $searchable  = ['name'];
+
+	public function getCreatedAtAttribute($value)
+	{
+		return \Carbon\Carbon::parse($value)->tz(\Session::get('time-zone'))->toDateTimeString();
+	}
+
+	public function getUpdatedAtAttribute($value)
+	{
+		return \Carbon\Carbon::parse($value)->tz(\Session::get('time-zone'))->toDateTimeString();
+	}
+
+	public function getDeletedAtAttribute($value)
+	{
+		return \Carbon\Carbon::parse($value)->tz(\Session::get('time-zone'))->toDateTimeString();
+	}
+
+	public function users()
+	{
+		return $this->belongsToMany('\App\Modules\Acl\AclUser','users_groups','group_id','user_id')->whereNull('users_groups.deleted_at')->withTimestamps();
+	}
+
+	public function permissions()
+	{
+		return $this->belongsToMany('\App\Modules\Acl\AclPermission','groups_permissions','group_id','permission_id')->whereNull('groups_permissions.deleted_at')->withTimestamps();
+	}
+
+	public static function boot()
+	{
+		parent::boot();
+		$this->observe(\App::make('App\Modules\Acl\ModelObservers\AclGroupObserver'));
+	}
 }

src/Modules/Acl/AclUser.php

Indentation +129 added lines, -129 removed lines

@@ -7,135 +7,135 @@
 
 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'];
-    protected $fillable = ['profile_picture', 'name', 'email', 'password'];
-    public $searchable  = ['name', 'email'];
+	use SoftDeletes, HasApiTokens;
+	protected $table    = 'users';
+	protected $dates    = ['created_at', 'updated_at', 'deleted_at'];
+	protected $hidden   = ['password', 'remember_token','deleted_at'];
+	protected $guarded  = ['id'];
+	protected $fillable = ['profile_picture', 'name', 'email', 'password'];
+	public $searchable  = ['name', 'email'];
     
-    public function getCreatedAtAttribute($value)
-    {
-        return \Carbon\Carbon::parse($value)->tz(\Session::get('time-zone'))->toDateTimeString();
-    }
-
-    public function getUpdatedAtAttribute($value)
-    {
-        return \Carbon\Carbon::parse($value)->tz(\Session::get('time-zone'))->toDateTimeString();
-    }
-
-    public function getDeletedAtAttribute($value)
-    {
-        return \Carbon\Carbon::parse($value)->tz(\Session::get('time-zone'))->toDateTimeString();
-    }
-
-    /**
-     * Encrypt the password attribute before
-     * saving it in the storage.
-     * 
-     * @param string $value 
-     */
-    public function setPasswordAttribute($value)
-    {
-        $this->attributes['password'] = bcrypt($value);
-    }
-
-    /**
-     * Get the entity's notifications.
-     */
-    public function notifications()
-    {
-        return $this->morphMany('\App\Modules\Notifications\Notification', '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 groups()
-    {
-        return $this->belongsToMany('\App\Modules\Acl\AclGroup','users_groups','user_id','group_id')->whereNull('users_groups.deleted_at')->withTimestamps();
-    }
-
-    public function oauthClients()
-    {
-        return $this->hasMany('App\Modules\Acl\OauthClient', 'user_id');
-    }
-
-    /**
-     * Return fcm device tokens that will be used in sending fcm notifications.
-     * 
-     * @return array
-     */
-    public function routeNotificationForFCM()
-    {
-        $devices = \Core::pushNotificationsDevices()->findBy(['user_id' => $this->id]);
-        $tokens  = [];
-
-        foreach ($devices as $device) 
-        {
-            $accessToken = decrypt($device->access_token);
-
-            try
-            {
-                if (\Core::users()->accessTokenExpiredOrRevoked($accessToken)) 
-                {
-                    continue;
-                }
-
-                $tokens[] = $device->device_token;
-            } 
-            catch (\Exception $e) 
-            {
-                $device->forceDelete();
-            }
-        }
-
-        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('skeleton.social_pass'))
-        {
-            return true;
-        }
-
-        return \Hash::check($password, $this->password);
-    }
+	public function getCreatedAtAttribute($value)
+	{
+		return \Carbon\Carbon::parse($value)->tz(\Session::get('time-zone'))->toDateTimeString();
+	}
+
+	public function getUpdatedAtAttribute($value)
+	{
+		return \Carbon\Carbon::parse($value)->tz(\Session::get('time-zone'))->toDateTimeString();
+	}
+
+	public function getDeletedAtAttribute($value)
+	{
+		return \Carbon\Carbon::parse($value)->tz(\Session::get('time-zone'))->toDateTimeString();
+	}
+
+	/**
+	 * Encrypt the password attribute before
+	 * saving it in the storage.
+	 * 
+	 * @param string $value 
+	 */
+	public function setPasswordAttribute($value)
+	{
+		$this->attributes['password'] = bcrypt($value);
+	}
+
+	/**
+	 * Get the entity's notifications.
+	 */
+	public function notifications()
+	{
+		return $this->morphMany('\App\Modules\Notifications\Notification', '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 groups()
+	{
+		return $this->belongsToMany('\App\Modules\Acl\AclGroup','users_groups','user_id','group_id')->whereNull('users_groups.deleted_at')->withTimestamps();
+	}
+
+	public function oauthClients()
+	{
+		return $this->hasMany('App\Modules\Acl\OauthClient', 'user_id');
+	}
+
+	/**
+	 * Return fcm device tokens that will be used in sending fcm notifications.
+	 * 
+	 * @return array
+	 */
+	public function routeNotificationForFCM()
+	{
+		$devices = \Core::pushNotificationsDevices()->findBy(['user_id' => $this->id]);
+		$tokens  = [];
+
+		foreach ($devices as $device) 
+		{
+			$accessToken = decrypt($device->access_token);
+
+			try
+			{
+				if (\Core::users()->accessTokenExpiredOrRevoked($accessToken)) 
+				{
+					continue;
+				}
+
+				$tokens[] = $device->device_token;
+			} 
+			catch (\Exception $e) 
+			{
+				$device->forceDelete();
+			}
+		}
+
+		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('skeleton.social_pass'))
+		{
+			return true;
+		}
+
+		return \Hash::check($password, $this->password);
+	}
     
-    public static function boot()
-    {
-        parent::boot();
-        $this->observe(\App::make('App\Modules\Acl\ModelObservers\AclUserObserver'));
-    }
+	public static function boot()
+	{
+		parent::boot();
+		$this->observe(\App::make('App\Modules\Acl\ModelObservers\AclUserObserver'));
+	}
 }

src/Modules/Acl/OauthClient.php

Indentation +16 added lines, -16 removed lines

@@ -6,23 +6,23 @@
 
 class OauthClient extends Client
 {
-    protected $dates    = ['created_at', 'updated_at'];
-    protected $fillable = ['name', 'redirect', 'user_id', 'personal_access_client', 'password_client', 'revoked'];
-    public $searchable  = ['name'];
+	protected $dates    = ['created_at', 'updated_at'];
+	protected $fillable = ['name', 'redirect', 'user_id', 'personal_access_client', 'password_client', 'revoked'];
+	public $searchable  = ['name'];
     
-    public function getCreatedAtAttribute($value)
-    {
-        return \Carbon\Carbon::parse($value)->tz(\Session::get('time-zone'))->toDateTimeString();
-    }
+	public function getCreatedAtAttribute($value)
+	{
+		return \Carbon\Carbon::parse($value)->tz(\Session::get('time-zone'))->toDateTimeString();
+	}
 
-    public function getUpdatedAtAttribute($value)
-    {
-        return \Carbon\Carbon::parse($value)->tz(\Session::get('time-zone'))->toDateTimeString();
-    }
+	public function getUpdatedAtAttribute($value)
+	{
+		return \Carbon\Carbon::parse($value)->tz(\Session::get('time-zone'))->toDateTimeString();
+	}
     
-    public static function boot()
-    {
-        parent::boot();
-        $this->observe(\App::make('App\Modules\Acl\ModelObservers\OauthClientObserver'));
-    }
+	public static function boot()
+	{
+		parent::boot();
+		$this->observe(\App::make('App\Modules\Acl\ModelObservers\OauthClientObserver'));
+	}
 }

src/Modules/Acl/AclPermission.php

Indentation +28 added lines, -28 removed lines

@@ -5,37 +5,37 @@
 
 class AclPermission extends Model {
 
-    use SoftDeletes;
-    protected $table    = 'permissions';
-    protected $dates    = ['created_at', 'updated_at', 'deleted_at'];
-    protected $hidden   = ['deleted_at'];
-    protected $guarded  = ['id'];
-    protected $fillable = ['name', 'model'];
-    public $searchable  = ['name', 'model'];
+	use SoftDeletes;
+	protected $table    = 'permissions';
+	protected $dates    = ['created_at', 'updated_at', 'deleted_at'];
+	protected $hidden   = ['deleted_at'];
+	protected $guarded  = ['id'];
+	protected $fillable = ['name', 'model'];
+	public $searchable  = ['name', 'model'];
 
-    public function getCreatedAtAttribute($value)
-    {
-        return \Carbon\Carbon::parse($value)->tz(\Session::get('time-zone'))->toDateTimeString();
-    }
+	public function getCreatedAtAttribute($value)
+	{
+		return \Carbon\Carbon::parse($value)->tz(\Session::get('time-zone'))->toDateTimeString();
+	}
 
-    public function getUpdatedAtAttribute($value)
-    {
-        return \Carbon\Carbon::parse($value)->tz(\Session::get('time-zone'))->toDateTimeString();
-    }
+	public function getUpdatedAtAttribute($value)
+	{
+		return \Carbon\Carbon::parse($value)->tz(\Session::get('time-zone'))->toDateTimeString();
+	}
 
-    public function getDeletedAtAttribute($value)
-    {
-        return \Carbon\Carbon::parse($value)->tz(\Session::get('time-zone'))->toDateTimeString();
-    }
+	public function getDeletedAtAttribute($value)
+	{
+		return \Carbon\Carbon::parse($value)->tz(\Session::get('time-zone'))->toDateTimeString();
+	}
     
-    public function groups()
-    {
-        return $this->belongsToMany('\App\Modules\Acl\AclGroup','groups_permissions','permission_id','group_id')->whereNull('groups_permissions.deleted_at')->withTimestamps();
-    }
+	public function groups()
+	{
+		return $this->belongsToMany('\App\Modules\Acl\AclGroup','groups_permissions','permission_id','group_id')->whereNull('groups_permissions.deleted_at')->withTimestamps();
+	}
 
-    public static function boot()
-    {
-        parent::boot();
-        $this->observe(\App::make('App\Modules\Acl\ModelObservers\AclPermissionObserver'));
-    }
+	public static function boot()
+	{
+		parent::boot();
+		$this->observe(\App::make('App\Modules\Acl\ModelObservers\AclPermissionObserver'));
+	}
 }

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 mixed
-     */
-    public $cacheConfig;
+	/**
+	 * The cacheConfig implementation.
+	 * 
+	 * @var mixed
+	 */
+	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

src/Modules/Core/Settings.php

Indentation +28 added lines, -28 removed lines

@@ -5,37 +5,37 @@
 
 class Settings extends Model{
 
-    use SoftDeletes;
-    protected $table    = 'settings';
-    protected $dates    = ['created_at', 'updated_at', 'deleted_at'];
-    protected $hidden   = ['deleted_at'];
-    protected $guarded  = ['id', 'key'];
-    protected $fillable = ['name','value'];
-    public $searchable  = ['name', 'value', 'key'];
+	use SoftDeletes;
+	protected $table    = 'settings';
+	protected $dates    = ['created_at', 'updated_at', 'deleted_at'];
+	protected $hidden   = ['deleted_at'];
+	protected $guarded  = ['id', 'key'];
+	protected $fillable = ['name','value'];
+	public $searchable  = ['name', 'value', 'key'];
     
-    public function getCreatedAtAttribute($value)
-    {
-        return \Carbon\Carbon::parse($value)->tz(\Session::get('time-zone'))->toDateTimeString();
-    }
+	public function getCreatedAtAttribute($value)
+	{
+		return \Carbon\Carbon::parse($value)->tz(\Session::get('time-zone'))->toDateTimeString();
+	}
 
-    public function getUpdatedAtAttribute($value)
-    {
-        return \Carbon\Carbon::parse($value)->tz(\Session::get('time-zone'))->toDateTimeString();
-    }
+	public function getUpdatedAtAttribute($value)
+	{
+		return \Carbon\Carbon::parse($value)->tz(\Session::get('time-zone'))->toDateTimeString();
+	}
 
-    public function getDeletedAtAttribute($value)
-    {
-        return \Carbon\Carbon::parse($value)->tz(\Session::get('time-zone'))->toDateTimeString();
-    }
+	public function getDeletedAtAttribute($value)
+	{
+		return \Carbon\Carbon::parse($value)->tz(\Session::get('time-zone'))->toDateTimeString();
+	}
     
-    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();
-        $this->observe(\App::make('App\Modules\Core\ModelObservers\SettingsObserver'));
-    }
+	public static function boot()
+	{
+		parent::boot();
+		$this->observe(\App::make('App\Modules\Core\ModelObservers\SettingsObserver'));
+	}
 }

src/Modules/Core/Utl/Media.php

Indentation +51 added lines, -51 removed lines

@@ -2,63 +2,63 @@
 
 class Media
 {
-    /**
-     * Upload the given image.
-     * 
-     * @param  object  $image
-     * @param  string  $dir
-     * @return string
-     */
-    public function uploadImage($image, $dir) 
-    {
-       $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) 
+	{
+	   $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;
+		}
         
-        $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;
+		! 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);
+	}
 
-    /**
-     * 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 +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/Traits/Translatable.php

Indentation +40 added lines, -40 removed lines

@@ -2,50 +2,50 @@
 
 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($value);
-            }
-        }
+		foreach ($model->attributes AS $key => $value)
+		{
+			if (isset($this->translatable) && in_array($key, $this->translatable)) 
+			{
+				$model->$key = $this->getTranslatedAttribute($value);
+			}
+		}
 
-        return $model;
-    }
+		return $model;
+	}
 
-    /**
-     * Returns a translatable model attribute based on the application's locale settings.
-     *
-     * @param $values
-     * @return string
-     */
-    protected function getTranslatedAttribute($values)
-    {
-        $values         = json_decode($values);
-        $primaryLocale  = \Session::get('locale');
-        $fallbackLocale = 'en';
+	/**
+	 * Returns a translatable model attribute based on the application's locale settings.
+	 *
+	 * @param $values
+	 * @return string
+	 */
+	protected function getTranslatedAttribute($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

src/Modules/Core/Providers/ModuleServiceProvider.php

Indentation +45 added lines, -45 removed lines

@@ -7,50 +7,50 @@
 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');
-
-        $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;
-        });
-
-        //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 Mpgs Facade to the IoC Container
-        \App::bind('Media', function()
-        {
-            return new \App\Modules\Core\Utl\Media;
-        });
+	 * 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');
+	}
+
+	/**
+	 * 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 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;
+		});
         
-        $this->app->register(RouteServiceProvider::class);
-    }
+		$this->app->register(RouteServiceProvider::class);
+	}
 }