mikehins / laravel-translatable

src/Translatable.php

Indentation +76 added lines, -76 removed lines

@@ -7,75 +7,75 @@ 
 
 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(\DB::raw('(
+    protected function subSelectTranslation($query, $key): void
+    {
+        $query->addSelect(\DB::raw('(
 			SELECT      `' . Translation::getTableName() . '`.`value`
 			  FROM      `' . Translation::getTableName() . '`
 			 WHERE      `' . Translation::getTableName() . '`.`translatable_type` = "' . \get_class($this) . '"
@@ -83,30 +83,30 @@ 
 			   AND      `' . Translation::getTableName() . '`.`key` = "' . $key . '"
 			   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,
+        ]);
+    }
 }

Spacing +15 added lines, -15 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);
 		});
 		
@@ -76,13 +76,13 @@ 
 	protected function subSelectTranslation($query, $key): void
 	{
 		$query->addSelect(\DB::raw('(
-			SELECT      `' . Translation::getTableName() . '`.`value`
-			  FROM      `' . Translation::getTableName() . '`
-			 WHERE      `' . Translation::getTableName() . '`.`translatable_type` = "' . \get_class($this) . '"
-			   AND      `' . Translation::getTableName() . '`.`locale` = "' . $this->locale . '"
-			   AND      `' . Translation::getTableName() . '`.`key` = "' . $key . '"
-			   AND      `' . Translation::getTableName() . '`.`translatable_id` = `' . $this->getTable() . '`.`' . $this->primaryKey . '`
-			) as `' . $key . '`')
+			SELECT      `' . Translation::getTableName().'`.`value`
+			  FROM      `' . Translation::getTableName().'`
+			 WHERE      `' . Translation::getTableName().'`.`translatable_type` = "'.\get_class($this).'"
+			   AND      `' . Translation::getTableName().'`.`locale` = "'.$this->locale.'"
+			   AND      `' . Translation::getTableName().'`.`key` = "'.$key.'"
+			   AND      `' . Translation::getTableName().'`.`translatable_id` = `'.$this->getTable().'`.`'.$this->primaryKey.'`
+			) as `' . $key.'`')
 		);
 	}
 	
@@ -94,10 +94,10 @@ 
 	{
 		$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');
 	}
 	

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
 }