Hokan22 / laravel-translator

src/Commands/SearchTranslationsCommand.php

Spacing +17 added lines, -17 removed lines

@@ -76,8 +76,8 @@ 
             'js'        => '/\$filter\(\'translate\'\)\(\'(?\'identifier\'.*?)\'\)/'
         ];
 
-        foreach($folders as $folder) {
-            $aFiles = array_merge($aFiles, File::allFiles(base_path().'/'.$folder));
+        foreach ($folders as $folder) {
+            $aFiles = array_merge($aFiles, File::allFiles(base_path() . '/' . $folder));
         }
 
         TranslatorFacade::setLocale('de_DE');
@@ -85,20 +85,20 @@ 
         $num_files = count($aFiles);
 
         $this->bar = $this->output->createProgressBar($num_files);
-        $this->bar->setMessage('Analyzing '.$num_files.' files');
+        $this->bar->setMessage('Analyzing ' . $num_files . ' files');
         $this->bar->setFormat('very_verbose');
 
         foreach ($aFiles as $file) {
 
             $extension = $file->getExtension();
 
-            if(in_array($extension, $valid_extensions)) {
+            if (in_array($extension, $valid_extensions)) {
                 $content = file_get_contents($file);
 
                 foreach ($regexes as $key => $regex) {
                     preg_match_all($regex, $content, $result, PREG_SET_ORDER);
 
-                    if(!empty($result[0])) {
+                    if (!empty($result[0])) {
                         $this->addMissing($result, $key);
                     }
                 }
@@ -114,10 +114,10 @@ 
             ['Num', 'Translations...'],
             [
                 [$this->found_identifier, "Found"],
-                [$this->new_identifier,   "New"],
-                [$this->dupl_identifier,  "Duplicates"],
+                [$this->new_identifier, "New"],
+                [$this->dupl_identifier, "Duplicates"],
                 [$this->found_parameters, "With Parameters"],
-                [$this->found_invalid,    "Invalid"],
+                [$this->found_invalid, "Invalid"],
             ]
         );
 
@@ -148,14 +148,14 @@ 
                         $parameter_string = substr($parameter_string, 1, -1);
                     }
 
-                    $parameter_array = explode(",",$parameter_string);
+                    $parameter_array = explode(",", $parameter_string);
                     $parameters = array();
 
-                    foreach($parameter_array as $parameter) {
-                        $parameter = explode("=>",$parameter);
+                    foreach ($parameter_array as $parameter) {
+                        $parameter = explode("=>", $parameter);
 
-                        $key = str_replace([" ", "'"],"", $parameter[0]);
-                        $value = str_replace([" ", "'"],"", $parameter[1]);
+                        $key = str_replace([" ", "'"], "", $parameter[0]);
+                        $value = str_replace([" ", "'"], "", $parameter[1]);
 
                         $parameters[$key] = $value;
                     }
@@ -163,13 +163,13 @@ 
                     $this->found_parameters++;
                 }
 
-                if(!isset($aTranslations[$identifier])) {
+                if (!isset($aTranslations[$identifier])) {
                     $aTranslations[$identifier] = TranslatorFacade::hasIdentifier($identifier);
 
                     if (!$aTranslations[$identifier]) {
                         TranslatorFacade::addMissingIdentifier($identifier, $parameters, $group);
                         $this->bar->clear();
-                        $this->info('Adding: "'.$identifier.'" to database');
+                        $this->info('Adding: "' . $identifier . '" to database');
                         $this->bar->display();
                         $this->new_identifier++;
                     }
@@ -177,9 +177,9 @@ 
                     $this->dupl_identifier++;
                 }
 
-            } catch(\Exception $e){
+            } catch (\Exception $e) {
                 $this->bar->clear();
-                $this->info($identifier.' '.strlen($identifier));
+                $this->info($identifier . ' ' . strlen($identifier));
                 $this->info($e->getMessage());
                 $this->line('');
                 $this->bar->display();

Braces +4 added lines, -7 removed lines

@@ -45,8 +45,7 @@ 
     /**
      * Create a new command instance.
      */
-    public function __construct()
-    {
+    public function __construct() {
         parent::__construct();
     }
 
@@ -56,8 +55,7 @@ 
      * @return mixed
      * @throws \Exception
      */
-    public function handle()
-    {
+    public function handle() {
         $start = microtime(true);
 
         $this->line('');
@@ -132,8 +130,7 @@ 
      * @param array $result Array with
      * @param string $group
      */
-    protected function addMissing($result, $group)
-    {
+    protected function addMissing($result, $group) {
         foreach ($result as $item) {
             try {
                 $identifier = trim($item['identifier']);
@@ -177,7 +174,7 @@ 
                     $this->dupl_identifier++;
                 }
 
-            } catch(\Exception $e){
+            } catch(\Exception $e) {
                 $this->bar->clear();
                 $this->info($identifier.' '.strlen($identifier));
                 $this->info($e->getMessage());

src/Commands/CacheTranslationCommand.php

Spacing +4 added lines, -4 removed lines

@@ -59,13 +59,13 @@ 
             return;
         }
 
-        $file_path = TranslatorFacade::getConfigValue('cache_path').$locale.'/';
+        $file_path = TranslatorFacade::getConfigValue('cache_path') . $locale . '/';
 
         $groups = $this->getGroups();
         $translations = $this->loadFromDB($locale);
 
         if (!file_exists($file_path)) {
-            $this->alert("The defined cache folder (".$file_path.") does not exists.");
+            $this->alert("The defined cache folder (" . $file_path . ") does not exists.");
             if (!$this->confirm('Do you want to create it now?')) {
                 return;
             }
@@ -88,7 +88,7 @@ 
             }
 
             if (!empty($array)) {
-                $file_name = $file_path.$group.'.json';
+                $file_name = $file_path . $group . '.json';
                 file_put_contents($file_name, json_encode($array));
             }
         }
@@ -114,7 +114,7 @@ 
     {
         $trans_identifier = new TranslationIdentifier();
 
-        $trans_identifier = $trans_identifier->with('translations')->whereHas('translations', function ($item) use ($locale)
+        $trans_identifier = $trans_identifier->with('translations')->whereHas('translations', function($item) use ($locale)
         {
             return $item->where('locale', $locale);
         }

Braces +5 added lines, -10 removed lines

@@ -39,8 +39,7 @@ 
     /**
      * Create a new command instance.
      */
-    public function __construct()
-    {
+    public function __construct() {
         parent::__construct();
     }
 
@@ -49,8 +48,7 @@ 
      *
      * @throws \Exception
      */
-    public function handle()
-    {
+    public function handle() {
         $locale = $this->argument('locale');
 
         if (!is_string($locale))
@@ -99,8 +97,7 @@ 
      *
      * @return array
      */
-    protected function getGroups()
-    {
+    protected function getGroups() {
         return DB::table('translation_identifiers')->select('group')->groupBy(['group'])->get()->pluck('group');
     }
 
@@ -110,12 +107,10 @@ 
      * @param string $locale The locale from which the translations to load
      * @return TranslationIdentifier|\Illuminate\Database\Eloquent\Collection|static[]
      */
-    protected function loadFromDB($locale)
-    {
+    protected function loadFromDB($locale) {
         $trans_identifier = new TranslationIdentifier();
 
-        $trans_identifier = $trans_identifier->with('translations')->whereHas('translations', function ($item) use ($locale)
-        {
+        $trans_identifier = $trans_identifier->with('translations')->whereHas('translations', function ($item) use ($locale) {
             return $item->where('locale', $locale);
         }
         )->orWhereHas('translations', null, '<=', 0)

src/Provider/TranslatorProvider.php

Spacing +5 added lines, -5 removed lines

@@ -24,9 +24,9 @@ 
      */
     public function register()
     {
-        $this->mergeConfigFrom(__DIR__.'/../config/translator.php', 'translator');
+        $this->mergeConfigFrom(__DIR__ . '/../config/translator.php', 'translator');
 
-        $this->app->singleton('Translator', function () {
+        $this->app->singleton('Translator', function() {
                 return new Translator();
             }
         );
@@ -43,9 +43,9 @@ 
             'config'
         );
 
-        $this->loadMigrationsFrom(__DIR__.'/../migrations/');
-        $this->loadRoutesFrom(__DIR__.'/../resources/routes.php');
-        $this->loadViewsFrom(__DIR__.'/../resources/views', 'translator');
+        $this->loadMigrationsFrom(__DIR__ . '/../migrations/');
+        $this->loadRoutesFrom(__DIR__ . '/../resources/routes.php');
+        $this->loadViewsFrom(__DIR__ . '/../resources/views', 'translator');
 
         if ($this->app->runningInConsole()) {
             $this->commands([

Braces +2 added lines, -4 removed lines

@@ -22,8 +22,7 @@ 
     /**
      * Register any application services.
      */
-    public function register()
-    {
+    public function register() {
         $this->mergeConfigFrom(__DIR__.'/../config/translator.php', 'translator');
 
         $this->app->singleton('Translator', function () {
@@ -35,8 +34,7 @@ 
     /**
      * Bootstrap any application services.
      */
-    public function boot()
-    {
+    public function boot() {
         $this->publishes([
                 __DIR__ . '/../config/translator.php' => config_path('translator.php'),
             ],

src/Controllers/TranslatorAdminController.php

Spacing +8 added lines, -8 removed lines

@@ -35,7 +35,7 @@ 
         $query = TranslationIdentifier::with('translations');
 
         if ($locale != '') {
-            $query = $query->whereDoesntHave('translations', function ($query) use ($locale)
+            $query = $query->whereDoesntHave('translations', function($query) use ($locale)
                 {
                     $query->where('translations.locale', 'like', $locale);
                 }
@@ -43,12 +43,12 @@ 
         }
 
         if ($search != '') {
-            $query = $query->where(function ($query) use ($search) {
-                $query ->where('identifier',     'LIKE', '%'.$search.'%')
-                    ->orWhere('parameters', 'LIKE', '%'.$search.'%')
-                    ->orWhere('group',      'LIKE', '%'.$search.'%')
-                    ->orWhere('page_name',  'LIKE', '%'.$search.'%')
-                    ->orWhere('description','LIKE', '%'.$search.'%');
+            $query = $query->where(function($query) use ($search) {
+                $query ->where('identifier', 'LIKE', '%' . $search . '%')
+                    ->orWhere('parameters', 'LIKE', '%' . $search . '%')
+                    ->orWhere('group', 'LIKE', '%' . $search . '%')
+                    ->orWhere('page_name', 'LIKE', '%' . $search . '%')
+                    ->orWhere('description', 'LIKE', '%' . $search . '%');
             });
         }
 
@@ -168,7 +168,7 @@ 
      * @param $state string 'enabled|disabled'
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function changeLiveMode ($state)
+    public function changeLiveMode($state)
     {
         if ($state == 'enable') {
             session(['translation_live_mode' => true]);

Braces +7 added lines, -14 removed lines

@@ -27,16 +27,14 @@ 
      *
      * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
      */
-    public function index()
-    {
+    public function index() {
         $search = Input::get('search', '');
         $locale = Input::get('locale', '');
 
         $query = TranslationIdentifier::with('translations');
 
         if ($locale != '') {
-            $query = $query->whereDoesntHave('translations', function ($query) use ($locale)
-                {
+            $query = $query->whereDoesntHave('translations', function ($query) use ($locale) {
                     $query->where('translations.locale', 'like', $locale);
                 }
             );
@@ -73,8 +71,7 @@ 
      * @param integer $id ID of the translation Identifier to edit
      * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
      */
-    public function edit($id)
-    {
+    public function edit($id) {
         $identifier = TranslationIdentifier::findOrFail($id);
 
         $available_locales = TranslatorFacade::getConfigValue('available_locales');
@@ -97,8 +94,7 @@ 
      * @param Request $request Object with the values of the identifier
      * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
      */
-    public function postEdit($id, Request $request)
-    {
+    public function postEdit($id, Request $request) {
         TranslationIdentifier::findOrFail($id);
 
         foreach ($request->all() as $key => $value) {
@@ -131,8 +127,7 @@ 
      * @param Request $request Request with multiple values of identifiers to update
      * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
      */
-    public function postIdentifier(Request $request)
-    {
+    public function postIdentifier(Request $request) {
         /** @var TranslationIdentifier $translation_identifiers */
         $translation_identifiers = TranslationIdentifier::all()->whereIn('id', array_keys($request->all()));
 
@@ -159,8 +154,7 @@ 
      *
      * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
      */
-    public function test()
-    {
+    public function test() {
         return view('translator::test');
     }
 
@@ -168,8 +162,7 @@ 
      * @param $state string 'enabled|disabled'
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function changeLiveMode ($state)
-    {
+    public function changeLiveMode ($state) {
         if ($state == 'enable') {
             session(['translation_live_mode' => true]);
         } else {

src/Middleware/TranslatorMiddleware.php

Braces +1 added lines, -2 removed lines

@@ -30,8 +30,7 @@
      *
      * @todo Validate Browser locale string (https://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.4)
      */
-    public function handle(Request $request, Closure $next)
-    {
+    public function handle(Request $request, Closure $next) {
         if (Session::has('locale') || auth()->check()) {
             $locale = Session::has('locale') ? session()->get('locale') : auth()->user()->language;