Hokan22 / laravel-translator

src/Controllers/TranslatorAdminController.php

Braces +7 added lines, -14 removed lines

@@ -27,16 +27,14 @@ 
      *
      * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
      */
-    public function index()
-    {
+    public function index() {
         $search = Input::get('search', '');
         $locale = Input::get('locale', '');
 
         $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);
                 }
             );
@@ -73,8 +71,7 @@ 
      * @param integer $id ID of the translation Identifier to edit
      * @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');
@@ -97,8 +94,7 @@ 
      * @param Request $request Object with the values of the identifier
      * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
      */
-    public function postEdit($id, Request $request)
-    {
+    public function postEdit($id, Request $request) {
         TranslationIdentifier::findOrFail($id);
 
         foreach ($request->all() as $key => $value) {
@@ -131,8 +127,7 @@ 
      * @param Request $request Request with multiple values of identifiers to update
      * @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()));
 
@@ -159,8 +154,7 @@ 
      *
      * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
      */
-    public function test()
-    {
+    public function test() {
         return view('translator::test');
     }
 
@@ -168,8 +162,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]);
         } else {

Spacing +9 added lines, -9 removed lines

@@ -35,7 +35,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);
                 }
@@ -43,12 +43,12 @@ 
         }
 
         if ($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.'%');
+            $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 . '%');
             });
         }
 
@@ -144,7 +144,7 @@ 
 
             $translation_identifier = $translation_identifiers->find($id);
 
-            $translation_identifier->description    = isset($identifier['description']) ? $identifier['description'] : null;
+            $translation_identifier->description = isset($identifier['description']) ? $identifier['description'] : null;
 
             $translation_identifier->save();
         }
@@ -165,7 +165,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/Middleware/TranslatorMiddleware.php

Braces +1 added lines, -2 removed lines

