SherifElfadaly / Laravel-Api-Skeleton

src/Modules/PushNotificationDevices/Services/PushNotificationDeviceService.php

Indentation +52 added lines, -52 removed lines

@@ -10,63 +10,63 @@
 
 class PushNotificationDeviceService extends BaseService
 {
-    /**
-     * Init new object.
-     *
-     * @param   PushNotificationDeviceRepository $repo
-     * @return  void
-     */
-    public function __construct(PushNotificationDeviceRepository $repo)
-    {
-        parent::__construct($repo);
-    }
+	/**
+	 * Init new object.
+	 *
+	 * @param   PushNotificationDeviceRepository $repo
+	 * @return  void
+	 */
+	public function __construct(PushNotificationDeviceRepository $repo)
+	{
+		parent::__construct($repo);
+	}
 
-    /**
-     * Register the given device to the logged in user.
-     *
-     * @param  array $data
-     * @return void
-     */
-    public function registerDevice($data)
-    {
-        $data['access_token'] = \Auth::user()->token();
-        $data['user_id']      = \Auth::id();
-        $device               = $this->repo->first([
-            'and' => [
-                'device_token' => $data['device_token'],
-                'user_id' => $data['user_id']
-                ]
-            ]);
+	/**
+	 * Register the given device to the logged in user.
+	 *
+	 * @param  array $data
+	 * @return void
+	 */
+	public function registerDevice($data)
+	{
+		$data['access_token'] = \Auth::user()->token();
+		$data['user_id']      = \Auth::id();
+		$device               = $this->repo->first([
+			'and' => [
+				'device_token' => $data['device_token'],
+				'user_id' => $data['user_id']
+				]
+			]);
 
-        if ($device) {
-            $data['id'] = $device->id;
-        }
+		if ($device) {
+			$data['id'] = $device->id;
+		}
 
-        return $this->repo->save($data);
-    }
+		return $this->repo->save($data);
+	}
 
-    /**
-     * Generate the given message data.
-     *
-     * @param  string $title
-     * @param  string $message
-     * @param  array  $data
-     * @return void
-     */
-    public function generateMessageData($title, $message, $data = [])
-    {
-        $optionBuilder       = new OptionsBuilder();
-        $notificationBuilder = new PayloadNotificationBuilder($title);
-        $dataBuilder         = new PayloadDataBuilder();
+	/**
+	 * Generate the given message data.
+	 *
+	 * @param  string $title
+	 * @param  string $message
+	 * @param  array  $data
+	 * @return void
+	 */
+	public function generateMessageData($title, $message, $data = [])
+	{
+		$optionBuilder       = new OptionsBuilder();
+		$notificationBuilder = new PayloadNotificationBuilder($title);
+		$dataBuilder         = new PayloadDataBuilder();
 
-        $optionBuilder->setTimeToLive(60 * 20);
-        $notificationBuilder->setBody($message);
-        $dataBuilder->addData($data);
+		$optionBuilder->setTimeToLive(60 * 20);
+		$notificationBuilder->setBody($message);
+		$dataBuilder->addData($data);
 
-        $options             = $optionBuilder->build();
-        $notification        = $notificationBuilder->build();
-        $data                = $dataBuilder->build();
+		$options             = $optionBuilder->build();
+		$notification        = $notificationBuilder->build();
+		$data                = $dataBuilder->build();
 
-        return compact('options', 'notification', 'data');
-    }
+		return compact('options', 'notification', 'data');
+	}
 }

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

Indentation +9 added lines, -9 removed lines

@@ -2,14 +2,14 @@
 
 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'
+	/**
+	 * 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'
 
 ];

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

Indentation +9 added lines, -9 removed lines

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

src/Modules/Core/Providers/ModuleServiceProvider.php

Indentation +48 added lines, -48 removed lines

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

Spacing +5 added lines, -5 removed lines

@@ -28,27 +28,27 @@
     public function register()
     {
         //Bind Core Facade to the Service Container
-        $this->app->singleton('Core', function () {
+        $this->app->singleton('Core', function() {
             return new \App\Modules\Core\Core;
         });
 
         //Bind Errors Facade to the Service Container
-        $this->app->singleton('Errors', function () {
+        $this->app->singleton('Errors', function() {
             return new \App\Modules\Core\Errors\Errors;
         });
 
         //Bind CoreConfig Facade to the Service Container
-        $this->app->singleton('CoreConfig', function () {
+        $this->app->singleton('CoreConfig', function() {
             return new \App\Modules\Core\Utl\CoreConfig;
         });
 
         //Bind Media Facade to the Service Container
-        $this->app->singleton('Media', function () {
+        $this->app->singleton('Media', function() {
             return new \App\Modules\Core\Utl\Media;
         });
 
         //Bind ApiConsumer Facade to the Service Container
-        $this->app->singleton('ApiConsumer', function () {
+        $this->app->singleton('ApiConsumer', function() {
             $app = app();
             return new \App\Modules\Core\Utl\ApiConsumer($app, $app['request'], $app['router']);
         });

src/Modules/Core/Console/Commands/MakeModuleCommand.php

Indentation +233 added lines, -233 removed lines

@@ -10,243 +10,243 @@
 
 class MakeModuleCommand extends Command
 {
-    /**
-     * The name and signature of the console command.
-     *
-     * @var string
-     */
-    protected $signature = 'generate:module
+	/**
+	 * The name and signature of the console command.
+	 *
+	 * @var string
+	 */
+	protected $signature = 'generate:module
         {slug : The slug of the module}';
 
