Hokan22 / laravel-translator

src/Translator.php

Braces +10 added lines, -16 removed lines

@@ -124,14 +124,12 @@ 
         // Check if the class from the config exists and implements HandlerInterface
         if (class_exists($handler_class) && is_a($handler_class, 'Hokan22\LaravelTranslator\Handler\HandlerInterface', TRUE)) {
             $oHandler = $handler_class;
-        }
-        elseif (!class_exists($handler_class)) {
+        } elseif (!class_exists($handler_class)) {
             // If one of the previous check fails check if the class does not exists and set message accordingly
             // As it could either be the class does not exist or does not implement HandlerInterface
             // check only the shorter statement to improve readability
             $message = "Handler '".$handler_class."' not found.";
-        }
-        else {
+        } else {
             // If the class exists but the class does not implement HandlerInterface set the message accordingly
             $message = "Handler '".$handler_class."' does not implement HandlerInterface.";
         }
@@ -147,8 +145,7 @@ 
         // Try to create new Instance of Handler and return it
         try {
              $oHandler = new $oHandler($locale);
-        }
-        catch (TranslationCacheNotFound $exception) {
+        } catch (TranslationCacheNotFound $exception) {
             // Log error and fallback procedure
             Log::error($exception);
             Log::warning('Falling back to DatabaseHandler');
@@ -207,8 +204,7 @@ 
 
             // Print notice about creation to laravel log
             Log::notice('The translation string "'.$identifier.'" will be written to the Database');
-        }
-        else {
+        } else {
             Log::warning('The translation string "'.$identifier.'" is already in the Database!');
         }
     }
@@ -279,29 +275,28 @@ 
         }
 
         // Fallback if empty locale was given (should be handled in middleware)
-        if ($locale == ''){
+        if ($locale == '') {
             if (session()->get('locale') != '') {
                 $locale = session()->get('locale');
-            }
-            else {
+            } else {
                 return $default_locale;
             }
         }
 
         // 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)) {
                 Log::warning('Locale "'.$locale.'" was not found! Falling back to default locale "'.$default_locale.'"');
                 $locale = $default_locale;
             }
@@ -309,8 +304,7 @@ 
             elseif (count($found_locales, 0) >= 1) {
                 Log::warning('Locale "'.$locale.'" was not found! Falling back to similar locale "'.$found_locales[0].'"');
                 $locale = $found_locales[0];
-            }
-            else {
+            } else {
                 throw new NotFoundResourceException("Locale '".$locale."' was not found in available locales");
             }
         }

src/Middleware/TranslatorMiddleware.php

Braces +3 added lines, -5 removed lines

@@ -16,21 +16,19 @@
      * @param  \Closure  $next
      * @return mixed
      */