@@ -30,8 +30,7 @@
      *
      * @todo Validate Browser locale string (https://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.4)
      */
-    public function handle(Request $request, Closure $next)
-    {
+    public function handle(Request $request, Closure $next) {
         if (Session::has('locale') || auth()->check()) {
             $locale = Session::has('locale') ? session()->get('locale') : auth()->user()->language;
 

src/Handler/DefaultHandler.php

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

Indentation +1 added lines, -1 removed lines

@@ -135,7 +135,7 @@
                     $this->warn('\''.$identifier.'\' is used in: \''. $file->getPath().'\'!');
 
                     foreach ($matches[0] as $match) {
-                         $this->warn($match);
+                            $this->warn($match);
                     }
                     $found = true;
                     $this->bar->display();

Spacing +24 added lines, -24 removed lines

@@ -56,21 +56,21 @@ 
 
         foreach ($aDB as $identifier) {
 
-            if(!in_array($identifier->identifier, $aFiles)) {
+            if (!in_array($identifier->identifier, $aFiles)) {
 
                 $found_as_plain = $this->verifyMissing($identifier->identifier);
 
                 $this->line('');
 
                 if ($found_as_plain) {
-                    $this->warn('\''.$identifier->identifier.'\' was not found withing Translator directives');
+                    $this->warn('\'' . $identifier->identifier . '\' was not found withing Translator directives');
                     $found_plain++;
                 } else {
-                    $this->line('\''.$identifier->identifier.'\' seems to be not used anymore');
+                    $this->line('\'' . $identifier->identifier . '\' seems to be not used anymore');
                     $not_used++;
                 }
 
-                $task = $this->choice('What do you want me to do?', ['Nothing' ,'Remove'], 0);
+                $task = $this->choice('What do you want me to do?', ['Nothing', 'Remove'], 0);
 
                 if ($task === 'Remove') {
                     $identifier->delete();
@@ -80,14 +80,14 @@ 
             }
         }
         
-        $this->table(['Num', 'Identifier'],[
-            [$this->found_identifier,  "In DB"],
-            [$not_used,     "Not Found"],
-            [$found_plain,  "Found Plain"],
-            [$removed,  "Removed"],
+        $this->table(['Num', 'Identifier'], [
+            [$this->found_identifier, "In DB"],
+            [$not_used, "Not Found"],
+            [$found_plain, "Found Plain"],
+            [$removed, "Removed"],
         ]);
         
-        $this->info($not_used.' Translations no longer used.');
+        $this->info($not_used . ' Translations no longer used.');
         $this->line('');
 
         $this->info('Finished in: ' . number_format(microtime(true) - $start, 2) . 'sec');
@@ -109,14 +109,14 @@ 
             'resources/assets/js',
         ];
 
-        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));
         }
 
         $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');
 
         $pattern = preg_quote($identifier, '/');
@@ -127,12 +127,12 @@ 
 
             $extension = $file->getExtension();
 
-            if(in_array($extension, $valid_extensions)){
+            if (in_array($extension, $valid_extensions)) {
 
                 $content = file_get_contents($file);
-                if (preg_match_all($pattern, $content, $matches)){
+                if (preg_match_all($pattern, $content, $matches)) {
                     $this->bar->clear();
-                    $this->warn('\''.$identifier.'\' is used in: \''. $file->getPath().'\'!');
+                    $this->warn('\'' . $identifier . '\' is used in: \'' . $file->getPath() . '\'!');
 
                     foreach ($matches[0] as $match) {
                          $this->warn($match);
@@ -160,8 +160,8 @@ 
             'js'        => '/\$filter\(\'translate\'\)\(\'(?\'identifier\'.*?)\'\)/'
         ];
 
-        foreach($this->folders as $folder){
-            $aFiles = array_merge($aFiles, File::allFiles(base_path().'/'.$folder));
+        foreach ($this->folders as $folder) {
+            $aFiles = array_merge($aFiles, File::allFiles(base_path() . '/' . $folder));
         }
 
         //TranslatorFacade::setLocale('de_DE');
@@ -169,20 +169,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, $this->extensions)){
+            if (in_array($extension, $this->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])) {
                         foreach ($result as $item) {
                             $this->found_identifier++;
                             $return[] = $item['identifier'];
@@ -196,7 +196,7 @@ 
         $this->bar->finish();
         $this->line('');
 
-        $this->info($this->found_identifier.' Translations found.');
+        $this->info($this->found_identifier . ' Translations found.');
 
         return $return;
     }
@@ -206,9 +206,9 @@ 
      *
      * @return TranslationIdentifier|\Illuminate\Database\Eloquent\Collection|static[]
      */
-    private function loadFromDB () {
+    private function loadFromDB() {
         // Get all Texts with translations for the given locale
-        $trans_identifier =   TranslationIdentifier::select(['id', 'identifier'])->get();
+        $trans_identifier = TranslationIdentifier::select(['id', 'identifier'])->get();
 
         return $trans_identifier;
     }

Braces +4 added lines, -3 removed lines

@@ -8,7 +8,8 @@ 
 use Illuminate\Support\Facades\File;
 use Illuminate\Console\Command;
 
-class ClearUnusedTranslationsCommand extends Command {
+class ClearUnusedTranslationsCommand extends Command
+{
 
     /**
      * The name and signature of the console command.
@@ -109,7 +110,7 @@ 
             'resources/assets/js',
         ];
 
-        foreach($folders as $folder){
+        foreach($folders as $folder) {
             $aFiles = array_merge($aFiles, File::allFiles(base_path().'/'.$folder));
         }
 
@@ -160,7 +161,7 @@ 
             'js'        => '/\$filter\(\'translate\'\)\(\'(?\'identifier\'.*?)\'\)/'
         ];
 
-        foreach($this->folders as $folder){
+        foreach($this->folders as $folder) {
             $aFiles = array_merge($aFiles, File::allFiles(base_path().'/'.$folder));
         }
 

src/migrations/2017_11_27_162357_create_translator_tables.php

Spacing +2 added lines, -2 removed lines

@@ -26,7 +26,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');
@@ -41,7 +41,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('cascade')->onUpdate('no action');

Braces +4 added lines, -8 removed lines

@@ -21,13 +21,11 @@ 
      *
      * @return void
      */
-    public function up()
-    {
+    public function up() {
         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');
 
@@ -41,8 +39,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('cascade')->onUpdate('no action');
 
@@ -64,8 +61,7 @@ 
      *
      * @return void
      */
-    public function down()
-    {
+    public function down() {
         Schema::drop('translations');
         Schema::drop('translation_identifiers');
     }