Fix styling

src/Actions/SaveSettings.php

@@ -10,7 +10,7 @@ class SaveSettings implements SavesSettings
 {
  /**
  * Save the settings.
- * 
+ *
  * @param \StarfolkSoftware\Kalibrant\Settings $settings
  * @param array $data
  * @return void

src/Contracts/SavesSettings.php

@@ -8,10 +8,10 @@ interface SavesSettings
 {
  /**
  * Save the settings.
- * 
+ *
  * @param \StarfolkSoftware\Kalibrant\Settings $settings
  * @param array $data
  * @return void
  */
  public function __invoke(Settings $settings, array $data): void;
-}
+}

src/HasSettings.php

@@ -4,11 +4,11 @@
 
 use Illuminate\Contracts\Database\Eloquent\Builder;
 
-trait HasSettings 
+trait HasSettings
 {
  /**
  * Get all of the model's settings.
- * 
+ *
  * @return \Illuminate\Database\Eloquent\Relations\MorphMany
  */
  public function settings()
@@ -18,7 +18,7 @@ public function settings()
 
  /**
  * Retrieves a group of settings.
- * 
+ *
  * @param string $group
  * @return \StarfolkSoftware\Kalibrant\Settings
  */
@@ -36,7 +36,7 @@ public function settingsForGroup(string $group)
  /**
  * Scope a query to only include settings for the given setable type
  * of the model.
- * 
+ *
  * @param \Illuminate\Database\Eloquent\Builder $query
  * @param string $setableType
  * @return void

src/Http/Controllers/Controller.php

@@ -2,12 +2,14 @@
 
 namespace StarfolkSoftware\Kalibrant\Http\Controllers;
 
+use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
 use Illuminate\Foundation\Bus\DispatchesJobs;
-use Illuminate\Routing\Controller as BaseController;
 use Illuminate\Foundation\Validation\ValidatesRequests;
-use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
+use Illuminate\Routing\Controller as BaseController;
 
 class Controller extends BaseController
 {
- use AuthorizesRequests, DispatchesJobs, ValidatesRequests;
-}
+ use AuthorizesRequests;
+ use DispatchesJobs;
+ use ValidatesRequests;
+}

src/Http/Controllers/SettingsController.php

@@ -9,7 +9,7 @@ class SettingsController extends Controller
 {
  /**
  * Updates the settings.
- * 
+ *
  * @param \StarfolkSoftware\Kalibrant\Actions\SaveSettings $saveSettings
  * @param string $group
  * @param mixed $id
@@ -40,4 +40,4 @@ public function update(SaveSettings $saveSettings, string $group, $id)
 
  return Redirect::back();
  }
-}
+}

src/Setting.php

@@ -31,7 +31,7 @@ class Setting extends Model
 
  /**
  * Determines if migrations should be run.
- * 
+ *
  * @var bool
  */
  public static $shouldRunMigrations = true;
@@ -46,17 +46,17 @@ public function setable()
 
  /**
  * Get attributes in group
- * 
+ *
  * @param string $setableType
  * @param int $setableId
  * @param string $group
- * 
+ *
  * @return array
  */
  public static function attributesInGroup(string $setableType, int $setableId, string $group)
  {
- $setable = (new $setableType)::find($setableId);
- 
+ $setable = (new $setableType())::find($setableId);
+
  return $setable->settings()
  ->whereGroup($group)
  ->get(['key', 'value'])
@@ -67,7 +67,7 @@ public static function attributesInGroup(string $setableType, int $setableId, st
 
  /**
  * Ignores migrations.
- * 
+ *
  * @return void
  */
  public static function ignoreMigrations()

src/Settings.php

@@ -23,7 +23,7 @@ abstract class Settings implements JsonSerializable
 
  /**
  * The route to redirect to after update.
- * 
+ *
  * @var mixed
  */
  public $redirectRoute;
@@ -36,8 +36,8 @@ abstract class Settings implements JsonSerializable
  public function __construct()
  {
  $attributes = Setting::attributesInGroup(
- static::setableType(), 
- static::setableId(), 
+ static::setableType(),
+ static::setableId(),
  static::group()
  );
 
@@ -51,45 +51,45 @@ public function __construct()
  }
 
  $this->resolver = new OptionsResolver();
- 
+
  $this->configureAttributes($this->resolver);
 
  $this->attributes = $this->resolver->resolve($this->attributes);
  }
 
  /**
  * Configures the settings attributes
- * 
+ *
  * @param OptionsResolver $resolver
- * 
+ *
  * @return void
  */
  abstract public function configureAttributes(OptionsResolver $resolver);
 
  /**
  * Returns the setable type
- * 
+ *
  * @return string
  */
  abstract public static function setableType();
 
  /**
  * Returns the setable id
- * 
+ *
  * @return int
  */
  abstract public function setableId();
 
  /**
  * Returns the settings group
- * 
+ *
  * @return string
  */
  abstract public static function group();
 
  /**
  * Validation rules.
- * 
+ *
  * @return array
  */
  public function rules(): array
@@ -99,7 +99,7 @@ public function rules(): array
 
  /**
  * Returns resolver.
- * 
+ *
  * @return \Symfony\Component\OptionsResolver\OptionsResolver
  */
  public function getResolver(): OptionsResolver
@@ -237,23 +237,23 @@ public function __unset($key)
  */
  public static function __callStatic($method, $parameters)
  {
- $instance = new static;
+ $instance = new static();
 
  return call_user_func_array([$instance, $method], $parameters);
  }
 
  /**
  * Updates settings
- * 
+ *
  * @return void
  */
  public function save()
  {
  collect($this->attributes)->each(function ($attribute, $key) {
  Setting::updateOrCreate(
  [
- 'setable_type' => static::setableType(), 
- 'setable_id' => static::setableId(), 
+ 'setable_type' => static::setableType(),
+ 'setable_id' => static::setableId(),
  'group' => static::group(),
  'key' => $key,
  ],
@@ -264,7 +264,7 @@ public function save()
 
  /**
  * To array.
- * 
+ *
  * @return array
  */
  public function toArray()

tests/Mocks/TestSettings.php

@@ -9,7 +9,7 @@ class TestSettings extends Settings
 {
  /**
  * The route to redirect to after update.
- * 
+ *
  * @var mixed
  */
  public $redirectRoute = null;
@@ -22,16 +22,15 @@ class TestSettings extends Settings
  */
  public function __construct(
  protected $id
- )
- {
+ ) {
  parent::__construct();
  }
 
  /**
  * Configure the settings attributes
- * 
+ *
  * @param OptionsResolver $resolver
- * 
+ *
  * @return void
  */
  public function configureAttributes(OptionsResolver $resolver)
@@ -50,7 +49,7 @@ public function configureAttributes(OptionsResolver $resolver)
 
  /**
  * Returns the setable type
- * 
+ *
  * @return string
  */
  public static function setableType()
@@ -60,7 +59,7 @@ public static function setableType()
 
  /**
  * Returns the setable id
- * 
+ *
  * @return int
  */
  public function setableId()
@@ -70,11 +69,11 @@ public function setableId()
 
  /**
  * Return the settings group
- * 
+ *
  * @return string
  */
  public static function group()
  {
  return 'test-settings';
  }
-}
+}

tests/Mocks/TestSettingsWithRedirect.php

@@ -9,7 +9,7 @@ class TestSettingsWithRedirect extends Settings
 {
  /**
  * The route to redirect to after update.
- * 
+ *
  * @var mixed
  */
  public $redirectRoute = 'settings.show';
@@ -22,16 +22,15 @@ class TestSettingsWithRedirect extends Settings
  */
  public function __construct(
  protected $id
- )
- {
+ ) {
  parent::__construct();
  }
 
  /**
  * Configure the settings attributes
- * 
+ *
  * @param OptionsResolver $resolver
- * 
+ *
  * @return void
  */
  public function configureAttributes(OptionsResolver $resolver)
@@ -50,7 +49,7 @@ public function configureAttributes(OptionsResolver $resolver)
 
  /**
  * Returns the setable type
- * 
+ *
  * @return string
  */
  public static function setableType()
@@ -60,7 +59,7 @@ public static function setableType()
 
  /**
  * Returns the setable id
- * 
+ *
  * @return int
  */
  public function setableId()
@@ -70,11 +69,11 @@ public function setableId()
 
  /**
  * Return the settings group
- * 
+ *
  * @return string
  */
  public static function group()
  {
  return 'test-settings-with-redirect';
  }
-}
+}

tests/Mocks/TestUser.php

@@ -10,4 +10,4 @@ class TestUser extends User
  use HasSettings;
 
  protected $table = 'users';
-}
+}

tests/SettingsTest.php

@@ -1,6 +1,5 @@
 <?php
 
-use StarfolkSoftware\Kalibrant\Tests\Mocks\TestSettings;
 use StarfolkSoftware\Kalibrant\Tests\Mocks\TestUser;
 
 it('can retrieve a model\'s settings', function () {

tests/TestCase.php

@@ -53,7 +53,7 @@ protected function createUser()
  TestUser::forceCreate([
  'name' => 'Faruk Nasir',
  'email' => '[email protected]',
- 'password' => 'test'
+ 'password' => 'test',
  ]);
  }
 }