Hokan22 / laravel-translator

src/Translator.php

Indentation +6 added lines, -6 removed lines

@@ -144,12 +144,12 @@
         return $translation;
     }
 
-     /**
-      * Sets the Handler
-      *
-      * @param $locale
-      * @return HandlerInterface
-      */
+        /**
+         * Sets the Handler
+         *
+         * @param $locale
+         * @return HandlerInterface
+         */
     protected function createHandler($locale)
     {
         // Get the Handler class from config file

Spacing +6 added lines, -6 removed lines

@@ -167,7 +167,7 @@ 
         try {
             $oHandler = new $handler_class($locale);
             if (!is_a($handler_class, 'Hokan22\LaravelTranslator\Handler\HandlerInterface', true)) {
-                throw new \Exception($handler_class . ' does not implement HandlerInterface!');
+                throw new \Exception($handler_class.' does not implement HandlerInterface!');
             }
         } catch (\Exception $exception) {
             // Log error and fallback procedure
@@ -210,7 +210,7 @@ 
             // Save only the keys from the parameter array
             $keys = [];
             if (is_array($parameters)) {
-                foreach($parameters as $key => $value) {
+                foreach ($parameters as $key => $value) {
                     $keys[] = $key;
                 }
             }
@@ -308,7 +308,7 @@ 
         }
 
         // Fallback if empty locale was given (should be handled in middleware)
-        if ($locale == null){
+        if ($locale == null) {
             if (session()->get('locale') != '') {
                 $locale = session()->get('locale');
             }
@@ -318,19 +318,19 @@ 
         }
 
         // If the given locale is not defined as valid, try to get a fallback locale
-        if (!in_array($locale, $avail_locales)){
+        if (!in_array($locale, $avail_locales)) {
 
             $found_locales = [];
 
             // Find any available locale which contains the locale as substring
             foreach ($avail_locales as $avail_locale) {
-                if (strpos($avail_locale, $locale) !== false){
+                if (strpos($avail_locale, $locale) !== false) {
                     $found_locales[] = $avail_locale;
                 }
             }
 
             // Check if default locale is inside the found locales. If it was, use it!
-            if (in_array($default_locale, $found_locales)){
+            if (in_array($default_locale, $found_locales)) {
                 $message = 'Locale "'.$locale.'" was not found! Falling back to default locale "'.$default_locale.'"';
                 $locale = $default_locale;
 

Braces +4 added lines, -3 removed lines

@@ -311,8 +311,7 @@ 
         if ($locale == null){
             if (session()->get('locale') != '') {
                 $locale = session()->get('locale');
-            }
-            else {
+            } else {
                 return $default_locale;
             }
         }
@@ -343,7 +342,9 @@ 
             }
         }
 
-        if ($message !== '') $this->log($message, 'warning');
+        if ($message !== '') {
+            $this->log($message, 'warning');
+        }
 
         return $locale;
     }

src/Provider/TranslatorProvider.php

Spacing +2 added lines, -2 removed lines

@@ -28,7 +28,7 @@ 
     {
         $this->mergeConfigFrom(__DIR__.'/../config/translator.php', 'translator');
 
-        $this->app->singleton('Translator', function ()
+        $this->app->singleton('Translator', function()
             {
                 return new Translator();
             }
@@ -42,7 +42,7 @@ 
     {
         $this->publishes(
             [
-                __DIR__ . '/../config/translator.php' => config_path('translator.php'),
+                __DIR__.'/../config/translator.php' => config_path('translator.php'),
             ],
             'config'
         );

src/Provider/TranslatorBladeProvider.php

Spacing +2 added lines, -2 removed lines

@@ -26,7 +26,7 @@ 
      */
     public function boot()
     {
-        Blade::directive('translate', function ($expression) {
+        Blade::directive('translate', function($expression) {
 
                 $expression = $this->stripParentheses($expression);
 
@@ -35,7 +35,7 @@ 
             }
         );
 
-        Blade::directive('t', function ($expression) {
+        Blade::directive('t', function($expression) {
 
                 $expression = $this->stripParentheses($expression);
 

src/Commands/CacheTranslationCommand.php

Spacing +2 added lines, -2 removed lines

@@ -122,9 +122,9 @@
     protected function loadFromDB($locale)
     {
         // Get all Texts with translations for the given locale
-        $trans_identifier =   new TranslationIdentifier();
+        $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);
         }

src/Commands/SearchTranslationsCommand.php

Spacing +14 added lines, -14 removed lines

@@ -79,7 +79,7 @@ 
             'js'        => '/\$filter\(\'translate\'\)\(\'(?\'identifier\'.*?)\'\)/'
         ];
 
-        foreach($folders as $folder) {
+        foreach ($folders as $folder) {
             $aFiles = array_merge($aFiles, File::allFiles(base_path().'/'.$folder));
         }
 
@@ -95,13 +95,13 @@ 
 
             $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);
                     }
                 }
@@ -117,16 +117,16 @@ 
             ['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"],
             ]
         );
 
         $this->line('');
 
-        $this->info('Finished in: ' . number_format(microtime(true) - $start, 2) . 'sec');
+        $this->info('Finished in: '.number_format(microtime(true) - $start, 2).'sec');
     }
 
     /**
@@ -151,14 +151,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;
                     }
@@ -166,7 +166,7 @@ 
                     $this->found_parameters++;
                 }
 
-                if(!isset($aTranslations[$identifier])) {
+                if (!isset($aTranslations[$identifier])) {
                     $aTranslations[$identifier] = TranslatorFacade::hasIdentifier($identifier);
 
                     if (!$aTranslations[$identifier]) {
@@ -180,7 +180,7 @@ 
                     $this->dupl_identifier++;
                 }
 
-            } catch(\Exception $e){
+            } catch (\Exception $e) {
                 $this->bar->clear();
                 $this->info($identifier.' '.strlen($identifier));
                 $this->info($e->getMessage());

src/Controllers/TranslatorAdminController.php

Spacing +7 added lines, -7 removed lines

@@ -37,7 +37,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);
                 }
@@ -45,12 +45,12 @@ 
         }
 
         if ($search != '') {
-            $query = $query->where(function ($query) use ($search) {
-                $query ->where('identifier',     '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.'%');
+                    ->orWhere('group', 'LIKE', '%'.$search.'%')
+                    ->orWhere('page_name', 'LIKE', '%'.$search.'%')
+                    ->orWhere('description', 'LIKE', '%'.$search.'%');
             });
         }
 
@@ -171,7 +171,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]);

src/migrations/2017_11_27_162357_create_translator_tables.php

Spacing +2 added lines, -2 removed lines

@@ -28,7 +28,7 @@ 
         DB::beginTransaction();
 
         // Create table for storing roles
-        Schema::create('translation_identifiers', function (Blueprint $table)
+        Schema::create('translation_identifiers', function(Blueprint $table)
         {
             $table->increments('id')->unique();
             $table->text('identifier');
@@ -43,7 +43,7 @@ 
         });
 
         // Create table for storing roles
-        Schema::create('translations', function (Blueprint $table)
+        Schema::create('translations', function(Blueprint $table)
         {
             $table->integer('translation_identifier_id')->unsigned();
             $table->foreign('translation_identifier_id')->references('id')->on('translation_identifiers')->onDelete('no action')->onUpdate('no action');

src/Handler/DatabaseHandler.php

Indentation +1 added lines, -1 removed lines

@@ -81,7 +81,7 @@
         $translations = $translations->leftJoin('translations', function ($join)
             {
                 $join->on( 'translation_identifiers.id', '=', 'translations.translation_identifier_id')
-                     ->where('locale', $this->locale);
+                        ->where('locale', $this->locale);
             }
             )->get();
 

Spacing +3 added lines, -3 removed lines

@@ -78,9 +78,9 @@ 
     {
         // Get all Texts with translations for the given locale
         $translations = new TranslationIdentifier();
-        $translations = $translations->leftJoin('translations', function ($join)
+        $translations = $translations->leftJoin('translations', function($join)
             {
-                $join->on( 'translation_identifiers.id', '=', 'translations.translation_identifier_id')
+                $join->on('translation_identifiers.id', '=', 'translations.translation_identifier_id')
                      ->where('locale', $this->locale);
             }
             )->get();
@@ -118,7 +118,7 @@ 
      */
     function getDatabaseID($identifier)
     {
-        if(isset($this->translations[$identifier])) {
+        if (isset($this->translations[$identifier])) {
             return $this->translations[$identifier]->id;
         } else {
             throw new NotFoundResourceException("The translation identifier '".$identifier."' could not be found");

src/Handler/CacheJSONHandler.php

Indentation +1 added lines, -1 removed lines

@@ -82,7 +82,7 @@
 
         // If a Group is defined just get the translations from that group
         try {
-             $trans_identifier = json_decode(file_get_contents($locale_dir.'/'.$group.'.json'), true);
+                $trans_identifier = json_decode(file_get_contents($locale_dir.'/'.$group.'.json'), true);
         } catch (\ErrorException $e) {
             throw new TranslationCacheNotFound("The Translation cache file '".$locale_dir.'/'.$group.'.json'."' could not be found!");
         }

Spacing +1 added lines, -1 removed lines

@@ -32,7 +32,7 @@
      */
     public function __construct($locale)
     {
-        $this->locale   = $locale;
+        $this->locale = $locale;
 
         $this->refreshCache();
     }

Braces +1 added lines, -2 removed lines

@@ -63,8 +63,7 @@
         // So not finding the same identifier twice in the cache, will result in an error.
         if (isset($this->translations[$group][$identifier])) {
             return $this->translations[$group][$identifier];
-        }
-        else {
+        } else {
             throw new TranslationNotInCacheException("The translation identifier '".$identifier."' could not be found in Cache");
         }
     }