Hokan22 / laravel-translator

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/Handler/DefaultHandler.php

Indentation +1 added lines, -1 removed lines

@@ -49,7 +49,7 @@
      * @param $locale
      */
     function __construct($locale){
-         $this->locale = $locale;
+            $this->locale = $locale;
     }
 
     /**

Spacing +5 added lines, -5 removed lines

@@ -48,7 +48,7 @@ 
      *
      * @param $locale
      */
-    function __construct($locale){
+    function __construct($locale) {
          $this->locale = $locale;
     }
 
@@ -57,7 +57,7 @@ 
      *
      * @return string
      */
-    function getLocale(){
+    function getLocale() {
         return $this->locale;
     }
 
@@ -68,7 +68,7 @@ 
      * @param string $group
      * @return string
      */
-    function getTranslation($identifier, $group){
+    function getTranslation($identifier, $group) {
         return $identifier;
     }
 
@@ -77,7 +77,7 @@ 
      *
      * @return bool
      */
-    function refreshCache(){
+    function refreshCache() {
         return true;
     }
 
@@ -87,7 +87,7 @@ 
      * @param string $group
      * @return array
      */
-    function getAllTranslations($group){
+    function getAllTranslations($group) {
         return [];
     }
 

Braces +14 added lines, -8 removed lines

@@ -16,21 +16,27 @@ 
  *
  * Class TranslationNotFoundException
  */
-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
  *
  * Class TranslationNotInCacheException
  */
-class TranslationNotInCacheException extends TranslationNotFoundException {}
+class TranslationNotInCacheException extends TranslationNotFoundException
+{
+}
 
 /**
  * Custom Exception thrown when a cache file could not be found
  *
  * Class TranslationCacheNotFound
  */
-class TranslationCacheNotFound extends \Exception {}
+class TranslationCacheNotFound extends \Exception
+{
+}
 
 /**
  * Interface HandlerInterface
@@ -48,7 +54,7 @@ 
      *
      * @param $locale
      */
-    function __construct($locale){
+    function __construct($locale) {
          $this->locale = $locale;
     }
 
@@ -57,7 +63,7 @@ 
      *
      * @return string
      */
-    function getLocale(){
+    function getLocale() {
         return $this->locale;
     }
 
@@ -68,7 +74,7 @@ 
      * @param string $group
      * @return string
      */
-    function getTranslation($identifier, $group){
+    function getTranslation($identifier, $group) {
         return $identifier;
     }
 
@@ -77,7 +83,7 @@ 
      *
      * @return bool
      */
-    function refreshCache(){
+    function refreshCache() {
         return true;
     }
 
@@ -87,7 +93,7 @@ 
      * @param string $group
      * @return array
      */
-    function getAllTranslations($group){
+    function getAllTranslations($group) {
         return [];
     }
 

src/Handler/CacheJSONHandler.php

Indentation +1 added lines, -1 removed lines

@@ -61,7 +61,7 @@
         $locale_dir = TranslatorFacade::getConfigValue('cache_path').$this->locale;
 
         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 +4 added lines, -4 removed lines

@@ -46,7 +46,7 @@ 
             return $this->translations[$group][$identifier];
         }
         else {
-            throw new TranslationNotInCacheException("The translation identifier '".$identifier."' could not be found in Cache");
+            throw new TranslationNotInCacheException("The translation identifier '" . $identifier . "' could not be found in Cache");
         }
     }
 
@@ -58,12 +58,12 @@ 
      */
     public function refreshCache($group = 'default')
     {
-        $locale_dir = TranslatorFacade::getConfigValue('cache_path').$this->locale;
+        $locale_dir = TranslatorFacade::getConfigValue('cache_path') . $this->locale;
 
         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!");
+            throw new TranslationCacheNotFound("The Translation cache file '" . $locale_dir . '/' . $group . '.json' . "' could not be found!");
         }
 
         $this->translations[$group] = $trans_identifier;

Braces +5 added lines, -10 removed lines

@@ -22,8 +22,7 @@ 
      * @param string $locale The locale of the translations
      * @throws TranslationCacheNotFound
      */
-    public function __construct($locale)
-    {
+    public function __construct($locale) {
         parent::__construct($locale);
 
         $this->refreshCache();
@@ -37,15 +36,13 @@ 
      * @throws TranslationNotInCacheException
      * @return string returns the found translation for locale and identifier
      */
-    public function getTranslation($identifier, $group = 'default')
-    {
+    public function getTranslation($identifier, $group = 'default') {
         // NOTE: This should never trigger the addition of the identifier to the database!
         // Because the cache will not be updated automatically.
         // the same identifier will not be found twice in the cache, which will result in a duplicate key sql 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");
         }
     }
@@ -56,8 +53,7 @@ 
      * @param string $group
      * @throws TranslationCacheNotFound
      */
-    public function refreshCache($group = 'default')
-    {
+    public function refreshCache($group = 'default') {
         $locale_dir = TranslatorFacade::getConfigValue('cache_path').$this->locale;
 
         try {
@@ -75,8 +71,7 @@ 
      * @param string $group Group of the translations to return
      * @return array|mixed Translations of the given group
      */
-    public function getAllTranslations($group)
-    {
+    public function getAllTranslations($group) {
         return $this->translations[$group];
     }
 }
\ No newline at end of file

src/Translator.php

Indentation +6 added lines, -6 removed lines

@@ -131,12 +131,12 @@
         return $translation;
     }
 
-     /**
-      * Sets the Handler
-      *
-      * @param $locale
-      * @return DefaultHandler
-      */
+        /**
+         * Sets the Handler
+         *
+         * @param $locale
+         * @return DefaultHandler
+         */
     protected function createHandler($locale)
     {
         $handler_class = $this->config['handler'];

Spacing +9 added lines, -9 removed lines

@@ -188,7 +188,7 @@ 
 
             $keys = [];
             if (is_array($parameters)) {
-                foreach($parameters as $key => $value) {
+                foreach ($parameters as $key => $value) {
                     $keys[] = $key;
                 }
             }
@@ -206,9 +206,9 @@ 
                 // When using file Cache, adding the Identifier to the Database will not add it to file Cache!
                 $this->aHandler[$this->locale]->refreshCache();
             }
-            $this->log('The translation string "'.$identifier.'" will be written to the Database', 'notice');
+            $this->log('The translation string "' . $identifier . '" will be written to the Database', 'notice');
         } else {
-            $this->log('The translation string "'.$identifier.'" is already in the Database!', 'warning');
+            $this->log('The translation string "' . $identifier . '" is already in the Database!', 'warning');
         }
     }
 
@@ -236,7 +236,7 @@ 
     {
         foreach ($parameters as $key => $parameter) {
             // If the string (e.g "{name}") is not specified within the "parameters" array it won't be replaced!
-            $translation = str_replace("{".$key."}", $parameter, $translation);
+            $translation = str_replace("{" . $key . "}", $parameter, $translation);
         }
         return $translation;
     }
@@ -252,7 +252,7 @@ 
     protected function returnMissingTranslation($identifier, $locale)
     {
         if (config('app.env') !== 'production') {
-            return '<'.$identifier.':'.$locale.'>';
+            return '<' . $identifier . ':' . $locale . '>';
         }
         return $identifier;
     }
@@ -304,17 +304,17 @@ 
         $found_locales = [];
 
         foreach ($avail_locales as $avail_locale) {
-            if (strpos($avail_locale, $locale) !== false){
+            if (strpos($avail_locale, $locale) !== false) {
                 $found_locales[] = $avail_locale;
             }
         }
 
-        if (in_array($default_locale, $found_locales) || count($found_locales) == 0){
-            $message = 'Locale "'.$locale.'" was not found! Falling back to default locale "'.$default_locale.'"';
+        if (in_array($default_locale, $found_locales) || count($found_locales) == 0) {
+            $message = 'Locale "' . $locale . '" was not found! Falling back to default locale "' . $default_locale . '"';
             $locale = $default_locale;
 
         } else {
-            $message = 'Locale "'.$locale.'" was not found! Falling back to similar locale "'.$found_locales[0].'"';
+            $message = 'Locale "' . $locale . '" was not found! Falling back to similar locale "' . $found_locales[0] . '"';
             $locale = $found_locales[0];
         }
 

Braces +16 added lines, -27 removed lines

@@ -40,8 +40,7 @@ 
      * @param string $locale The locale to translate to
      * @throws \Exception
      */
-    public function __construct($locale = '')
-    {
+    public function __construct($locale = '') {
         $this->config = Config::get($this->configName);
 
         $this->setLocale($locale);
@@ -53,8 +52,7 @@ 
      * @param string $key Key for the config value to get
      * @return string|array Config value for $key
      */
-    public function getConfigValue($key)
-    {
+    public function getConfigValue($key) {
         return $this->config[$key];
     }
 
@@ -69,8 +67,7 @@ 
      * @return string Returns the translation with replaced parameters
      *
      */
-    public function translate($identifier, $parameters = null, $locale = null)
-    {
+    public function translate($identifier, $parameters = null, $locale = null) {
         if ($locale !== null) {
             $locale = $this->validateLocale($locale);
         } else {
@@ -137,8 +134,7 @@ 
       * @param $locale
       * @return DefaultHandler
       */
-    protected function createHandler($locale)
-    {
+    protected function createHandler($locale) {
         $handler_class = $this->config['handler'];
 
         if (session('translation_live_mode')) {
@@ -164,8 +160,7 @@ 
      *
      * @param string $locale The locale to use
      */
-    public function setLocale($locale)
-    {
+    public function setLocale($locale) {
         $locale = $this->validateLocale($locale);
 
         if (!isset($this->aHandler[$locale])) {
@@ -182,8 +177,7 @@ 
      * @param array $parameters The parameters available for the translation
      * @param string $group The group to put the identifier in
      */
-    public function addMissingIdentifierToDB($identifier, $parameters, $group)
-    {
+    public function addMissingIdentifierToDB($identifier, $parameters, $group) {
         if (!$this->hasIdentifier($identifier)) {
 
             $keys = [];
@@ -218,8 +212,7 @@ 
      * @param string $identifier The identifier to check
      * @return boolean Returns true if the identifier was found
      */
-    public function hasIdentifier($identifier)
-    {
+    public function hasIdentifier($identifier) {
         return TranslationIdentifier::where('identifier', $identifier)->count() > 0;
     }
 
@@ -232,8 +225,7 @@ 
      *
      * @todo Make Prefix and Suffix configurable
      */
-    protected function replaceParameter($translation, $parameters)
-    {
+    protected function replaceParameter($translation, $parameters) {
         foreach ($parameters as $key => $parameter) {
             // If the string (e.g "{name}") is not specified within the "parameters" array it won't be replaced!
             $translation = str_replace("{".$key."}", $parameter, $translation);
@@ -249,8 +241,7 @@ 
      * @throws \Exception
      * @return string The string to display instead of the translation
      */
-    protected function returnMissingTranslation($identifier, $locale)
-    {
+    protected function returnMissingTranslation($identifier, $locale) {
         if (config('app.env') !== 'production') {
             return '<'.$identifier.':'.$locale.'>';
         }
@@ -264,8 +255,7 @@ 
      * @param string $locale The locale to validate
      * @return string Returns the validated Locale
      */
-    public function validateLocale($locale)
-    {
+    public function validateLocale($locale) {
         $avail_locales      = $this->config['available_locales'];
         $default_locale     = $this->config['default_locale'];
 
@@ -296,8 +286,7 @@ 
      * @throws NotFoundResourceException
      * @return string Returns the guessed Locale
      */
-    private function guessLocale($locale)
-    {
+    private function guessLocale($locale) {
         $avail_locales      = $this->config['available_locales'];
         $default_locale     = $this->config['default_locale'];
 
@@ -318,7 +307,9 @@ 
             $locale = $found_locales[0];
         }
 
-        if ($message !== '') $this->log($message, 'warning');
+        if ($message !== '') {
+            $this->log($message, 'warning');
+        }
 
         return $locale;
     }
@@ -330,8 +321,7 @@ 
      * @param string $group The group of the translations to get
      * @return array|mixed Returns an array of all translation in the $locale from group $group
      */
-    public function getAllTranslations($locale, $group)
-    {
+    public function getAllTranslations($locale, $group) {
         if (!isset($this->aHandler[$locale])) {
             $this->aHandler[$locale] = $this->createHandler($locale);
         }
@@ -345,8 +335,7 @@ 
      * @param \Exception|string $exception The Exception to log
      * @param string $log_type The type of the log to write in the log file
      */
-    protected function log($exception, $log_type = 'notice')
-    {
+    protected function log($exception, $log_type = 'notice') {
         if ($this->config['log_level'] !== 'debug') {
             return;
         }

src/resources/routes.php

Spacing +3 added lines, -3 removed lines

@@ -7,11 +7,11 @@
  * @license  http://opensource.org/licenses/MIT MIT
  */
 
-if (! Hokan22\LaravelTranslator\TranslatorFacade::getConfigValue('custom_routes')) {
-    Route::group(['prefix' => 'translator'], function () {
+if (!Hokan22\LaravelTranslator\TranslatorFacade::getConfigValue('custom_routes')) {
+    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');
             Route::get('/{id}', 'Hokan22\LaravelTranslator\Controllers\TranslatorAdminController@edit')->where('id', '[0-9]+')->name('translator.admin.edit');

src/Handler/DatabaseHandler.php

Spacing +6 added lines, -6 removed lines

@@ -42,11 +42,11 @@ 
     {
         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");
+                throw new TranslationNotFoundException("The translation for identifier '" . $identifier . "' and locale '" . $this->locale . "' could not be found");
             }
             return $this->translations[$identifier]->translation;
         } else {
-            throw new NotFoundResourceException("The translation identifier '".$identifier."' could not be found");
+            throw new NotFoundResourceException("The translation identifier '" . $identifier . "' could not be found");
         }
     }
 
@@ -58,9 +58,9 @@ 
     public function refreshCache()
     {
         $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();
@@ -98,10 +98,10 @@ 
      */
     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");
+            throw new NotFoundResourceException("The translation identifier '" . $identifier . "' could not be found");
         }
     }
 }
\ No newline at end of file

Braces +6 added lines, -12 removed lines

@@ -22,8 +22,7 @@ 
      *
      * @param string $locale The locale of the translations
      */
-    public function __construct($locale)
-    {
+    public function __construct($locale) {
         parent::__construct($locale);
 
         $this->refreshCache();
@@ -38,8 +37,7 @@ 
      * @throws TranslationNotFoundException
      * @return string returns the found translation for identifier
      */
-    public function getTranslation($identifier, $group)
-    {
+    public function getTranslation($identifier, $group) {
         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");
@@ -55,11 +53,9 @@ 
      *
      * @return void
      */
-    public function refreshCache()
-    {
+    public function refreshCache() {
         $translations = new TranslationIdentifier();
-        $translations = $translations->leftJoin('translations', function ($join)
-            {
+        $translations = $translations->leftJoin('translations', function ($join) {
                 $join->on( 'translation_identifiers.id', '=', 'translations.translation_identifier_id')
                      ->where('locale', $this->locale);
             }
@@ -76,8 +72,7 @@ 
      * @param string $group Group of the translations to return
      * @return array Translations of the given group
      */
-    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) {
@@ -96,8 +91,7 @@ 
      * @throws NotFoundResourceException
      * @return integer
      */
-    function getDatabaseID($identifier)
-    {
+    function getDatabaseID($identifier) {
         if(isset($this->translations[$identifier])) {
             return $this->translations[$identifier]->id;
         } else {

src/Models/Translations.php

Braces +1 added lines, -2 removed lines

@@ -60,8 +60,7 @@
      *
      * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
      */
-    public function translationIdentifier()
-    {
+    public function translationIdentifier() {
         return $this->belongsTo(TranslationIdentifier::class);
     }
 }
\ No newline at end of file

src/Models/TranslationIdentifier.php

Braces +1 added lines, -2 removed lines

@@ -62,8 +62,7 @@
      *
      * @return \Illuminate\Database\Eloquent\Relations\HasMany
      */
-    public function translations()
-    {
+    public function translations() {
         return $this->hasMany(Translations::class);
     }
 

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());