Completed
Push — master ( fd7b57...3c4f1b )
by Mike
03:52 queued 12s
created
src/database/migrations/2018_02_25_003452_create_translations_table.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -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();
Please login to merge, or discard this patch.
Indentation   +28 added lines, -28 removed lines patch added patch discarded remove patch
@@ -6,34 +6,34 @@
 block discarded – undo
6 6
 
7 7
 class CreateTranslationsTable extends Migration
8 8
 {
9
-	/**
10
-	 * Run the migrations.
11
-	 *
12
-	 * @return void
13
-	 */
14
-	public function up()
15
-	{
16
-		Schema::create('translations', function (Blueprint $table) {
17
-			$table->string('key');
18
-			$table->text('value');
19
-			$table->bigInteger('translatable_id')->unsigned();
20
-			$table->string('translatable_type');
21
-			$table->string('locale');
22
-		});
9
+    /**
10
+     * Run the migrations.
11
+     *
12
+     * @return void
13
+     */
14
+    public function up()
15
+    {
16
+        Schema::create('translations', function (Blueprint $table) {
17
+            $table->string('key');
18
+            $table->text('value');
19
+            $table->bigInteger('translatable_id')->unsigned();
20
+            $table->string('translatable_type');
21
+            $table->string('locale');
22
+        });
23 23
 		
24
-		// sqlite does not like this...
25
-		if (app()->environment() !== 'testing') {
26
-			\DB::statement('ALTER TABLE `translations` ADD FULLTEXT fulltext_index (`key`)');
27
-		}
28
-	}
24
+        // sqlite does not like this...
25
+        if (app()->environment() !== 'testing') {
26
+            \DB::statement('ALTER TABLE `translations` ADD FULLTEXT fulltext_index (`key`)');
27
+        }
28
+    }
29 29
 	
30
-	/**
31
-	 * Reverse the migrations.
32
-	 *
33
-	 * @return void
34
-	 */
35
-	public function down()
36
-	{
37
-		Schema::dropIfExists('translations');
38
-	}
30
+    /**
31
+     * Reverse the migrations.
32
+     *
33
+     * @return void
34
+     */
35
+    public function down()
36
+    {
37
+        Schema::dropIfExists('translations');
38
+    }
39 39
 }
40 40
\ No newline at end of file
Please login to merge, or discard this patch.
src/Translation.php 2 patches
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -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
     
Please login to merge, or discard this patch.
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -77,5 +77,5 @@
 block discarded – undo
77 77
     }
78 78
     
79 79
     // https://arianacosta.com/php/laravel/tutorial-full-text-search-laravel-5/
80
-	// full text search
80
+    // full text search
81 81
 }
Please login to merge, or discard this patch.
src/Translatable.php 1 patch
Spacing   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -18,18 +18,18 @@  discard block
 block discarded – undo
18 18
     {
19 19
         static::addGlobalScope(new TranslatableScope);
20 20
         
21
-        static::saving(function ($model) {
21
+        static::saving(function($model) {
22 22
             $model->translatable = collect($model->attributes)->only(static::$transtableFieldName)->toArray();
23 23
             $model->attributes = collect($model->attributes)->except(static::$transtableFieldName)->toArray();
24 24
         });
25 25
         
26
-        static::saved(function ($model) {
26
+        static::saved(function($model) {
27 27
             if ($model->translatable) {
28 28
                 (new self)->saveTranslation($model);
29 29
             }
30 30
         });
31 31
         
32
-        static::deleted(function ($model) {
32
+        static::deleted(function($model) {
33 33
             if ((new $model)->has('translations')) {
34 34
                 $model->translations()->delete();
35 35
             }
@@ -66,7 +66,7 @@  discard block
 block discarded – undo
66 66
         }
67 67
         
68 68
         // Build the sub select
69
-        $fields->each(function ($key) use ($query) {
69
+        $fields->each(function($key) use ($query) {
70 70
             $this->subSelectTranslation($query, $key);
71 71
         });
72 72
         
@@ -76,13 +76,13 @@  discard block
 block discarded – undo
76 76
     protected function subSelectTranslation($query, $key): void
77 77
     {
78 78
         $query->addSelect(\DB::raw('(
79
-			SELECT      `' . Translation::getTableName() . '`.`value`
80
-			  FROM      `' . Translation::getTableName() . '`
81
-			 WHERE      `' . Translation::getTableName() . '`.`translatable_type` = "' . \get_class($this) . '"
82
-			   AND      `' . Translation::getTableName() . '`.`locale` = "' . $this->locale . '"
83
-			   AND      `' . Translation::getTableName() . '`.`key` = "' . $key . '"
84
-			   AND      `' . Translation::getTableName() . '`.`translatable_id` = `' . $this->getTable() . '`.`' . $this->primaryKey . '`
85
-			) as `' . $key . '`')
79
+			SELECT      `' . Translation::getTableName().'`.`value`
80
+			  FROM      `' . Translation::getTableName().'`
81
+			 WHERE      `' . Translation::getTableName().'`.`translatable_type` = "'.\get_class($this).'"
82
+			   AND      `' . Translation::getTableName().'`.`locale` = "'.$this->locale.'"
83
+			   AND      `' . Translation::getTableName().'`.`key` = "'.$key.'"
84
+			   AND      `' . Translation::getTableName().'`.`translatable_id` = `'.$this->getTable().'`.`'.$this->primaryKey.'`
85
+			) as `' . $key.'`')
86 86
         );
87 87
     }
88 88
     
@@ -94,10 +94,10 @@  discard block
 block discarded – undo
94 94
     {
95 95
         $table = Translation::getTableName();
96 96
         
97
-        return DB::table($table)->select($table . '.key')
98
-            ->where($table . '.translatable_type', \get_class($this))
99
-            ->where($table . '.locale', $this->locale)
100
-            ->groupBy($table . '.key')
97
+        return DB::table($table)->select($table.'.key')
98
+            ->where($table.'.translatable_type', \get_class($this))
99
+            ->where($table.'.locale', $this->locale)
100
+            ->groupBy($table.'.key')
101 101
             ->pluck('key');
102 102
     }
103 103
     
Please login to merge, or discard this patch.
src/TranslatableServiceProvider.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove 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
     }
Please login to merge, or discard this patch.