Hokan22 / laravel-translator

src/Commands/SearchTranslationsCommand.php

Spacing +21 added lines, -21 removed lines

@@ -21,7 +21,7 @@ 
  * Class SearchTranslationsCommand
  * @package App\Console\Commands
  */
-class SearchTranslationsCommand extends Command{
+class SearchTranslationsCommand extends Command {
     /**
      * The name and signature of the console command.
      *
@@ -47,7 +47,7 @@ 
     /**
      * Create a new command instance.
      */
-    public function __construct(){
+    public function __construct() {
         parent::__construct();
     }
 
@@ -57,7 +57,7 @@ 
      * @return mixed
      * @throws \Exception
      */
-    public function handle(){
+    public function handle() {
 
         // Get start time
         $start = microtime(true);
@@ -79,7 +79,7 @@ 
             'js'        => '/\$filter\(\'translate\'\)\(\'(?\'identifier\'.*?)\'\)/'
         ];
 
-        foreach($folders as $folder){
+        foreach ($folders as $folder) {
             $aFiles = array_merge($aFiles, File::allFiles(base_path().'/'.$folder));
         }
 
@@ -95,13 +95,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);
                     }
                 }
@@ -113,23 +113,23 @@ 
         $this->line('');
         $this->line('');
 
-        $this->table(['Num', 'Translations...'],[
+        $this->table(['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"],
         ]);
 
         $this->line('');
 
-        $this->info('Finished in: ' . number_format(microtime(true) - $start, 2) . 'sec');
+        $this->info('Finished in: '.number_format(microtime(true) - $start, 2).'sec');
     }
 
     private function addMissing($result, $group) {
 
         foreach ($result as $item) {
-            try{
+            try {
 
                 $identifier = trim($item['identifier']);
                 $this->found_identifier++;
@@ -140,19 +140,19 @@ 
 
                     $parameter_string = $item['parameters'];
 
-                    if (substr($parameter_string, 0, 1 ) === '[') {
+                    if (substr($parameter_string, 0, 1) === '[') {
                         $parameter_string = substr($parameter_string, 1, -1);
                     }
 
-                    $parameter_array = explode(",",$parameter_string);
+                    $parameter_array = explode(",", $parameter_string);
 
                     $parameters = array();
-                    foreach($parameter_array as $parameter )
+                    foreach ($parameter_array as $parameter)
                     {
-                        $parameter = explode("=>",$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;
                     }
@@ -160,10 +160,10 @@ 
                     $this->found_parameters++;
                 }
 
-                if(!isset($aTranslations[$identifier])){
+                if (!isset($aTranslations[$identifier])) {
                     $aTranslations[$identifier] = TranslatorFacade::hasIdentifier($identifier);
 
-                    if (! $aTranslations[$identifier]) {
+                    if (!$aTranslations[$identifier]) {
                         TranslatorFacade::addMissingIdentifier($identifier, $parameters, $group);
                         $this->bar->clear();
                         $this->info('Adding: "'.$identifier.'" to database');
@@ -175,7 +175,7 @@ 
                     $this->dupl_identifier++;
                 }
 
-            }catch(\Exception $e){
+            } catch (\Exception $e) {
                 $this->bar->clear();
                 $this->info($identifier.' '.strlen($identifier));
                 $this->info($e->getMessage());

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

src/Commands/CacheTranslationCommand.php

Spacing +4 added lines, -4 removed lines

@@ -92,7 +92,7 @@ 
      *
      * @return array
      */
-    private function getGroups () {
+    private function getGroups() {
         return DB::table('translation_identifiers')->select('group')->groupBy(['group'])->get()->pluck('group');
     }
 
@@ -102,11 +102,11 @@ 
      * @param $locale
      * @return TranslationIdentifier|\Illuminate\Database\Eloquent\Collection|static[]
      */
-    private function loadFromDB ($locale) {
+    private function loadFromDB($locale) {
         // Get all Texts with translations for the given locale
-        $trans_identifier =   new TranslationIdentifier();
+        $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)
             ->get();

Braces +2 added lines, -1 removed lines

@@ -12,7 +12,8 @@
  * Class CacheTranslationCommand
  * @package Hokan22\LaravelTranslator\commands
  */
-class CacheTranslationCommand extends Command {
+class CacheTranslationCommand extends Command
+{
 
     /**
      * The name and signature of the console command.

src/migrations/2017_11_27_162357_create_translator_tables.php

Spacing +2 added lines, -2 removed lines

@@ -17,7 +17,7 @@ 
 
         // Create table for storing roles
         // TODO: Make identifier strings varchar 255
-        Schema::create('translation_identifiers', function (Blueprint $table) {
+        Schema::create('translation_identifiers', function(Blueprint $table) {
 
             $table->increments('id')->unique();
             $table->text('identifier');
@@ -32,7 +32,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('no action')->onUpdate('no action');

Braces +2 added lines, -4 removed lines

@@ -11,8 +11,7 @@ 
      *
      * @return void
      */
-    public function up()
-    {
+    public function up() {
         DB::beginTransaction();
 
         // Create table for storing roles
@@ -55,8 +54,7 @@ 
      *
      * @return void
      */
-    public function down()
-    {
+    public function down() {
         Schema::drop('translations');
         Schema::drop('translation_identifiers');
     }

src/Models/Translations.php

Spacing +1 added lines, -1 removed lines

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

Braces +3 added lines, -2 removed lines

@@ -40,7 +40,8 @@ 
  * @method static Builder|Translations whereHas($relation, \Closure $callback = null, $operator = '>=', $count = 1)
  * @method static Builder|Translations where($column, $operator = null, $value = null, $boolean = 'and')
  */
-class Translations extends Model {
+class Translations extends Model
+{
 
 
     protected $primaryKey = 'this_model_uses_composite_keys';
@@ -60,7 +61,7 @@ 
     /**
      * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
      */
-    public function translationIdentifier(){
+    public function translationIdentifier() {
         return $this->belongsTo(TranslationIdentifier::class);
     }
 

src/Models/TranslationIdentifier.php

Spacing +1 added lines, -1 removed lines

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

Braces +3 added lines, -2 removed lines

@@ -43,7 +43,8 @@ 
  * @method static Builder|TranslationIdentifier whereHas($relation, \Closure $callback = null, $operator = '>=', $count = 1)
  * @method static Builder|TranslationIdentifier where($column, $operator = null, $value = null, $boolean = 'and')
  */
-class TranslationIdentifier extends Model {
+class TranslationIdentifier extends Model
+{
 
     /**
      * @var array
@@ -64,7 +65,7 @@ 
     /**
      * @return \Illuminate\Database\Eloquent\Relations\HasMany
      */
-    public function translations(){
+    public function translations() {
         return $this->hasMany(Translations::class);
     }