-    public function handle($request, Closure $next)
-    {
+    public function handle($request, Closure $next) {
         if (Session::has('locale') || auth()->check()) {
             $locale = Session::has('locale') ? session()->get('locale') : auth()->user()->language;
 
             $locale = TranslatorFacade::validateLocale($locale);
 
-            if(Session::has('locale') == false){
+            if(Session::has('locale') == false) {
                 Session::put('locale', $locale);
                 Session::save();
             }
 
             app()->setLocale($locale);
-        }
-        else {
+        } else {
             // TODO: Validate Browser locale string (https://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.4)
 
             Session::put('locale', TranslatorFacade::getConfigValue('default_locale'));

src/Handler/DatabaseHandler.php

Braces +2 added lines, -4 removed lines

@@ -47,8 +47,7 @@ 
                 throw new TranslationNotFoundException("The translation for identifier '".$identifier."' and locale '".$this->locale."' could not be found");
             }
             return $this->translations[$identifier]->translation;
-        }
-        else {
+        } else {
             throw new NotFoundResourceException("The translation identifier '".$identifier."' could not be found");
         }
     }
@@ -74,8 +73,7 @@ 
      * @param $group
      * @return mixed
      */
-    public function getAllTranslations($group = 'default')
-    {
+    public function getAllTranslations($group = 'default') {
         $return = [];
         foreach (collect($this->translations)->where('group', $group) as $key => $translation) {
             if ($translation->translation == null) {

src/Handler/CacheJSONHandler.php

Braces +5 added lines, -7 removed lines

@@ -8,7 +8,8 @@ 
  * Class LocaleHandler
  * @package Hokan22\LaravelTranslator\
  */
-class CacheJSONHandler implements HandlerInterface {
+class CacheJSONHandler implements HandlerInterface
+{
     /** @var string The locale to translate to */
     private $locale;
     /** @var array|array[] Array with the identifiers as keys and the Texts object as value */
@@ -46,8 +47,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");
         }
     }
@@ -64,8 +64,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);
-        }
-        catch (\ErrorException $e) {
+        } catch (\ErrorException $e) {
             throw new TranslationCacheNotFound("The Translation cache file '".$locale_dir.'/'.$group.'.json'."' could not be found!");
         }
 
@@ -78,8 +77,7 @@ 
      * @return array|mixed
      * @throws TranslationCacheNotFound
      */
-    public function getAllTranslations($group)
-    {
+    public function getAllTranslations($group) {
         if(!isset($this->translations[$group])) {
             $this->refreshCache($group);
         }

src/Handler/HandlerInterface.php

Braces +9 added lines, -3 removed lines

@@ -11,7 +11,9 @@ 
  * Class TranslationNotFoundException
  * @package Hokan22\LaravelTranslator\Handler
  */
-class TranslationNotFoundException extends \Exception {}
+class TranslationNotFoundException extends \Exception
+{
+}
 
 /**
  * Custom Exception to distinguish if the Translation Identifier was not found in Cache but could be in DB
@@ -19,7 +21,9 @@ 
  * Class TranslationNotInCacheException
  * @package Hokan22\LaravelTranslator\Handler
  */
-class TranslationNotInCacheException extends TranslationNotFoundException {}
+class TranslationNotInCacheException extends TranslationNotFoundException
+{
+}
 
 /**
  * Custom Exception thrown when a cache file could not be found
@@ -27,7 +31,9 @@ 
  * Class TranslationCacheNotFound
  * @package Hokan22\LaravelTranslator\Handler
  */
-class TranslationCacheNotFound extends \Exception {}
+class TranslationCacheNotFound extends \Exception
+{
+}
 
 /**
  * Interface HandlerInterface

src/Provider/TranslatorBladeProvider.php

Braces +3 added lines, -6 removed lines

@@ -14,8 +14,7 @@ 
      *
      * @return void
      */
-    public function boot()
-    {
+    public function boot() {
         Blade::directive('translate', function ($expression) {
 
             $expression = $this->stripParentheses($expression);
@@ -39,8 +38,7 @@ 
      * @param  string  $expression
      * @return string
      */
-    public function stripParentheses($expression)
-    {
+    public function stripParentheses($expression) {
         if (Str::startsWith($expression, '(')) {
             $expression = substr($expression, 1, -1);
         }
@@ -53,7 +51,6 @@ 
      *
      * @return void
      */
-    public function register()
-    {
+    public function register() {
     }
 }

src/Provider/TranslatorProvider.php

Braces +1 added lines, -2 removed lines

@@ -13,8 +13,7 @@
      *
      * @return void
      */
-    public function register()
-    {
+    public function register() {
         $this->mergeConfigFrom(__DIR__.'/../config/translator.php', 'translator');
 
         $this->app->singleton('Translator', function () {

src/TranslatorFacade.php

Braces +1 added lines, -2 removed lines

@@ -34,8 +34,7 @@
      *
      * @return string
      */
-    protected static function getFacadeAccessor()
-    {
+    protected static function getFacadeAccessor() {
         return 'Translator';
     }
 }

src/Commands/SearchTranslationsCommand.php

Braces +12 added lines, -13 removed lines

@@ -21,7 +21,8 @@ 
  * Class SearchTranslationsCommand
  * @package App\Console\Commands
  */
-class SearchTranslationsCommand extends Command{
+class SearchTranslationsCommand extends Command
+{
     /**
      * The name and signature of the console command.
      *
@@ -47,7 +48,7 @@ 
     /**
      * Create a new command instance.
      */
-    public function __construct(){
+    public function __construct() {
         parent::__construct();
     }
 
@@ -57,7 +58,7 @@ 
      * @return mixed
      * @throws \Exception
      */
-    public function handle(){
+    public function handle() {
 
         // Get start time
         $start = microtime(true);
@@ -79,7 +80,7 @@ 
             'js'        => '/\$filter\(\'translate\'\)\(\'(?\'identifier\'.*?)\'\)/'
         ];
 
-        foreach($folders as $folder){
+        foreach($folders as $folder) {
             $aFiles = array_merge($aFiles, File::allFiles(base_path().'/'.$folder));
         }
 
@@ -95,13 +96,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);
                     }
                 }
@@ -129,7 +130,7 @@ 
     private function addMissing($result, $group) {
 
         foreach ($result as $item) {
-            try{
+            try {
 
                 $identifier = trim($item['identifier']);
                 $this->found_identifier++;
@@ -147,8 +148,7 @@ 
                     $parameter_array = explode(",",$parameter_string);
 
                     $parameters = array();
-                    foreach($parameter_array as $parameter )
-                    {
+                    foreach($parameter_array as $parameter ) {
                         $parameter = explode("=>",$parameter);
 
                         $key = str_replace([" ", "'"],"", $parameter[0]);
@@ -160,7 +160,7 @@ 
                     $this->found_parameters++;
                 }
 
-                if(!isset($aTranslations[$identifier])){
+                if(!isset($aTranslations[$identifier])) {
                     $aTranslations[$identifier] = TranslatorFacade::hasIdentifier($identifier);
 
                     if (! $aTranslations[$identifier]) {
@@ -170,12 +170,11 @@ 
                         $this->bar->display();
                         $this->new_identifier++;
                     }
-                }
-                else {
+                } else {
                     $this->dupl_identifier++;
                 }
 
-            }catch(\Exception $e){
+            } catch(\Exception $e) {
                 $this->bar->clear();
                 $this->info($identifier.' '.strlen($identifier));
                 $this->info($e->getMessage());