-    /**
-     * The console command description.
-     *
-     * @var string
-     */
-    protected $description = 'Create a new module';
-
-    /**
-     * The modules instance.
-     *
-     * @var RepositoryManager
-     */
-    protected $module;
-
-    /**
-     * The filesystem instance.
-     *
-     * @var Filesystem
-     */
-    protected $files;
-
-    /**
-     * Array to store the configuration details.
-     *
-     * @var array
-     */
-    protected $container;
-
-    /**
-     * Array of folder mappings.
-     *
-     * @var Array
-     */
-    protected $mapping = [
-        'Database/Factories'  => 'Database/Factories',
-        'Database/Migrations' => 'Database/Migrations',
-        'Database/Seeds'      => 'Database/Seeds',
-        'Http/Controllers'    => 'Http/Controllers',
-        'Http/Requests'       => 'Http/Requests',
-        'Http/Resources'      => 'Http/Resources',
-        'ModelObservers'      => 'ModelObservers',
-        'Providers'           => 'Providers',
-        'Repositories'        => 'Repositories',
-        'Services'            => 'Services',
-        'Routes'              => 'Routes',
-        'Errors'              => 'Errors',
-    ];
-
-    /**
-     * Create a new command instance.
-     *
-     * @param Filesystem $files
-     * @param RepositoryManager $module
-     */
-    public function __construct(Filesystem $files, RepositoryManager $module)
-    {
-        parent::__construct();
-
-        $this->files = $files;
-        $this->module = $module;
-    }
-
-    /**
-     * Execute the console command.
-     *
-     * @return mixed
-     */
-    public function handle()
-    {
-        $this->container['slug']        = Str::slug($this->argument('slug'));
-        $this->container['name']        = Str::studly($this->container['slug']);
-        $this->container['version']     = '1.0';
-        $this->container['description'] = 'This is the description for the ' . $this->container['name'] . ' module.';
-        $this->container['location']    = config('modules.default_location');
-        $this->container['provider']    = config("modules.locations.{$this->container['location']}.provider");
-        $this->container['basename']    = Str::studly($this->container['slug']);
-        $this->container['namespace']   = config("modules.locations.{$this->container['location']}.namespace").$this->container['basename'];
-
-        return $this->generate();
-    }
-
-    /**
-     * Generate the module.
-     */
-    protected function generate()
-    {
-        $steps = [
-            'Generating module...' => 'generateModule',
-            'Optimizing module cache...' => 'optimizeModules',
-            'Generating migrations...' => 'generateMigration',
-        ];
-
-        $progress = new ProgressBar($this->output, count($steps));
-        $progress->start();
-
-        foreach ($steps as $message => $function) {
-            $progress->setMessage($message);
-
-            $this->$function();
-
-            $progress->advance();
-        }
-
-        $progress->finish();
-
-        event($this->container['slug'] . '.module.made');
-
-        $this->info("\nModule generated successfully.");
-    }
-
-    /**
-     * Generate defined module folders.
-     */
-    protected function generateModule()
-    {
-        $location = $this->container['location'];
-        $root     = module_path(null, '', $location);
-        $manifest = config("modules.locations.$location.manifest") ?: 'module.json';
-        $provider = config("modules.locations.$location.provider") ?: 'ModuleServiceProvider';
-
-        if (!$this->files->isDirectory($root)) {
-            $this->files->makeDirectory($root);
-        }
-
-        $directory = module_path(null, $this->container['basename'], $location);
-        $source    = __DIR__ . '/Stubs/Module';
-
-        $this->files->makeDirectory($directory);
-
-        $sourceFiles = $this->files->allFiles($source, true);
-
-        if (!empty($this->mapping)) {
-            $search = array_keys($this->mapping);
-            $replace = array_values($this->mapping);
-        }
-
-        foreach ($sourceFiles as $file) {
-            $contents = $this->replacePlaceholders($file->getContents());
-            $subPath = $file->getRelativePathname();
-
-            if (!empty($this->mapping)) {
-                $subPath = str_replace($search, $replace, $subPath);
-            }
-
-            $filePath = $directory . '/' . $subPath;
+	/**
+	 * The console command description.
+	 *
+	 * @var string
+	 */
+	protected $description = 'Create a new module';
+
+	/**
+	 * The modules instance.
+	 *
+	 * @var RepositoryManager
+	 */
+	protected $module;
+
+	/**
+	 * The filesystem instance.
+	 *
+	 * @var Filesystem
+	 */
+	protected $files;
+
+	/**
+	 * Array to store the configuration details.
+	 *
+	 * @var array
+	 */
+	protected $container;
+
+	/**
+	 * Array of folder mappings.
+	 *
+	 * @var Array
+	 */
+	protected $mapping = [
+		'Database/Factories'  => 'Database/Factories',
+		'Database/Migrations' => 'Database/Migrations',
+		'Database/Seeds'      => 'Database/Seeds',
+		'Http/Controllers'    => 'Http/Controllers',
+		'Http/Requests'       => 'Http/Requests',
+		'Http/Resources'      => 'Http/Resources',
+		'ModelObservers'      => 'ModelObservers',
+		'Providers'           => 'Providers',
+		'Repositories'        => 'Repositories',
+		'Services'            => 'Services',
+		'Routes'              => 'Routes',
+		'Errors'              => 'Errors',
+	];
+
+	/**
+	 * Create a new command instance.
+	 *
+	 * @param Filesystem $files
+	 * @param RepositoryManager $module
+	 */
+	public function __construct(Filesystem $files, RepositoryManager $module)
+	{
+		parent::__construct();
+
+		$this->files = $files;
+		$this->module = $module;
+	}
+
+	/**
+	 * Execute the console command.
+	 *
+	 * @return mixed
+	 */
+	public function handle()
+	{
+		$this->container['slug']        = Str::slug($this->argument('slug'));
+		$this->container['name']        = Str::studly($this->container['slug']);
+		$this->container['version']     = '1.0';
+		$this->container['description'] = 'This is the description for the ' . $this->container['name'] . ' module.';
+		$this->container['location']    = config('modules.default_location');
+		$this->container['provider']    = config("modules.locations.{$this->container['location']}.provider");
+		$this->container['basename']    = Str::studly($this->container['slug']);
+		$this->container['namespace']   = config("modules.locations.{$this->container['location']}.namespace").$this->container['basename'];
+
+		return $this->generate();
+	}
+
+	/**
+	 * Generate the module.
+	 */
+	protected function generate()
+	{
+		$steps = [
+			'Generating module...' => 'generateModule',
+			'Optimizing module cache...' => 'optimizeModules',
+			'Generating migrations...' => 'generateMigration',
+		];
+
+		$progress = new ProgressBar($this->output, count($steps));
+		$progress->start();
+
+		foreach ($steps as $message => $function) {
+			$progress->setMessage($message);
+
+			$this->$function();
+
+			$progress->advance();
+		}
+
+		$progress->finish();
+
+		event($this->container['slug'] . '.module.made');
+
+		$this->info("\nModule generated successfully.");
+	}
+
+	/**
+	 * Generate defined module folders.
+	 */
+	protected function generateModule()
+	{
+		$location = $this->container['location'];
+		$root     = module_path(null, '', $location);
+		$manifest = config("modules.locations.$location.manifest") ?: 'module.json';
+		$provider = config("modules.locations.$location.provider") ?: 'ModuleServiceProvider';
+
+		if (!$this->files->isDirectory($root)) {
+			$this->files->makeDirectory($root);
+		}
+
+		$directory = module_path(null, $this->container['basename'], $location);
+		$source    = __DIR__ . '/Stubs/Module';
+
+		$this->files->makeDirectory($directory);
+
+		$sourceFiles = $this->files->allFiles($source, true);
+
+		if (!empty($this->mapping)) {
+			$search = array_keys($this->mapping);
+			$replace = array_values($this->mapping);
+		}
+
+		foreach ($sourceFiles as $file) {
+			$contents = $this->replacePlaceholders($file->getContents());
+			$subPath = $file->getRelativePathname();
+
+			if (!empty($this->mapping)) {
+				$subPath = str_replace($search, $replace, $subPath);
+			}
+
+			$filePath = $directory . '/' . $subPath;
             
-            // if the file is module.json, replace it with the custom manifest file name
-            if ($file->getFilename() === 'module.json' && $manifest) {
-                $filePath = str_replace('module.json', $manifest, $filePath);
-            }
+			// if the file is module.json, replace it with the custom manifest file name
+			if ($file->getFilename() === 'module.json' && $manifest) {
+				$filePath = str_replace('module.json', $manifest, $filePath);
+			}
             
-            // if the file is ModuleServiceProvider.php, replace it with the custom provider file name
-            if ($file->getFilename() === 'ModuleServiceProvider.php') {
-                $filePath = str_replace('ModuleServiceProvider', $provider, $filePath);
-            }
-            $filePath = $this->replacePlaceholders($filePath);
+			// if the file is ModuleServiceProvider.php, replace it with the custom provider file name
+			if ($file->getFilename() === 'ModuleServiceProvider.php') {
+				$filePath = str_replace('ModuleServiceProvider', $provider, $filePath);
+			}
+			$filePath = $this->replacePlaceholders($filePath);
             
-            $dir = dirname($filePath);
+			$dir = dirname($filePath);
             
-            if (! $this->files->isDirectory($dir)) {
-                $this->files->makeDirectory($dir, 0755, true);
-            }
-
-            $this->files->put($filePath, $contents);
-        }
-    }
-
-    protected function replacePlaceholders($contents)
-    {
-        $modelName = \Str::camel($this->container['slug']);
-        $modelNameSingular = \Str::singular($modelName);
-
-        $find = [
-            'DummyFactory',
-            'DummyModelName',
-            'DummyModuleSlug',
-            'DummyModule',
-            'DummyModel',
-            'DummyDatabaseSeeder',
-            'DummyTableSeeder',
-            'DummyController',
-            'DummyService',
-            'DummyRepository',
-            'DummyErrors',
-            'InsertDummy',
-            'UpdateDummy',
-            'DummyResource',
-            'DummyObserver',
-            'DummyTableName',
-            'DummyRoutePrefix',
-        ];
-
-        $replace = [
-            ucfirst($modelNameSingular) . 'Factory',
-            $modelNameSingular,
-            $this->container['slug'],
-            ucfirst($modelName),
-            ucfirst($modelNameSingular),
-            ucfirst($modelName) . 'DatabaseSeeder',
-            ucfirst($modelName) . 'TableSeeder',
-            ucfirst($modelNameSingular) . 'Controller',
-            ucfirst($modelNameSingular) . 'Service',
-            ucfirst($modelNameSingular) . 'Repository',
-            ucfirst($modelName) . 'Errors',
-            'Insert' . ucfirst($modelNameSingular),
-            'Update' . ucfirst($modelNameSingular),
-            ucfirst($modelNameSingular),
-            ucfirst($modelNameSingular) . 'Observer',
-            $modelName,
-            $modelName,
-        ];
-
-        return str_replace($find, $replace, $contents);
-    }
-
-    /**
-     * Reset module cache of enabled and disabled modules.
-     */
-    protected function optimizeModules()
-    {
-        return $this->callSilent('module:optimize');
-    }
-
-    /**
-     * Generate table migrations.
-     */
-    protected function generateMigration()
-    {
-        $modelName = $this->container['slug'];
-        return $this->callSilent('make:module:migration', ['slug' => $modelName, 'name' => 'create_' . $modelName . '_table']);
-    }
+			if (! $this->files->isDirectory($dir)) {
+				$this->files->makeDirectory($dir, 0755, true);
+			}
+
+			$this->files->put($filePath, $contents);
+		}
+	}
+
+	protected function replacePlaceholders($contents)
+	{
+		$modelName = \Str::camel($this->container['slug']);
+		$modelNameSingular = \Str::singular($modelName);
+
+		$find = [
+			'DummyFactory',
+			'DummyModelName',
+			'DummyModuleSlug',
+			'DummyModule',
+			'DummyModel',
+			'DummyDatabaseSeeder',
+			'DummyTableSeeder',
+			'DummyController',
+			'DummyService',
+			'DummyRepository',
+			'DummyErrors',
+			'InsertDummy',
+			'UpdateDummy',
+			'DummyResource',
+			'DummyObserver',
+			'DummyTableName',
+			'DummyRoutePrefix',
+		];
+
+		$replace = [
+			ucfirst($modelNameSingular) . 'Factory',
+			$modelNameSingular,
+			$this->container['slug'],
+			ucfirst($modelName),
+			ucfirst($modelNameSingular),
+			ucfirst($modelName) . 'DatabaseSeeder',
+			ucfirst($modelName) . 'TableSeeder',
+			ucfirst($modelNameSingular) . 'Controller',
+			ucfirst($modelNameSingular) . 'Service',
+			ucfirst($modelNameSingular) . 'Repository',
+			ucfirst($modelName) . 'Errors',
+			'Insert' . ucfirst($modelNameSingular),
+			'Update' . ucfirst($modelNameSingular),
+			ucfirst($modelNameSingular),
+			ucfirst($modelNameSingular) . 'Observer',
+			$modelName,
+			$modelName,
+		];
+
+		return str_replace($find, $replace, $contents);
+	}
+
+	/**
+	 * Reset module cache of enabled and disabled modules.
+	 */
+	protected function optimizeModules()
+	{
+		return $this->callSilent('module:optimize');
+	}
+
+	/**
+	 * Generate table migrations.
+	 */
+	protected function generateMigration()
+	{
+		$modelName = $this->container['slug'];
+		return $this->callSilent('make:module:migration', ['slug' => $modelName, 'name' => 'create_' . $modelName . '_table']);
+	}
 }

