mikehins / laravel-translatable

src/Translation.php

Spacing +2 added lines, -2 removed lines

@@ -21,8 +21,8 @@
     {
         $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 ?? '',

src/Translatable.php

Spacing +4 added lines, -4 removed lines

@@ -18,18 +18,18 @@ 
     {
         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();
             }
@@ -66,7 +66,7 @@ 
         }
 
         // Build the sub select
-        $fields->each(function ($key) use ($query) {
+        $fields->each(function($key) use ($query) {
             $this->subSelectTranslation($query, $key);
         });
 

src/database/migrations/2018_02_25_003452_create_translations_table.php

Spacing +1 added lines, -1 removed lines

@@ -13,7 +13,7 @@
      */
     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();

src/TranslatableServiceProvider.php

Indentation +16 added lines, -16 removed lines

@@ -35,25 +35,25 @@
     {
     }
 =======
-	public function boot()
-	{
-		$this->loadMigrationsFrom(__DIR__ . '/database/migrations/');
+    public function boot()
+    {
+        $this->loadMigrationsFrom(__DIR__ . '/database/migrations/');
 		
-		$this->publishes([
-			__DIR__ . '/database/migrations/' => database_path('migrations')
-		], 'migrations');
+        $this->publishes([
+            __DIR__ . '/database/migrations/' => database_path('migrations')
+        ], 'migrations');
 		
-		$this->publishes([
-			__DIR__ . '/config/languages.php' => config_path('languages.php'),
-		], 'config');
+        $this->publishes([
+            __DIR__ . '/config/languages.php' => config_path('languages.php'),
+        ], 'config');
 		
-		Collection::macro('for', function ($field, $code) {
-			return $this->where('key', $field)->where('locale', $code)->pluck('value')->first() ?? $field;
-		});
-	}
+        Collection::macro('for', function ($field, $code) {
+            return $this->where('key', $field)->where('locale', $code)->pluck('value')->first() ?? $field;
+        });
+    }
 	
-	public function register()
-	{
-	}
+    public function register()
+    {
+    }
 >>>>>>> Stashed changes
 }

Spacing +8 added lines, -8 removed lines

@@ -13,7 +13,7 @@ 
 
 class TranslatableServiceProvider extends ServiceProvider
 {
-<<<<<<< Updated upstream
+<< << << < Updated upstream
     public function boot()
     {
         $this->loadMigrationsFrom(__DIR__.'/database/migrations/');
@@ -26,7 +26,7 @@ 
             __DIR__.'/config/languages.php' => config_path('languages.php'),
         ]);
 
-        Collection::macro('for', function ($field, $code) {
+        Collection::macro('for', function($field, $code) {
             return $this->where('key', $field)->where('locale', $code)->pluck('value')->first() ?? $field;
         });
     }
@@ -34,20 +34,20 @@ 
     public function register()
     {
     }
-=======
+=== === =
 	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() ?? $field;
 		});
 	}
@@ -55,5 +55,5 @@ 
 	public function register()
 	{
 	}
->>>>>>> Stashed changes
+>> >> >> > Stashed changes
 }