Merge pull request #2 from DarkGhostHunter/master

Minor optimizations and comments.

README.md

@@ -480,7 +480,7 @@ LARACONFIG_STORE=redis
 
 #### Managing the cache
 
-You can forcefully regenerate the cache of a single user using `regenerate()`. This basically retrieves all the settings from the database (for the bags used) and saves them into the cache.
+You can forcefully regenerate the cache of a single user using `regenerate()`. This basically saves the settings present  and saves them into the cache.
 
 ```php
 $user->settings->regenerate();
@@ -492,7 +492,7 @@ You can also invalidate the cached settings using `invalidate()`, which just del
 $user->settings->invalidate();
 ```
 
-Finally, you can have a little peace of mind by setting `regeneratesOnExit` to `true`, which will regenerate the cache when the settings are garbage collected by the PHP process
+Finally, you can have a little peace of mind by setting `regeneratesOnExit` to `true`, which will regenerate the cache when the settings are garbage collected by the PHP process.
 
 ```php
 $user->settings->regeneratesOnExit = true;
@@ -502,7 +502,7 @@ $user->settings->regeneratesOnExit = true;
 
 #### Regenerating the Cache on migration
 
-If the [Cache is activated](#cache), the migration will not invalidate the setting cache of all users after it completes.
+If the [Cache is activated](#cache), the migration will invalidate the setting cache for each user after it completes.
 
 Depending on the Cache system, forgetting each cache key can be detrimental. Instead, you can use the `--flush-cache` command to flush the cache store used by Laraconfig, instead of deleting each key one by one.
 
@@ -512,7 +512,7 @@ Depending on the Cache system, forgetting each cache key can be detrimental. Ins
 
 ## Validation
 
-Settings values are casted, but not validated. You should validate in your app every value that you plan to store in a setting.
+Settings values are _casted_, but not validated. You should validate in your app every value that you plan to store in a setting.
 
 ```php
 use App\Models\User;

src/MorphManySettings.php

@@ -4,13 +4,11 @@
 
 use DarkGhostHunter\Laraconfig\Eloquent\Metadata;
 use Illuminate\Contracts\Cache\Factory;
-use Illuminate\Contracts\Config\Repository;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Collection as EloquentCollection;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\MorphMany;
 use Illuminate\Support\Arr;
-use Illuminate\Support\Collection;
 
 /**
  * @mixin \Illuminate\Database\Eloquent\Builder
@@ -34,26 +32,20 @@ class MorphManySettings extends MorphMany
      */
     protected ?SettingsCache $cache = null;
 
-    public function __construct(Builder $query, Model $parent, $type, $id, $localKey)
-    {
-        $this->windUp($parent);
-
-        parent::__construct($query, $parent, $type, $id, $localKey);
-    }
-
     /**
-     * Set the base constraints on the relation query.
+     * MorphManySettings constructor.
      *
-     * @return void
+     * @param  \Illuminate\Database\Eloquent\Builder  $query
+     * @param  \Illuminate\Database\Eloquent\Model  $parent
+     * @param  string  $type
+     * @param  string  $id
+     * @param  string  $localKey
      */
-    public function addConstraints(): void
+    public function __construct(Builder $query, Model $parent, string $type, string $id, string $localKey)
     {
-        parent::addConstraints();
+        $this->windUp($parent);
 
-        // Filter the bags of the model for this relationship.
-        $this->getQuery()->whereHas('metadata', function (Builder $query): void {
-            $query->whereIn('bag', $this->bags);
-        });
+        parent::__construct($query, $parent, $type, $id, $localKey);
     }
 
     /**
@@ -65,8 +57,7 @@ public function addConstraints(): void
      */
     public function windUp(Model $parent): void
     {
-        /** @var \Illuminate\Contracts\Config\Repository $config */
-        $config = app(Repository::class);
+        $config = app('config');
 
         // We'll enable the cache for the settings only if is enabled in the
         // application config. This object will handle the cache easily and
@@ -75,11 +66,27 @@ public function windUp(Model $parent): void
             $this->cache = SettingsCache::make($config, app(Factory::class), $parent);
         }
 
+        // And filter the bags if the model has stated them.
         $this->bags = Arr::wrap(
             method_exists($parent, 'filterBags') ? $parent->filterBags() : $config->get('laraconfig.default', 'users')
         );
     }
 
+    /**
+     * Set the base constraints on the relation query.
+     *
+     * @return void
+     */
+    public function addConstraints(): void
+    {
+        parent::addConstraints();
+
+        // Filter the bags of the model for this relationship.
+        $this->getQuery()->whereHas('metadata', function (Builder $query): void {
+            $query->whereIn('bag', $this->bags);
+        });
+    }
+
 
     /**
      * Generates the key for the model to save into the cache.
@@ -193,4 +200,4 @@ public function bags(): array
     {
         return $this->bags;
     }
-}
+}