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/CacheJSONHandler.php

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

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/DatabaseHandler.php

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/Translator.php

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/Commands/SearchTranslationsCommand.php

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

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)