Spacing +19 added lines, -19 removed lines

@@ -90,7 +90,7 @@ 
         $this->container['slug']        = Str::slug($this->argument('slug'));
         $this->container['name']        = Str::studly($this->container['slug']);
         $this->container['version']     = '1.0';
-        $this->container['description'] = 'This is the description for the ' . $this->container['name'] . ' module.';
+        $this->container['description'] = 'This is the description for the '.$this->container['name'].' module.';
         $this->container['location']    = config('modules.default_location');
         $this->container['provider']    = config("modules.locations.{$this->container['location']}.provider");
         $this->container['basename']    = Str::studly($this->container['slug']);
@@ -123,7 +123,7 @@ 
 
         $progress->finish();
 
-        event($this->container['slug'] . '.module.made');
+        event($this->container['slug'].'.module.made');
 
         $this->info("\nModule generated successfully.");
     }
@@ -138,18 +138,18 @@ 
         $manifest = config("modules.locations.$location.manifest") ?: 'module.json';
         $provider = config("modules.locations.$location.provider") ?: 'ModuleServiceProvider';
 
-        if (!$this->files->isDirectory($root)) {
+        if ( ! $this->files->isDirectory($root)) {
             $this->files->makeDirectory($root);
         }
 
         $directory = module_path(null, $this->container['basename'], $location);
-        $source    = __DIR__ . '/Stubs/Module';
+        $source    = __DIR__.'/Stubs/Module';
 
         $this->files->makeDirectory($directory);
 
         $sourceFiles = $this->files->allFiles($source, true);
 
-        if (!empty($this->mapping)) {
+        if ( ! empty($this->mapping)) {
             $search = array_keys($this->mapping);
             $replace = array_values($this->mapping);
         }
@@ -158,11 +158,11 @@ 
             $contents = $this->replacePlaceholders($file->getContents());
             $subPath = $file->getRelativePathname();
 
-            if (!empty($this->mapping)) {
+            if ( ! empty($this->mapping)) {
                 $subPath = str_replace($search, $replace, $subPath);
             }
 
-            $filePath = $directory . '/' . $subPath;
+            $filePath = $directory.'/'.$subPath;
             
             // if the file is module.json, replace it with the custom manifest file name
             if ($file->getFilename() === 'module.json' && $manifest) {
@@ -177,7 +177,7 @@ 
             
             $dir = dirname($filePath);
             
-            if (! $this->files->isDirectory($dir)) {
+            if ( ! $this->files->isDirectory($dir)) {
                 $this->files->makeDirectory($dir, 0755, true);
             }
 
@@ -211,21 +211,21 @@ 
         ];
 
         $replace = [
-            ucfirst($modelNameSingular) . 'Factory',
+            ucfirst($modelNameSingular).'Factory',
             $modelNameSingular,
             $this->container['slug'],
             ucfirst($modelName),
             ucfirst($modelNameSingular),
-            ucfirst($modelName) . 'DatabaseSeeder',
-            ucfirst($modelName) . 'TableSeeder',
-            ucfirst($modelNameSingular) . 'Controller',
-            ucfirst($modelNameSingular) . 'Service',
-            ucfirst($modelNameSingular) . 'Repository',
-            ucfirst($modelName) . 'Errors',
-            'Insert' . ucfirst($modelNameSingular),
-            'Update' . ucfirst($modelNameSingular),
+            ucfirst($modelName).'DatabaseSeeder',
+            ucfirst($modelName).'TableSeeder',
+            ucfirst($modelNameSingular).'Controller',
+            ucfirst($modelNameSingular).'Service',
+            ucfirst($modelNameSingular).'Repository',
+            ucfirst($modelName).'Errors',
+            'Insert'.ucfirst($modelNameSingular),
+            'Update'.ucfirst($modelNameSingular),
             ucfirst($modelNameSingular),
-            ucfirst($modelNameSingular) . 'Observer',
+            ucfirst($modelNameSingular).'Observer',
             $modelName,
             $modelName,
         ];
@@ -247,6 +247,6 @@ 
     protected function generateMigration()
     {
         $modelName = $this->container['slug'];
-        return $this->callSilent('make:module:migration', ['slug' => $modelName, 'name' => 'create_' . $modelName . '_table']);
+        return $this->callSilent('make:module:migration', ['slug' => $modelName, 'name' => 'create_'.$modelName.'_table']);
     }
 }

src/Modules/Core/Console/Commands/GenerateDoc.php

Indentation +239 added lines, -239 removed lines

@@ -8,275 +8,275 @@
 
 class GenerateDoc extends Command
 {
-    /**
-     * The name and signature of the console command.
-     *
-     * @var string
-     */
-    protected $signature = 'doc:generate';
+	/**
+	 * The name and signature of the console command.
+	 *
+	 * @var string
+	 */
+	protected $signature = 'doc:generate';
 
-    /**
-     * The console command description.
-     *
-     * @var string
-     */
-    protected $description = 'Generate api documentation';
+	/**
+	 * The console command description.
+	 *
+	 * @var string
+	 */
+	protected $description = 'Generate api documentation';
 
-    /**
-     * @var ReprotService
-     */
-    protected $reportService;
+	/**
+	 * @var ReprotService
+	 */
+	protected $reportService;
 
-    /**
-     * Init new object.
-     *
-     * @return  void
-     */
-    public function __construct(ReportService $reportService)
-    {
-        $this->reportService = $reportService;
-        parent::__construct();
-    }
+	/**
+	 * Init new object.
+	 *
+	 * @return  void
+	 */
+	public function __construct(ReportService $reportService)
+	{
+		$this->reportService = $reportService;
+		parent::__construct();
+	}
 
-    /**
-     * Execute the console command.
-     *
-     * @return mixed
-     */
-    public function handle()
-    {
-        $docData           = [];
-        $docData['models'] = [];
-        $routes            = $this->getRoutes();
-        foreach ($routes as $route) {
-            if ($route) {
-                $actoinArray = explode('@', $route['action']);
-                if (Arr::get($actoinArray, 1, false)) {
-                    $controller       = $actoinArray[0];
-                    $method           = $actoinArray[1];
-                    $route['name']    = $method !== 'index' ? $method : 'list';
+	/**
+	 * Execute the console command.
+	 *
+	 * @return mixed
+	 */
+	public function handle()
+	{
+		$docData           = [];
+		$docData['models'] = [];
+		$routes            = $this->getRoutes();
+		foreach ($routes as $route) {
+			if ($route) {
+				$actoinArray = explode('@', $route['action']);
+				if (Arr::get($actoinArray, 1, false)) {
+					$controller       = $actoinArray[0];
+					$method           = $actoinArray[1];
+					$route['name']    = $method !== 'index' ? $method : 'list';
                     
-                    $reflectionClass  = new \ReflectionClass($controller);
-                    $reflectionMethod = $reflectionClass->getMethod($method);
-                    $classProperties  = $reflectionClass->getDefaultProperties();
-                    $skipLoginCheck   = Arr::get($classProperties, 'skipLoginCheck', false);
-                    $modelName        = explode('\\', $controller);
-                    $modelName        = lcfirst(str_replace('Controller', '', end($modelName)));
+					$reflectionClass  = new \ReflectionClass($controller);
+					$reflectionMethod = $reflectionClass->getMethod($method);
+					$classProperties  = $reflectionClass->getDefaultProperties();
+					$skipLoginCheck   = Arr::get($classProperties, 'skipLoginCheck', false);
+					$modelName        = explode('\\', $controller);
+					$modelName        = lcfirst(str_replace('Controller', '', end($modelName)));
 
-                    $this->processDocBlock($route, $reflectionMethod);
-                    $this->getHeaders($route, $method, $skipLoginCheck);
-                    $this->getPostData($route, $reflectionMethod);
+					$this->processDocBlock($route, $reflectionMethod);
+					$this->getHeaders($route, $method, $skipLoginCheck);
+					$this->getPostData($route, $reflectionMethod);
 
-                    $route['response'] = $this->getResponseObject($modelName, $route['name'], $route['returnDocBlock']);
+					$route['response'] = $this->getResponseObject($modelName, $route['name'], $route['returnDocBlock']);
 
-                    $module = $route['prefix'];
-                    $module = \Str::camel(str_replace('/', '_', str_replace('api', '', $module)));
-                    $docData['modules'][$module][] = $route;
+					$module = $route['prefix'];
+					$module = \Str::camel(str_replace('/', '_', str_replace('api', '', $module)));
+					$docData['modules'][$module][] = $route;
 
-                    $this->getModels($modelName, $docData, $reflectionClass);
-                }
-            }
-        }
+					$this->getModels($modelName, $docData, $reflectionClass);
+				}
+			}
+		}
         
-        $docData['errors']  = $this->getErrors();
-        $docData['reports'] = $this->reportService->all();
-        \File::put(app_path('Modules/Core/Resources/api.json'), json_encode($docData));
-    }
+		$docData['errors']  = $this->getErrors();
+		$docData['reports'] = $this->reportService->all();
+		\File::put(app_path('Modules/Core/Resources/api.json'), json_encode($docData));
+	}
 
-    /**
-     * Get list of all registered routes.
-     *
-     * @return collection
-     */
-    protected function getRoutes()
-    {
-        return collect(\Route::getRoutes())->map(function ($route) {
-            if (strpos($route->uri(), 'api/') !== false) {
-                return [
-                    'method' => $route->methods()[0],
-                    'uri'    => $route->uri(),
-                    'action' => $route->getActionName(),
-                    'prefix' => $route->getPrefix()
-                ];
-            }
-            return false;
-        })->all();
-    }
+	/**
+	 * Get list of all registered routes.
+	 *
+	 * @return collection
+	 */
+	protected function getRoutes()
+	{
+		return collect(\Route::getRoutes())->map(function ($route) {
+			if (strpos($route->uri(), 'api/') !== false) {
+				return [
+					'method' => $route->methods()[0],
+					'uri'    => $route->uri(),
+					'action' => $route->getActionName(),
+					'prefix' => $route->getPrefix()
+				];
+			}
+			return false;
+		})->all();
+	}
 
-    /**
-     * Generate headers for the given route.
-     *
-     * @param  array  &$route
-     * @param  string $method
-     * @param  array  $skipLoginCheck
-     * @return void
-     */
-    protected function getHeaders(&$route, $method, $skipLoginCheck)
-    {
-        $route['headers'] = [
-        'Accept'       => 'application/json',
-        'Content-Type' => 'application/json',
-        'locale'       => 'The language of the returned data: ar, en or all.',
-        'time-zone'    => 'Your locale time zone',
-        ];
+	/**
+	 * Generate headers for the given route.
+	 *
+	 * @param  array  &$route
+	 * @param  string $method
+	 * @param  array  $skipLoginCheck
+	 * @return void
+	 */
+	protected function getHeaders(&$route, $method, $skipLoginCheck)
+	{
+		$route['headers'] = [
+		'Accept'       => 'application/json',
+		'Content-Type' => 'application/json',
+		'locale'       => 'The language of the returned data: ar, en or all.',
+		'time-zone'    => 'Your locale time zone',
+		];
 
 
-        if (! $skipLoginCheck || ! in_array($method, $skipLoginCheck)) {
-            $route['headers']['Authorization'] = 'Bearer {token}';
-        }
-    }
+		if (! $skipLoginCheck || ! in_array($method, $skipLoginCheck)) {
+			$route['headers']['Authorization'] = 'Bearer {token}';
+		}
+	}
 
-    /**
-     * Generate description and params for the given route
-     * based on the docblock.
-     *
-     * @param  array  &$route
-     * @param  \ReflectionMethod $reflectionMethod
-     * @return void
-     */
-    protected function processDocBlock(&$route, $reflectionMethod)
-    {
-        $factory                 = \phpDocumentor\Reflection\DocBlockFactory::createInstance();
-        $docblock                = $factory->create($reflectionMethod->getDocComment());
-        $route['description']    = trim(preg_replace('/\s+/', ' ', $docblock->getSummary()));
-        $params                  = $docblock->getTagsByName('param');
-        $route['returnDocBlock'] = $docblock->getTagsByName('return')[0]->getType()->getFqsen()->getName();
+	/**
+	 * Generate description and params for the given route
+	 * based on the docblock.
+	 *
+	 * @param  array  &$route
+	 * @param  \ReflectionMethod $reflectionMethod
+	 * @return void
+	 */
+	protected function processDocBlock(&$route, $reflectionMethod)
+	{
+		$factory                 = \phpDocumentor\Reflection\DocBlockFactory::createInstance();
+		$docblock                = $factory->create($reflectionMethod->getDocComment());
+		$route['description']    = trim(preg_replace('/\s+/', ' ', $docblock->getSummary()));
+		$params                  = $docblock->getTagsByName('param');
+		$route['returnDocBlock'] = $docblock->getTagsByName('return')[0]->getType()->getFqsen()->getName();
 
-        foreach ($params as $param) {
-            $name = $param->getVariableName();
-            if ($name !== 'request') {
-                $route['parametars'][$param->getVariableName()] = $param->getDescription()->render();
-            }
-        }
+		foreach ($params as $param) {
+			$name = $param->getVariableName();
+			if ($name !== 'request') {
+				$route['parametars'][$param->getVariableName()] = $param->getDescription()->render();
+			}
+		}
 
-        if ($route['name'] === 'list') {
-            $route['parametars']['perPage'] = 'perPage';
-            $route['parametars']['sortBy']  = 'sortBy';
-            $route['parametars']['desc']    = 'desc';
-        }
-    }
+		if ($route['name'] === 'list') {
+			$route['parametars']['perPage'] = 'perPage';
+			$route['parametars']['sortBy']  = 'sortBy';
+			$route['parametars']['desc']    = 'desc';
+		}
+	}
 
-    /**
-     * Generate post body for the given route.
-     *
-     * @param  array  &$route
-     * @param  \ReflectionMethod $reflectionMethod
-     * @return void
-     */
-    protected function getPostData(&$route, $reflectionMethod)
-    {
-        $parameters = $reflectionMethod->getParameters();
-        if (count($parameters)) {
-            $className = optional($reflectionMethod->getParameters()[0]->getType())->getName();
-            if ($className) {
-                $reflectionClass  = new \ReflectionClass($className);
+	/**
+	 * Generate post body for the given route.
+	 *
+	 * @param  array  &$route
+	 * @param  \ReflectionMethod $reflectionMethod
+	 * @return void
+	 */
+	protected function getPostData(&$route, $reflectionMethod)
+	{
+		$parameters = $reflectionMethod->getParameters();
+		if (count($parameters)) {
+			$className = optional($reflectionMethod->getParameters()[0]->getType())->getName();
+			if ($className) {
+				$reflectionClass  = new \ReflectionClass($className);
     
-                if ($reflectionClass->hasMethod('rules')) {
-                    $reflectionMethod = $reflectionClass->getMethod('rules');
-                    $route['body'] = $reflectionMethod->invoke(new $className);
+				if ($reflectionClass->hasMethod('rules')) {
+					$reflectionMethod = $reflectionClass->getMethod('rules');
+					$route['body'] = $reflectionMethod->invoke(new $className);
         
-                    foreach ($route['body'] as &$rule) {
-                        if (strpos($rule, 'unique')) {
-                            $rule = substr($rule, 0, strpos($rule, 'unique') + 6);
-                        } elseif (strpos($rule, 'exists')) {
-                            $rule = substr($rule, 0, strpos($rule, 'exists') - 1);
-                        }
-                    }
-                }
-            }
-        }
-    }
+					foreach ($route['body'] as &$rule) {
+						if (strpos($rule, 'unique')) {
+							$rule = substr($rule, 0, strpos($rule, 'unique') + 6);
+						} elseif (strpos($rule, 'exists')) {
+							$rule = substr($rule, 0, strpos($rule, 'exists') - 1);
+						}
+					}
+				}
+			}
+		}
+	}
 
-    /**
-     * Generate application errors.
-     *
-     * @return array
-     */
-    protected function getErrors()
-    {
-        $errors = [];
-        foreach (\Module::all() as $module) {
-            $nameSpace = 'App\\Modules\\' . $module['basename'] ;
-            $class = $nameSpace . '\\Errors\\'  . $module['basename'] . 'Errors';
-            $reflectionClass = new \ReflectionClass($class);
-            foreach ($reflectionClass->getMethods() as $method) {
-                $methodName       = $method->name;
-                $reflectionMethod = $reflectionClass->getMethod($methodName);
-                $body             = $this->getMethodBody($reflectionMethod);
+	/**
+	 * Generate application errors.
+	 *
+	 * @return array
+	 */
+	protected function getErrors()
+	{
+		$errors = [];
+		foreach (\Module::all() as $module) {
+			$nameSpace = 'App\\Modules\\' . $module['basename'] ;
+			$class = $nameSpace . '\\Errors\\'  . $module['basename'] . 'Errors';
+			$reflectionClass = new \ReflectionClass($class);
+			foreach ($reflectionClass->getMethods() as $method) {
+				$methodName       = $method->name;
+				$reflectionMethod = $reflectionClass->getMethod($methodName);
+				$body             = $this->getMethodBody($reflectionMethod);
 
-                preg_match('/\$error=\[\'status\'=>([^#]+)\,/iU', $body, $match);
+				preg_match('/\$error=\[\'status\'=>([^#]+)\,/iU', $body, $match);
 
-                if (count($match)) {
-                    $errors[$match[1]][] = $methodName;
-                }
-            }
-        }
+				if (count($match)) {
+					$errors[$match[1]][] = $methodName;
+				}
+			}
+		}
 
-        return $errors;
-    }
+		return $errors;
+	}
 
-    /**
-     * Get the given method body code.
-     *
-     * @param  object $reflectionMethod
-     * @return string
-     */
-    protected function getMethodBody($reflectionMethod)
-    {
-        $filename   = $reflectionMethod->getFileName();
-        $start_line = $reflectionMethod->getStartLine() - 1;
-        $end_line   = $reflectionMethod->getEndLine();
-        $length     = $end_line - $start_line;
-        $source     = file($filename);
-        $body       = implode("", array_slice($source, $start_line, $length));
-        $body       = trim(preg_replace('/\s+/', '', $body));
+	/**
+	 * Get the given method body code.
+	 *
+	 * @param  object $reflectionMethod
+	 * @return string
+	 */
+	protected function getMethodBody($reflectionMethod)
+	{
+		$filename   = $reflectionMethod->getFileName();
+		$start_line = $reflectionMethod->getStartLine() - 1;
+		$end_line   = $reflectionMethod->getEndLine();
+		$length     = $end_line - $start_line;
+		$source     = file($filename);
+		$body       = implode("", array_slice($source, $start_line, $length));
+		$body       = trim(preg_replace('/\s+/', '', $body));
 
-        return $body;
-    }
+		return $body;
+	}
 
-    /**
-     * Get example object of all availble models.
-     *
-     * @param  string $modelName
-     * @param  array  $docData
-     * @return string
-     */
-    protected function getModels($modelName, &$docData, $reflectionClass)
-    {
-        if ($modelName && ! Arr::has($docData['models'], $modelName)) {
-            $modelClass = get_class(call_user_func_array("\Core::{$modelName}", [])->model);
-            $model      = factory($modelClass)->make();
+	/**
+	 * Get example object of all availble models.
+	 *
+	 * @param  string $modelName
+	 * @param  array  $docData
+	 * @return string
+	 */
+	protected function getModels($modelName, &$docData, $reflectionClass)
+	{
+		if ($modelName && ! Arr::has($docData['models'], $modelName)) {
+			$modelClass = get_class(call_user_func_array("\Core::{$modelName}", [])->model);
+			$model      = factory($modelClass)->make();
 
-            $property = $reflectionClass->getProperty('modelResource');
-            $property->setAccessible(true);
-            $modelResource = $property->getValue(\App::make($reflectionClass->getName()));
-            $modelResource = new $modelResource($model);
-            $modelArr      = $modelResource->toArray([]);
+			$property = $reflectionClass->getProperty('modelResource');
+			$property->setAccessible(true);
+			$modelResource = $property->getValue(\App::make($reflectionClass->getName()));
+			$modelResource = new $modelResource($model);
+			$modelArr      = $modelResource->toArray([]);
 
-            foreach ($modelArr as $key => $attr) {
-                if (is_object($attr) && $attr->resource instanceof \Illuminate\Http\Resources\MissingValue) {
-                    unset($modelArr[$key]);
-                }
-            }
+			foreach ($modelArr as $key => $attr) {
+				if (is_object($attr) && $attr->resource instanceof \Illuminate\Http\Resources\MissingValue) {
+					unset($modelArr[$key]);
+				}
+			}
 
-            $docData['models'][$modelName] = json_encode($modelArr, JSON_PRETTY_PRINT);
-        }
-    }
+			$docData['models'][$modelName] = json_encode($modelArr, JSON_PRETTY_PRINT);
+		}
+	}
 
-    /**
-     * Get the route response object type.
-     *
-     * @param  string $modelName
-     * @param  string $method
-     * @param  string $returnDocBlock
-     * @return array
-     */
-    protected function getResponseObject($modelName, $method, $returnDocBlock)
-    {
-        $config    = \CoreConfig::getConfig();
-        $relations = Arr::has($config['relations'], $modelName) ? Arr::has($config['relations'][$modelName], $method) ? $config['relations'][$modelName] : false : false;
-        $modelName = call_user_func_array("\Core::{$returnDocBlock}", []) ? $returnDocBlock : $modelName;
+	/**
+	 * Get the route response object type.
+	 *
+	 * @param  string $modelName
+	 * @param  string $method
+	 * @param  string $returnDocBlock
+	 * @return array
+	 */
+	protected function getResponseObject($modelName, $method, $returnDocBlock)
+	{
+		$config    = \CoreConfig::getConfig();
+		$relations = Arr::has($config['relations'], $modelName) ? Arr::has($config['relations'][$modelName], $method) ? $config['relations'][$modelName] : false : false;
+		$modelName = call_user_func_array("\Core::{$returnDocBlock}", []) ? $returnDocBlock : $modelName;
 
-        return $relations ? [$modelName => $relations && $relations[$method] ? $relations[$method] : []] : false;
-    }
+		return $relations ? [$modelName => $relations && $relations[$method] ? $relations[$method] : []] : false;
+	}
 }

Spacing +5 added lines, -5 removed lines

@@ -90,7 +90,7 @@ 
      */
     protected function getRoutes()
     {
-        return collect(\Route::getRoutes())->map(function ($route) {
+        return collect(\Route::getRoutes())->map(function($route) {
             if (strpos($route->uri(), 'api/') !== false) {
                 return [
                     'method' => $route->methods()[0],
@@ -121,7 +121,7 @@ 
         ];
 
 
-        if (! $skipLoginCheck || ! in_array($method, $skipLoginCheck)) {
+        if ( ! $skipLoginCheck || ! in_array($method, $skipLoginCheck)) {
             $route['headers']['Authorization'] = 'Bearer {token}';
         }
     }
@@ -169,7 +169,7 @@ 
         if (count($parameters)) {
             $className = optional($reflectionMethod->getParameters()[0]->getType())->getName();
             if ($className) {
-                $reflectionClass  = new \ReflectionClass($className);
+                $reflectionClass = new \ReflectionClass($className);
     
                 if ($reflectionClass->hasMethod('rules')) {
                     $reflectionMethod = $reflectionClass->getMethod('rules');
@@ -196,8 +196,8 @@ 
     {
         $errors = [];
         foreach (\Module::all() as $module) {
-            $nameSpace = 'App\\Modules\\' . $module['basename'] ;
-            $class = $nameSpace . '\\Errors\\'  . $module['basename'] . 'Errors';
+            $nameSpace = 'App\\Modules\\'.$module['basename'];
+            $class = $nameSpace.'\\Errors\\'.$module['basename'].'Errors';
             $reflectionClass = new \ReflectionClass($class);
             foreach ($reflectionClass->getMethods() as $method) {
                 $methodName       = $method->name;

src/Modules/Core/Traits/Translatable.php

Indentation +42 added lines, -42 removed lines

@@ -4,46 +4,46 @@
 
 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);
-
-        foreach ($model->attributes as $key => $value) {
-            if (isset($this->translatable) && in_array($key, $this->translatable)) {
-                $model->$key = $this->getTranslatedAttribute($value);
-            }
-        }
-
-        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';
-
-        if ($primaryLocale == 'all') {
-            return $values;
-        }
-
-        if (! $primaryLocale || ! is_object($values) || ! property_exists($values, $primaryLocale)) {
-            return $values ? isset($values->$fallbackLocale) ? $values->$fallbackLocale : $values : '';
-        }
-
-        return $primaryLocale == 'all' ? $values : $values->$primaryLocale;
-    }
+	/**
+	 * 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);
+			}
+		}
+
+		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';
+
+		if ($primaryLocale == 'all') {
+			return $values;
+		}
+
+		if (! $primaryLocale || ! is_object($values) || ! property_exists($values, $primaryLocale)) {
+			return $values ? isset($values->$fallbackLocale) ? $values->$fallbackLocale : $values : '';
+		}
+
+		return $primaryLocale == 'all' ? $values : $values->$primaryLocale;
+	}
 }

src/Modules/Core/Errors/CoreErrors.php

Indentation +24 added lines, -24 removed lines

@@ -4,33 +4,33 @@
 
 class CoreErrors
 {
-    public function connectionError()
-    {
-        abort(500, trans('core::errors.connectionError'));
-    }
+	public function connectionError()
+	{
+		abort(500, trans('core::errors.connectionError'));
+	}
 
-    public function redisNotRunning()
-    {
-        abort(500, trans('core::errors.redisNotRunning'));
-    }
+	public function redisNotRunning()
+	{
+		abort(500, trans('core::errors.redisNotRunning'));
+	}
 
-    public function dbQueryError()
-    {
-        abort(500, trans('core::errors.dbQueryError'));
-    }
+	public function dbQueryError()
+	{
+		abort(500, trans('core::errors.dbQueryError'));
+	}
 
-    public function cannotCreateSetting()
-    {
-        abort(400, trans('core::errors.cannotCreateSetting'));
-    }
+	public function cannotCreateSetting()
+	{
+		abort(400, trans('core::errors.cannotCreateSetting'));
+	}
 
-    public function cannotUpdateSettingKey()
-    {
-        abort(400, trans('core::errors.cannotUpdateSettingKey'));
-    }
+	public function cannotUpdateSettingKey()
+	{
+		abort(400, trans('core::errors.cannotUpdateSettingKey'));
+	}
 
-    public function notFound($text)
-    {
-        abort(404, trans('core::errors.notFound', ['replace' => $text]));
-    }
+	public function notFound($text)
+	{
+		abort(404, trans('core::errors.notFound', ['replace' => $text]));
+	}
 }

src/Modules/Core/Errors/Errors.php

Indentation +21 added lines, -21 removed lines

@@ -6,26 +6,26 @@
 
 class Errors implements BaseFactoryInterface
 {
-    /**
-     * Construct the repository class name based on
-     * the method name called, search in the
-     * given namespaces for the class and
-     * return an instance.
-     *
-     * @param  string $name the called method name
-     * @param  array  $arguments the method arguments
-     * @return object
-     */
-    public function __call($name, $arguments)
-    {
-        foreach (\Module::all() as $module) {
-            $nameSpace = 'App\\Modules\\' . $module['basename'];
-            $class = $nameSpace . '\\Errors\\' . $module['basename'] . 'Errors';
+	/**
+	 * Construct the repository class name based on
+	 * the method name called, search in the
+	 * given namespaces for the class and
+	 * return an instance.
+	 *
+	 * @param  string $name the called method name
+	 * @param  array  $arguments the method arguments
+	 * @return object
+	 */
+	public function __call($name, $arguments)
+	{
+		foreach (\Module::all() as $module) {
+			$nameSpace = 'App\\Modules\\' . $module['basename'];
+			$class = $nameSpace . '\\Errors\\' . $module['basename'] . 'Errors';
 
-            if (class_exists($class)) {
-                $class = \App::make($class);
-                if (method_exists($class, $name)) return call_user_func_array([$class, $name], $arguments);
-            }
-        }
-    }
+			if (class_exists($class)) {
+				$class = \App::make($class);
+				if (method_exists($class, $name)) return call_user_func_array([$class, $name], $arguments);
+			}
+		}
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -19,8 +19,8 @@
     public function __call($name, $arguments)
     {
         foreach (\Module::all() as $module) {
-            $nameSpace = 'App\\Modules\\' . $module['basename'];
-            $class = $nameSpace . '\\Errors\\' . $module['basename'] . 'Errors';
+            $nameSpace = 'App\\Modules\\'.$module['basename'];
+            $class = $nameSpace.'\\Errors\\'.$module['basename'].'Errors';
 
             if (class_exists($class)) {
                 $class = \App::make($class);

Braces +3 added lines, -1 removed lines

@@ -24,7 +24,9 @@
 
             if (class_exists($class)) {
                 $class = \App::make($class);
-                if (method_exists($class, $name)) return call_user_func_array([$class, $name], $arguments);
+                if (method_exists($class, $name)) {
+                	return call_user_func_array([$class, $name], $arguments);
+                }
             }
         }
     }