Hokan22 / laravel-translator

src/Translator.php

Indentation +2 added lines, -2 removed lines

@@ -146,7 +146,7 @@ 
         // TODO: Cleanup (avoid repetition)
         // Try to create new Instance of Handler and return it
         try {
-             $oHandler = new $oHandler($locale);
+                $oHandler = new $oHandler($locale);
         }
         catch (TranslationCacheNotFound $exception) {
             // Log error and fallback procedure
@@ -231,7 +231,7 @@ 
     private function replaceParameter ($translation, $parameters) {
 
         // Go through each specified Parameter and replace its placeholder "{$key}"
-       foreach ($parameters as $key => $parameter) {
+        foreach ($parameters as $key => $parameter) {
             // TODO: Make Prefix and Suffix configurable
             // If the string (e.g "{name}") is not specified within the "parameters" array it won't be replaced!
             $translation = str_replace("{".$key."}", $parameter, $translation);

Spacing +10 added lines, -10 removed lines

@@ -59,7 +59,7 @@ 
      * @throws \Exception
      * TODO: Make function Parameters interchangeable
      */
-    public function translate($identifier , $parameters = null, $locale = '') {
+    public function translate($identifier, $parameters = null, $locale = '') {
 
         // Validate the locale given as parameter or take the saved locale
         if ($locale !== '' || $this->locale === '') {
@@ -181,12 +181,12 @@ 
      */
     public function addMissingIdentifier($identifier, $parameters, $group) {
 
-        if(! $this->hasIdentifier($identifier)) {
+        if (!$this->hasIdentifier($identifier)) {
 
             // 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;
                 }
             }
@@ -228,7 +228,7 @@ 
      * @param $parameters
      * @return string
      */
-    private function replaceParameter ($translation, $parameters) {
+    private function replaceParameter($translation, $parameters) {
 
         // Go through each specified Parameter and replace its placeholder "{$key}"
        foreach ($parameters as $key => $parameter) {
@@ -249,7 +249,7 @@ 
      * @return string
      * @throws \Exception
      */
-    private function returnMissingTranslation ($identifier, $locale) {
+    private function returnMissingTranslation($identifier, $locale) {
 
         // Return identifier and locale for easier debug
         if (config('app.env') !== 'production') {
@@ -279,7 +279,7 @@ 
         }
 
         // Fallback if empty locale was given (should be handled in middleware)
-        if ($locale == ''){
+        if ($locale == '') {
             if (session()->get('locale') != '') {
                 $locale = session()->get('locale');
             }
@@ -289,19 +289,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)) {
                 Log::warning('Locale "'.$locale.'" was not found! Falling back to default locale "'.$default_locale.'"');
                 $locale = $default_locale;
             }
@@ -324,7 +324,7 @@ 
      * @return array|mixed
      */
     public function getAllTranslations($locale, $group) {
-        if(!isset($this->aHandler[$locale])) {
+        if (!isset($this->aHandler[$locale])) {
             $this->aHandler[$locale] = $this->createHandler($locale);
         }
 

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

Spacing +1 added lines, -1 removed lines

@@ -23,7 +23,7 @@
 
             $locale = TranslatorFacade::validateLocale($locale);
 
-            if(Session::has('locale') == false){
+            if (Session::has('locale') == false) {
                 Session::put('locale', $locale);
                 Session::save();
             }

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

Indentation +1 added lines, -1 removed lines

@@ -61,7 +61,7 @@
         $translations =   new TranslationIdentifier();
         $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 +4 added lines, -4 removed lines

@@ -42,7 +42,7 @@ 
      */
     public function getTranslation($identifier, $group) {
 
-        if(isset($this->translations[$identifier])) {
+        if (isset($this->translations[$identifier])) {
             if ($this->translations[$identifier]->translation == null) {
                 throw new TranslationNotFoundException("The translation for identifier '".$identifier."' and locale '".$this->locale."' could not be found");
             }
@@ -58,9 +58,9 @@ 
      */
     public function refreshCache() {
         // Get all Texts with translations for the given locale
-        $translations =   new TranslationIdentifier();
-        $translations =   $translations->leftJoin('translations', function ($join) {
-                                                    $join->on( 'translation_identifiers.id', '=', 'translations.translation_identifier_id')
+        $translations = new TranslationIdentifier();
+        $translations = $translations->leftJoin('translations', function($join) {
+                                                    $join->on('translation_identifiers.id', '=', 'translations.translation_identifier_id')
                                                          ->where('locale', $this->locale);
                                                 })->get();
 

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

Indentation +1 added lines, -1 removed lines

@@ -63,7 +63,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 +3 added lines, -3 removed lines

@@ -20,7 +20,7 @@ 
      * @throws TranslationCacheNotFound
      */
     public function __construct($locale) {
-        $this->locale   = $locale;
+        $this->locale = $locale;
 
         $this->refreshCache();
     }
@@ -44,7 +44,7 @@ 
         // NOTE: This should never trigger the addition of the identifier to the database,
         // because the cache will not be updated automatically.
         // So not finding the same identifier twice in the cache, will result in an error.
-        if(isset($this->translations[$group][$identifier])) {
+        if (isset($this->translations[$group][$identifier])) {
             return $this->translations[$group][$identifier];
         }
         else {
@@ -80,7 +80,7 @@ 
      */
     public function getAllTranslations($group)
     {
-        if(!isset($this->translations[$group])) {
+        if (!isset($this->translations[$group])) {
             $this->refreshCache($group);
         }
         return $this->translations[$group];

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

Indentation +6 added lines, -6 removed lines

@@ -33,12 +33,12 @@
         });
     }
 
-     /**
-     * Strip the parentheses from the given expression.
-     *
-     * @param  string  $expression
-     * @return string
-     */
+        /**
+         * Strip the parentheses from the given expression.
+         *
+         * @param  string  $expression
+         * @return string
+         */
     public function stripParentheses($expression)
     {
         if (Str::startsWith($expression, '(')) {

Spacing +2 added lines, -2 removed lines

@@ -16,7 +16,7 @@ 
      */
     public function boot()
     {
-        Blade::directive('translate', function ($expression) {
+        Blade::directive('translate', function($expression) {
 
             $expression = $this->stripParentheses($expression);
 
@@ -24,7 +24,7 @@ 
             return "<?php echo Hokan22\\LaravelTranslator\\TranslatorFacade::translate({$expression}); ?>";
         });
 
-        Blade::directive('t', function ($expression) {
+        Blade::directive('t', function($expression) {
 
             $expression = $this->stripParentheses($expression);
 

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

Spacing +2 added lines, -2 removed lines

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

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/resources/routes.php

Spacing +3 added lines, -3 removed lines

@@ -1,12 +1,12 @@
 <?php
 
-if (! Hokan22\LaravelTranslator\TranslatorFacade::getConfigValue('custom_routes')) {
+if (!Hokan22\LaravelTranslator\TranslatorFacade::getConfigValue('custom_routes')) {
 
-    Route::group(['prefix' => 'translator'], function () {
+    Route::group(['prefix' => 'translator'], function() {
 
         Route::get('/test', 'Hokan22\LaravelTranslator\Controllers\TranslatorAdminController@test')->name('translator.test');
 
-        Route::group(['prefix' => 'admin'], function () {
+        Route::group(['prefix' => 'admin'], function() {
 
             Route::get('/', 'Hokan22\LaravelTranslator\Controllers\TranslatorAdminController@index')->name('translator.admin');
             Route::post('/', 'Hokan22\LaravelTranslator\Controllers\TranslatorAdminController@postIdentifier')->name('translator.post.admin');

src/Controllers/TranslatorAdminController.php

Spacing +12 added lines, -12 removed lines

@@ -20,7 +20,7 @@ 
     /**
      * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
      */
-    public function index () {
+    public function index() {
 
         $locale = Input::get('locale', '');
         $search = Input::get('search', '');
@@ -28,24 +28,24 @@ 
         $query = TranslationIdentifier::with('translations')->orderBy('updated_at', 'DESC')->orderBy('id', 'DESC');
 
         if ($locale != '') {
-            $query = TranslationIdentifier::wheredoesntHave('translations', function ($query) use ($locale) {
+            $query = TranslationIdentifier::wheredoesntHave('translations', function($query) use ($locale) {
                             $query->where('locale', 'like', $locale);
                         });
         }
 
         if ($search != '') {
-            $query = TranslationIdentifier::where('identifier',     'LIKE', '%'.$search.'%')
+            $query = TranslationIdentifier::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.'%');
         }
 
         $trans_identifier = $query->orderBy('updated_at', 'DESC')->orderBy('id', 'DESC')->paginate(20)->appends(Input::except('page'));
 
         $available_locales = TranslatorFacade::getConfigValue('available_locales');
 
-        return view('translator::index',[
+        return view('translator::index', [
             'identifier'         =>  $trans_identifier,
             'available_locales'  =>  $available_locales,
         ]);
@@ -55,13 +55,13 @@ 
      * @param $id
      * @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');
 
-        return view('translator::edit',[
+        return view('translator::edit', [
             'identifier'         =>  $identifier,
             'available_locales'  =>  $available_locales,
         ]);
@@ -73,7 +73,7 @@ 
      * @param Request $request
      * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
      */
-    public function postEdit ($id, Request $request) {
+    public function postEdit($id, Request $request) {
         
         TranslationIdentifier::findOrFail($id);
 
@@ -106,7 +106,7 @@ 
      * @param Request $request
      * @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()));
@@ -133,7 +133,7 @@ 
     /**
      * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
      */
-    public function test () {
+    public function test() {
         return view('translator::test');
     }
 }
\ No newline at end of file