Inspection of "Add mkt file" - mikehins/laravel-translatable - Measure and Improve Code Quality continuously with Scrutinizer

Test Failed

Push — master ( 369b73...d07341 )

by Mike

created 2022-08-17 18:16 UTC

Status

Spacing +4 added lines, -4 removed lines patch added patch discarded remove patch

@@ -15,17 +15,17 @@
 block discarded – undo
 {
     public function boot()
     {
-        $this->loadMigrationsFrom(__DIR__ . '/database/migrations/');
+        $this->loadMigrationsFrom(__DIR__.'/database/migrations/');
         
         $this->publishes([
-            __DIR__ . '/database/migrations/' => database_path('migrations')
+            __DIR__.'/database/migrations/' => database_path('migrations')
         ], 'migrations');
         
         $this->publishes([
-            __DIR__ . '/config/languages.php' => config_path('languages.php'),
+            __DIR__.'/config/languages.php' => config_path('languages.php'),
         ], 'config');
         
-        Collection::macro('for', function ($field, $code) {
+        Collection::macro('for', function($field, $code) {
             return $this->where('key', $field)->where('locale', $code)->pluck('value')->first() ?? null;
         });
     }

Please login to merge, or discard this patch.

src/Translatable.php 2 patches

Indentation +104 added lines, -104 removed lines patch added patch discarded remove patch

@@ -8,84 +8,84 @@  discard block
 block discarded – undo
 
 trait Translatable
 {
-	public static $transtableFieldName = 'translatable';
+    public static $transtableFieldName = 'translatable';
 	
-	public $translatable;
-	public $model;
+    public $translatable;
+    public $model;
 	
-	protected $locale;
+    protected $locale;
 	
-	public static function bootTranslatable()
-	{
-		static::addGlobalScope(new TranslatableScope);
+    public static function bootTranslatable()
+    {
+        static::addGlobalScope(new TranslatableScope);
 		
-		static::saving(function ($model) {
-			$model->translatable = collect($model->attributes)->only(static::$transtableFieldName)->toArray();
-			$model->attributes = collect($model->attributes)->except(static::$transtableFieldName)->toArray();
-		});
+        static::saving(function ($model) {
+            $model->translatable = collect($model->attributes)->only(static::$transtableFieldName)->toArray();
+            $model->attributes = collect($model->attributes)->except(static::$transtableFieldName)->toArray();
+        });
 		
-		static::saved(function ($model) {
-			if ($model->translatable) {
-				(new self)->saveTranslation($model);
-			}
-		});
+        static::saved(function ($model) {
+            if ($model->translatable) {
+                (new self)->saveTranslation($model);
+            }
+        });
 		
-		static::deleted(function ($model) {
-			if ((new $model)->has('translations')) {
-				$model->translations()->delete();
-			}
-		});
-	}
+        static::deleted(function ($model) {
+            if ((new $model)->has('translations')) {
+                $model->translations()->delete();
+            }
+        });
+    }
 	
-	public function locale($value = null)
-	{
-		$this->locale = $value;
+    public function locale($value = null)
+    {
+        $this->locale = $value;
 		
-		return $this;
-	}
+        return $this;
+    }
 	
-	// Relationship
-	public function translations()
-	{
-		return $this->morphMany(Translation::class, 'translatable');
-	}
+    // Relationship
+    public function translations()
+    {
+        return $this->morphMany(Translation::class, 'translatable');
+    }
 	
-	// scope
-	public function scopeTranslated($query, ...$fields)
-	{
-		$this->locale = $this->locale ?? app()->getLocale();
+    // scope
+    public function scopeTranslated($query, ...$fields)
+    {
+        $this->locale = $this->locale ?? app()->getLocale();
 		
-		$fields = empty($fields) ? $this->getTranslatedFieldsForCurrentModel() : collect($fields);
+        $fields = empty($fields) ? $this->getTranslatedFieldsForCurrentModel() : collect($fields);
 		
-		if ($fields->isEmpty()) {
-			return $query;
-		}
+        if ($fields->isEmpty()) {
+            return $query;
+        }
 		
-		// Add select * if nothing has been selected yet
-		if ($query->getQuery()->columns === null) {
-			$query->select('*');
-		}
+        // Add select * if nothing has been selected yet
+        if ($query->getQuery()->columns === null) {
+            $query->select('*');
+        }
 		
-		// Build the sub select
-		$fields->each(function ($key) use ($query) {
-			$this->subSelectTranslation($query, $key);
-		});
+        // Build the sub select
+        $fields->each(function ($key) use ($query) {
+            $this->subSelectTranslation($query, $key);
+        });
 		
-		return $query;
-	}
+        return $query;
+    }
 	
-	protected function subSelectTranslation($query, $key): void
-	{
-		$query->addSelect([
-			$key => function ($query) use ($key) {
-				$query->select(Translation::getTableName() . '.value')
-					->from(Translation::getTableName())
-					->where(Translation::getTableName() . '.translatable_type', '=', \get_class($this))
-					->where(Translation::getTableName() . '.locale', '=', $this->locale)
-					->where(Translation::getTableName() . '.key', '=', $key)
-					->where(Translation::getTableName() . '.translatable_id', '=', \DB::raw($this->getTable() . '.' . $this->primaryKey));
-			}
-		]);
+    protected function subSelectTranslation($query, $key): void
+    {
+        $query->addSelect([
+            $key => function ($query) use ($key) {
+                $query->select(Translation::getTableName() . '.value')
+                    ->from(Translation::getTableName())
+                    ->where(Translation::getTableName() . '.translatable_type', '=', \get_class($this))
+                    ->where(Translation::getTableName() . '.locale', '=', $this->locale)
+                    ->where(Translation::getTableName() . '.key', '=', $key)
+                    ->where(Translation::getTableName() . '.translatable_id', '=', \DB::raw($this->getTable() . '.' . $this->primaryKey));
+            }
+        ]);
 
 //        $query->addSelect(\DB::raw('(
 //			SELECT      `' . Translation::getTableName() . '`.`value`
@@ -96,53 +96,53 @@  discard block
 block discarded – undo
 //			   AND      `' . Translation::getTableName() . '`.`translatable_id` = `' . $this->getTable() . '`.`' . $this->primaryKey . '`
 //			) as `' . $key . '`')
 //        );
-	}
+    }
 	
-	/**
-	 * Query the translations table for possible keys if none are provided.
-	 * @return Collection
-	 */
-	public function getTranslatedFieldsForCurrentModel(): Collection
-	{
-		$table = Translation::getTableName();
+    /**
+     * Query the translations table for possible keys if none are provided.
+     * @return Collection
+     */
+    public function getTranslatedFieldsForCurrentModel(): Collection
+    {
+        $table = Translation::getTableName();
 		
-		return DB::table($table)->select($table . '.key')
-			->where($table . '.translatable_type', \get_class($this))
-			->where($table . '.locale', $this->locale)
-			->groupBy($table . '.key')
-			->pluck('key');
-	}
+        return DB::table($table)->select($table . '.key')
+            ->where($table . '.translatable_type', \get_class($this))
+            ->where($table . '.locale', $this->locale)
+            ->groupBy($table . '.key')
+            ->pluck('key');
+    }
 	
-	public function saveTranslation($model): int
-	{
-		return (new Translation)->store([
-			'translatable'      => $model->translatable[static::$transtableFieldName],
-			'translatable_type' => \get_class($model),
-			'translatable_id'   => $model->id,
-		]);
-	}
+    public function saveTranslation($model): int
+    {
+        return (new Translation)->store([
+            'translatable'      => $model->translatable[static::$transtableFieldName],
+            'translatable_type' => \get_class($model),
+            'translatable_id'   => $model->id,
+        ]);
+    }
 	
-	protected function fullTextWildcards($term)
-	{
-		return collect(explode(' ', str_replace(['-', '+', '<', '>', '@', '(', ')', '~'], '', $term)))->map(function ($word, $key) {
-			return strlen(trim($word)) >= 3 ? '+' . trim($word) . '*' : '';
-		})->implode(' ');
-	}
+    protected function fullTextWildcards($term)
+    {
+        return collect(explode(' ', str_replace(['-', '+', '<', '>', '@', '(', ')', '~'], '', $term)))->map(function ($word, $key) {
+            return strlen(trim($word)) >= 3 ? '+' . trim($word) . '*' : '';
+        })->implode(' ');
+    }
 	
-	public function scopeSearchFullText($query, $term)
-	{
-		$term = $this->fullTextWildcards($term);
+    public function scopeSearchFullText($query, $term)
+    {
+        $term = $this->fullTextWildcards($term);
 		
-		$matches = Translation::selectRaw('translatable_id, MATCH(`value`) AGAINST (\'' . $term . '\' IN BOOLEAN MODE) as relevance')
-			->whereRaw(\DB::raw('MATCH (`value`) AGAINST (\'' . $term . '\' IN BOOLEAN MODE)'))
-			->where('translations.translatable_type', '=', \get_class($this))
-			->having('relevance', '>', 0)
-			->orderBy('relevance')
-			// force to search only in the current language
-			//->where('translations.locale', app()->getLocale());
-			->pluck('translatable_id')
-			->toArray();
+        $matches = Translation::selectRaw('translatable_id, MATCH(`value`) AGAINST (\'' . $term . '\' IN BOOLEAN MODE) as relevance')
+            ->whereRaw(\DB::raw('MATCH (`value`) AGAINST (\'' . $term . '\' IN BOOLEAN MODE)'))
+            ->where('translations.translatable_type', '=', \get_class($this))
+            ->having('relevance', '>', 0)
+            ->orderBy('relevance')
+            // force to search only in the current language
+            //->where('translations.locale', app()->getLocale());
+            ->pluck('translatable_id')
+            ->toArray();
 		
-		return $query->whereIn(DB::raw($this->getTable() . '.' . $this->primaryKey), $matches);
-	}
+        return $query->whereIn(DB::raw($this->getTable() . '.' . $this->primaryKey), $matches);
+    }
 }

Please login to merge, or discard this patch.

Spacing +19 added lines, -19 removed lines patch added patch discarded remove patch

@@ -19,18 +19,18 @@  discard block
 block discarded – undo
 	{
 		static::addGlobalScope(new TranslatableScope);
 		
-		static::saving(function ($model) {
+		static::saving(function($model) {
 			$model->translatable = collect($model->attributes)->only(static::$transtableFieldName)->toArray();
 			$model->attributes = collect($model->attributes)->except(static::$transtableFieldName)->toArray();
 		});
 		
-		static::saved(function ($model) {
+		static::saved(function($model) {
 			if ($model->translatable) {
 				(new self)->saveTranslation($model);
 			}
 		});
 		
-		static::deleted(function ($model) {
+		static::deleted(function($model) {
 			if ((new $model)->has('translations')) {
 				$model->translations()->delete();
 			}
@@ -67,7 +67,7 @@  discard block
 block discarded – undo
 		}
 		
 		// Build the sub select
-		$fields->each(function ($key) use ($query) {
+		$fields->each(function($key) use ($query) {
 			$this->subSelectTranslation($query, $key);
 		});
 		
@@ -77,13 +77,13 @@  discard block
 block discarded – undo
 	protected function subSelectTranslation($query, $key): void
 	{
 		$query->addSelect([
-			$key => function ($query) use ($key) {
-				$query->select(Translation::getTableName() . '.value')
+			$key => function($query) use ($key) {
+				$query->select(Translation::getTableName().'.value')
 					->from(Translation::getTableName())
-					->where(Translation::getTableName() . '.translatable_type', '=', \get_class($this))
-					->where(Translation::getTableName() . '.locale', '=', $this->locale)
-					->where(Translation::getTableName() . '.key', '=', $key)
-					->where(Translation::getTableName() . '.translatable_id', '=', \DB::raw($this->getTable() . '.' . $this->primaryKey));
+					->where(Translation::getTableName().'.translatable_type', '=', \get_class($this))
+					->where(Translation::getTableName().'.locale', '=', $this->locale)
+					->where(Translation::getTableName().'.key', '=', $key)
+					->where(Translation::getTableName().'.translatable_id', '=', \DB::raw($this->getTable().'.'.$this->primaryKey));
 			}
 		]);
 
@@ -106,10 +106,10 @@  discard block
 block discarded – undo
 	{
 		$table = Translation::getTableName();
 		
-		return DB::table($table)->select($table . '.key')
-			->where($table . '.translatable_type', \get_class($this))
-			->where($table . '.locale', $this->locale)
-			->groupBy($table . '.key')
+		return DB::table($table)->select($table.'.key')
+			->where($table.'.translatable_type', \get_class($this))
+			->where($table.'.locale', $this->locale)
+			->groupBy($table.'.key')
 			->pluck('key');
 	}
 	
@@ -124,8 +124,8 @@  discard block
 block discarded – undo
 	
 	protected function fullTextWildcards($term)
 	{
-		return collect(explode(' ', str_replace(['-', '+', '<', '>', '@', '(', ')', '~'], '', $term)))->map(function ($word, $key) {
-			return strlen(trim($word)) >= 3 ? '+' . trim($word) . '*' : '';
+		return collect(explode(' ', str_replace(['-', '+', '<', '>', '@', '(', ')', '~'], '', $term)))->map(function($word, $key) {
+			return strlen(trim($word)) >= 3 ? '+'.trim($word).'*' : '';
 		})->implode(' ');
 	}
 	
@@ -133,8 +133,8 @@  discard block
 block discarded – undo
 	{
 		$term = $this->fullTextWildcards($term);
 		
-		$matches = Translation::selectRaw('translatable_id, MATCH(`value`) AGAINST (\'' . $term . '\' IN BOOLEAN MODE) as relevance')
-			->whereRaw(\DB::raw('MATCH (`value`) AGAINST (\'' . $term . '\' IN BOOLEAN MODE)'))
+		$matches = Translation::selectRaw('translatable_id, MATCH(`value`) AGAINST (\''.$term.'\' IN BOOLEAN MODE) as relevance')
+			->whereRaw(\DB::raw('MATCH (`value`) AGAINST (\''.$term.'\' IN BOOLEAN MODE)'))
 			->where('translations.translatable_type', '=', \get_class($this))
 			->having('relevance', '>', 0)
 			->orderBy('relevance')
@@ -143,6 +143,6 @@  discard block
 block discarded – undo
 			->pluck('translatable_id')
 			->toArray();
 		
-		return $query->whereIn(DB::raw($this->getTable() . '.' . $this->primaryKey), $matches);
+		return $query->whereIn(DB::raw($this->getTable().'.'.$this->primaryKey), $matches);
 	}
 }

Please login to merge, or discard this patch.

src/database/migrations/2018_02_25_003452_create_translations_table.php 1 patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -13,7 +13,7 @@
 block discarded – undo
      */
     public function up()
     {
-        Schema::create('translations', function (Blueprint $table) {
+        Schema::create('translations', function(Blueprint $table) {
             $table->string('key');
             $table->text('value');
             $table->bigInteger('translatable_id')->unsigned();

Please login to merge, or discard this patch.

src/Translation.php 1 patch

Spacing +4 added lines, -4 removed lines patch added patch discarded remove patch

@@ -22,8 +22,8 @@  discard block
 block discarded – undo
     {
         $this->deleteTranslation($attributes['translatable_type'], $attributes['translatable_id']);
         
-        collect($attributes['translatable'])->each(function ($data, $locale) use ($attributes) {
-            collect($data)->each(function ($value, $key) use ($attributes, $locale) {
+        collect($attributes['translatable'])->each(function($data, $locale) use ($attributes) {
+            collect($data)->each(function($value, $key) use ($attributes, $locale) {
                 self::insert([
                     'key'               => $key,
                     'value'             => $value ?? '',
@@ -58,11 +58,11 @@  discard block
 block discarded – undo
     public function scopeOrderTranslationByKey($query, $key = 'name', $order = 'asc')
     {
         return $query->select(\DB::raw('
-			IF(translations.`key` = "' . $key . '", translations.value, "") as ' . $key . '
+			IF(translations.`key` = "' . $key.'", translations.value, "") as '.$key.'
 		'))->where(
             'translations.locale', '=', app()->getLocale()
         )->orderBy(
-            \DB::raw($key . ' ' . $order)
+            \DB::raw($key.' '.$order)
         )->groupBy('translations.translatable_id');
     }
     

Please login to merge, or discard this patch.

		@@ -15,17 +15,17 @@
		block discarded – undo
15	15	{
16	16	public function boot()
17	17	{
18		- $this->loadMigrationsFrom(__DIR__ . '/database/migrations/');
	18	+ $this->loadMigrationsFrom(__DIR__.'/database/migrations/');
19	19
20	20	$this->publishes([
21		- __DIR__ . '/database/migrations/' => database_path('migrations')
	21	+ __DIR__.'/database/migrations/' => database_path('migrations')
22	22	], 'migrations');
23	23
24	24	$this->publishes([
25		- __DIR__ . '/config/languages.php' => config_path('languages.php'),
	25	+ __DIR__.'/config/languages.php' => config_path('languages.php'),
26	26	], 'config');
27	27
28		- Collection::macro('for', function ($field, $code) {
	28	+ Collection::macro('for', function($field, $code) {
29	29	return $this->where('key', $field)->where('locale', $code)->pluck('value')->first() ?? null;
30	30	});
31	31	}

		@@ -8,84 +8,84 @@ discard block
		block discarded – undo
8	8
9	9	trait Translatable
10	10	{
11		- public static $transtableFieldName = 'translatable';
	11	+ public static $transtableFieldName = 'translatable';
12	12
13		- public $translatable;
14		- public $model;
	13	+ public $translatable;
	14	+ public $model;
15	15
16		- protected $locale;
	16	+ protected $locale;
17	17
18		- public static function bootTranslatable()
19		- {
20		- static::addGlobalScope(new TranslatableScope);
	18	+ public static function bootTranslatable()
	19	+ {
	20	+ static::addGlobalScope(new TranslatableScope);
21	21
22		- static::saving(function ($model) {
23		- $model->translatable = collect($model->attributes)->only(static::$transtableFieldName)->toArray();
24		- $model->attributes = collect($model->attributes)->except(static::$transtableFieldName)->toArray();
25		- });
	22	+ static::saving(function ($model) {
	23	+ $model->translatable = collect($model->attributes)->only(static::$transtableFieldName)->toArray();
	24	+ $model->attributes = collect($model->attributes)->except(static::$transtableFieldName)->toArray();
	25	+ });
26	26
27		- static::saved(function ($model) {
28		- if ($model->translatable) {
29		- (new self)->saveTranslation($model);
30		- }
31		- });
	27	+ static::saved(function ($model) {
	28	+ if ($model->translatable) {
	29	+ (new self)->saveTranslation($model);
	30	+ }
	31	+ });
32	32
33		- static::deleted(function ($model) {
34		- if ((new $model)->has('translations')) {
35		- $model->translations()->delete();
36		- }
37		- });
38		- }
	33	+ static::deleted(function ($model) {
	34	+ if ((new $model)->has('translations')) {
	35	+ $model->translations()->delete();
	36	+ }
	37	+ });
	38	+ }
39	39
40		- public function locale($value = null)
41		- {
42		- $this->locale = $value;
	40	+ public function locale($value = null)
	41	+ {
	42	+ $this->locale = $value;
43	43
44		- return $this;
45		- }
	44	+ return $this;
	45	+ }
46	46
47		- // Relationship
48		- public function translations()
49		- {
50		- return $this->morphMany(Translation::class, 'translatable');
51		- }
	47	+ // Relationship
	48	+ public function translations()
	49	+ {
	50	+ return $this->morphMany(Translation::class, 'translatable');
	51	+ }
52	52
53		- // scope
54		- public function scopeTranslated($query, ...$fields)
55		- {
56		- $this->locale = $this->locale ?? app()->getLocale();
	53	+ // scope
	54	+ public function scopeTranslated($query, ...$fields)
	55	+ {
	56	+ $this->locale = $this->locale ?? app()->getLocale();
57	57
58		- $fields = empty($fields) ? $this->getTranslatedFieldsForCurrentModel() : collect($fields);
	58	+ $fields = empty($fields) ? $this->getTranslatedFieldsForCurrentModel() : collect($fields);
59	59
60		- if ($fields->isEmpty()) {
61		- return $query;
62		- }
	60	+ if ($fields->isEmpty()) {
	61	+ return $query;
	62	+ }
63	63
64		- // Add select * if nothing has been selected yet
65		- if ($query->getQuery()->columns === null) {
66		- $query->select('*');
67		- }
	64	+ // Add select * if nothing has been selected yet
	65	+ if ($query->getQuery()->columns === null) {
	66	+ $query->select('*');
	67	+ }
68	68
69		- // Build the sub select
70		- $fields->each(function ($key) use ($query) {
71		- $this->subSelectTranslation($query, $key);
72		- });
	69	+ // Build the sub select
	70	+ $fields->each(function ($key) use ($query) {
	71	+ $this->subSelectTranslation($query, $key);
	72	+ });
73	73
74		- return $query;
75		- }
	74	+ return $query;
	75	+ }
76	76
77		- protected function subSelectTranslation($query, $key): void
78		- {
79		- $query->addSelect([
80		- $key => function ($query) use ($key) {
81		- $query->select(Translation::getTableName() . '.value')
82		- ->from(Translation::getTableName())
83		- ->where(Translation::getTableName() . '.translatable_type', '=', \get_class($this))
84		- ->where(Translation::getTableName() . '.locale', '=', $this->locale)
85		- ->where(Translation::getTableName() . '.key', '=', $key)
86		- ->where(Translation::getTableName() . '.translatable_id', '=', \DB::raw($this->getTable() . '.' . $this->primaryKey));
87		- }
88		- ]);
	77	+ protected function subSelectTranslation($query, $key): void
	78	+ {
	79	+ $query->addSelect([
	80	+ $key => function ($query) use ($key) {
	81	+ $query->select(Translation::getTableName() . '.value')
	82	+ ->from(Translation::getTableName())
	83	+ ->where(Translation::getTableName() . '.translatable_type', '=', \get_class($this))
	84	+ ->where(Translation::getTableName() . '.locale', '=', $this->locale)
	85	+ ->where(Translation::getTableName() . '.key', '=', $key)
	86	+ ->where(Translation::getTableName() . '.translatable_id', '=', \DB::raw($this->getTable() . '.' . $this->primaryKey));
	87	+ }
	88	+ ]);
89	89
90	90	// $query->addSelect(\DB::raw('(
91	91	// SELECT `' . Translation::getTableName() . '`.`value`
		@@ -96,53 +96,53 @@ discard block
		block discarded – undo
96	96	// AND `' . Translation::getTableName() . '`.`translatable_id` = `' . $this->getTable() . '`.`' . $this->primaryKey . '`
97	97	// ) as `' . $key . '`')
98	98	// );
99		- }
	99	+ }
100	100
101		- /**
102		- * Query the translations table for possible keys if none are provided.
103		- * @return Collection
104		- */
105		- public function getTranslatedFieldsForCurrentModel(): Collection
106		- {
107		- $table = Translation::getTableName();
	101	+ /**
	102	+ * Query the translations table for possible keys if none are provided.
	103	+ * @return Collection
	104	+ */
	105	+ public function getTranslatedFieldsForCurrentModel(): Collection
	106	+ {
	107	+ $table = Translation::getTableName();
108	108
109		- return DB::table($table)->select($table . '.key')
110		- ->where($table . '.translatable_type', \get_class($this))
111		- ->where($table . '.locale', $this->locale)
112		- ->groupBy($table . '.key')
113		- ->pluck('key');
114		- }
	109	+ return DB::table($table)->select($table . '.key')
	110	+ ->where($table . '.translatable_type', \get_class($this))
	111	+ ->where($table . '.locale', $this->locale)
	112	+ ->groupBy($table . '.key')
	113	+ ->pluck('key');
	114	+ }
115	115
116		- public function saveTranslation($model): int
117		- {
118		- return (new Translation)->store([
119		- 'translatable' => $model->translatable[static::$transtableFieldName],
120		- 'translatable_type' => \get_class($model),
121		- 'translatable_id' => $model->id,
122		- ]);
123		- }
	116	+ public function saveTranslation($model): int
	117	+ {
	118	+ return (new Translation)->store([
	119	+ 'translatable' => $model->translatable[static::$transtableFieldName],
	120	+ 'translatable_type' => \get_class($model),
	121	+ 'translatable_id' => $model->id,
	122	+ ]);
	123	+ }
124	124
125		- protected function fullTextWildcards($term)
126		- {
127		- return collect(explode(' ', str_replace(['-', '+', '<', '>', '@', '(', ')', '~'], '', $term)))->map(function ($word, $key) {
128		- return strlen(trim($word)) >= 3 ? '+' . trim($word) . '*' : '';
129		- })->implode(' ');
130		- }
	125	+ protected function fullTextWildcards($term)
	126	+ {
	127	+ return collect(explode(' ', str_replace(['-', '+', '<', '>', '@', '(', ')', '~'], '', $term)))->map(function ($word, $key) {
	128	+ return strlen(trim($word)) >= 3 ? '+' . trim($word) . '*' : '';
	129	+ })->implode(' ');
	130	+ }
131	131
132		- public function scopeSearchFullText($query, $term)
133		- {
134		- $term = $this->fullTextWildcards($term);
	132	+ public function scopeSearchFullText($query, $term)
	133	+ {
	134	+ $term = $this->fullTextWildcards($term);
135	135
136		- $matches = Translation::selectRaw('translatable_id, MATCH(`value`) AGAINST (\'' . $term . '\' IN BOOLEAN MODE) as relevance')
137		- ->whereRaw(\DB::raw('MATCH (`value`) AGAINST (\'' . $term . '\' IN BOOLEAN MODE)'))
138		- ->where('translations.translatable_type', '=', \get_class($this))
139		- ->having('relevance', '>', 0)
140		- ->orderBy('relevance')
141		- // force to search only in the current language
142		- //->where('translations.locale', app()->getLocale());
143		- ->pluck('translatable_id')
144		- ->toArray();
	136	+ $matches = Translation::selectRaw('translatable_id, MATCH(`value`) AGAINST (\'' . $term . '\' IN BOOLEAN MODE) as relevance')
	137	+ ->whereRaw(\DB::raw('MATCH (`value`) AGAINST (\'' . $term . '\' IN BOOLEAN MODE)'))
	138	+ ->where('translations.translatable_type', '=', \get_class($this))
	139	+ ->having('relevance', '>', 0)
	140	+ ->orderBy('relevance')
	141	+ // force to search only in the current language
	142	+ //->where('translations.locale', app()->getLocale());
	143	+ ->pluck('translatable_id')
	144	+ ->toArray();
145	145
146		- return $query->whereIn(DB::raw($this->getTable() . '.' . $this->primaryKey), $matches);
147		- }
	146	+ return $query->whereIn(DB::raw($this->getTable() . '.' . $this->primaryKey), $matches);
	147	+ }
148	148	}

		@@ -19,18 +19,18 @@ discard block
		block discarded – undo
19	19	{
20	20	static::addGlobalScope(new TranslatableScope);
21	21
22		- static::saving(function ($model) {
	22	+ static::saving(function($model) {
23	23	$model->translatable = collect($model->attributes)->only(static::$transtableFieldName)->toArray();
24	24	$model->attributes = collect($model->attributes)->except(static::$transtableFieldName)->toArray();
25	25	});
26	26
27		- static::saved(function ($model) {
	27	+ static::saved(function($model) {
28	28	if ($model->translatable) {
29	29	(new self)->saveTranslation($model);
30	30	}
31	31	});
32	32
33		- static::deleted(function ($model) {
	33	+ static::deleted(function($model) {
34	34	if ((new $model)->has('translations')) {
35	35	$model->translations()->delete();
36	36	}
		@@ -67,7 +67,7 @@ discard block
		block discarded – undo
67	67	}
68	68
69	69	// Build the sub select
70		- $fields->each(function ($key) use ($query) {
	70	+ $fields->each(function($key) use ($query) {
71	71	$this->subSelectTranslation($query, $key);
72	72	});
73	73
		@@ -77,13 +77,13 @@ discard block
		block discarded – undo
77	77	protected function subSelectTranslation($query, $key): void
78	78	{
79	79	$query->addSelect([
80		- $key => function ($query) use ($key) {
81		- $query->select(Translation::getTableName() . '.value')
	80	+ $key => function($query) use ($key) {
	81	+ $query->select(Translation::getTableName().'.value')
82	82	->from(Translation::getTableName())
83		- ->where(Translation::getTableName() . '.translatable_type', '=', \get_class($this))
84		- ->where(Translation::getTableName() . '.locale', '=', $this->locale)
85		- ->where(Translation::getTableName() . '.key', '=', $key)
86		- ->where(Translation::getTableName() . '.translatable_id', '=', \DB::raw($this->getTable() . '.' . $this->primaryKey));
	83	+ ->where(Translation::getTableName().'.translatable_type', '=', \get_class($this))
	84	+ ->where(Translation::getTableName().'.locale', '=', $this->locale)
	85	+ ->where(Translation::getTableName().'.key', '=', $key)
	86	+ ->where(Translation::getTableName().'.translatable_id', '=', \DB::raw($this->getTable().'.'.$this->primaryKey));
87	87	}
88	88	]);
89	89
		@@ -106,10 +106,10 @@ discard block
		block discarded – undo
106	106	{
107	107	$table = Translation::getTableName();
108	108
109		- return DB::table($table)->select($table . '.key')
110		- ->where($table . '.translatable_type', \get_class($this))
111		- ->where($table . '.locale', $this->locale)
112		- ->groupBy($table . '.key')
	109	+ return DB::table($table)->select($table.'.key')
	110	+ ->where($table.'.translatable_type', \get_class($this))
	111	+ ->where($table.'.locale', $this->locale)
	112	+ ->groupBy($table.'.key')
113	113	->pluck('key');
114	114	}
115	115
		@@ -124,8 +124,8 @@ discard block
		block discarded – undo
124	124
125	125	protected function fullTextWildcards($term)
126	126	{
127		- return collect(explode(' ', str_replace(['-', '+', '<', '>', '@', '(', ')', '~'], '', $term)))->map(function ($word, $key) {
128		- return strlen(trim($word)) >= 3 ? '+' . trim($word) . '*' : '';
	127	+ return collect(explode(' ', str_replace(['-', '+', '<', '>', '@', '(', ')', '~'], '', $term)))->map(function($word, $key) {
	128	+ return strlen(trim($word)) >= 3 ? '+'.trim($word).'*' : '';
129	129	})->implode(' ');
130	130	}
131	131
		@@ -133,8 +133,8 @@ discard block
		block discarded – undo
133	133	{
134	134	$term = $this->fullTextWildcards($term);
135	135
136		- $matches = Translation::selectRaw('translatable_id, MATCH(`value`) AGAINST (\'' . $term . '\' IN BOOLEAN MODE) as relevance')
137		- ->whereRaw(\DB::raw('MATCH (`value`) AGAINST (\'' . $term . '\' IN BOOLEAN MODE)'))
	136	+ $matches = Translation::selectRaw('translatable_id, MATCH(`value`) AGAINST (\''.$term.'\' IN BOOLEAN MODE) as relevance')
	137	+ ->whereRaw(\DB::raw('MATCH (`value`) AGAINST (\''.$term.'\' IN BOOLEAN MODE)'))
138	138	->where('translations.translatable_type', '=', \get_class($this))
139	139	->having('relevance', '>', 0)
140	140	->orderBy('relevance')
		@@ -143,6 +143,6 @@ discard block
		block discarded – undo
143	143	->pluck('translatable_id')
144	144	->toArray();
145	145
146		- return $query->whereIn(DB::raw($this->getTable() . '.' . $this->primaryKey), $matches);
	146	+ return $query->whereIn(DB::raw($this->getTable().'.'.$this->primaryKey), $matches);
147	147	}
148	148	}

		@@ -13,7 +13,7 @@
		block discarded – undo
13	13	*/
14	14	public function up()
15	15	{
16		- Schema::create('translations', function (Blueprint $table) {
	16	+ Schema::create('translations', function(Blueprint $table) {
17	17	$table->string('key');
18	18	$table->text('value');
19	19	$table->bigInteger('translatable_id')->unsigned();

		@@ -22,8 +22,8 @@ discard block
		block discarded – undo
22	22	{
23	23	$this->deleteTranslation($attributes['translatable_type'], $attributes['translatable_id']);
24	24
25		- collect($attributes['translatable'])->each(function ($data, $locale) use ($attributes) {
26		- collect($data)->each(function ($value, $key) use ($attributes, $locale) {
	25	+ collect($attributes['translatable'])->each(function($data, $locale) use ($attributes) {
	26	+ collect($data)->each(function($value, $key) use ($attributes, $locale) {
27	27	self::insert([
28	28	'key' => $key,
29	29	'value' => $value ?? '',
		@@ -58,11 +58,11 @@ discard block
		block discarded – undo
58	58	public function scopeOrderTranslationByKey($query, $key = 'name', $order = 'asc')
59	59	{
60	60	return $query->select(\DB::raw('
61		- IF(translations.`key` = "' . $key . '", translations.value, "") as ' . $key . '
	61	+ IF(translations.`key` = "' . $key.'", translations.value, "") as '.$key.'
62	62	'))->where(
63	63	'translations.locale', '=', app()->getLocale()
64	64	)->orderBy(
65		- \DB::raw($key . ' ' . $order)
	65	+ \DB::raw($key.' '.$order)
66	66	)->groupBy('translations.translatable_id');
67	67	}
68	68

mikehins / laravel-translatable

Push — master ( 369b73...d07341 )

Status

Category

Spacing +4 added lines, -4 removed lines patch added patch discarded remove patch

Indentation +104 added lines, -104 removed lines patch added patch discarded remove patch

Spacing +19 added lines, -19 removed lines patch added patch discarded remove patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

Spacing +4 added lines, -4 removed lines patch added patch discarded remove patch