mikehins / laravel-translatable

src/Translatable.php

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

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
 }