Implement getCollectionClass

Author: valzargaming

src/MTG/Parts/Card.php

@@ -20,12 +20,10 @@
 use Discord\Builders\Components\Section;
 use Discord\Builders\Components\Separator;
 use Discord\Builders\Components\TextDisplay;
-use Discord\Helpers\Collection;
 use Discord\Helpers\ExCollectionInterface;
 use Discord\Parts\Embed\Embed;
 use Discord\Parts\Interactions\Interaction;
 use Discord\Parts\Part;
-use MTG\HelperTrait;
 use MTG\MTG;
 use React\Promise\PromiseInterface;
 
@@ -127,7 +125,7 @@ public function getReleaseDateAttribute(): ?Carbon
      */
     public function getRulingsAttribute(): ExCollectionInterface
     {
-        $collection = Collection::for(Ruling::class);
+        $collection = ($this->discord->getCollectionClass())::for(Ruling::class);
 
         if (! isset($this->attributes['rulings']) || ! is_array($this->attributes['rulings'])) {
             return $collection;
@@ -149,7 +147,7 @@ public function getRulingsAttribute(): ExCollectionInterface
      */
     public function getForeignNamesAttribute(): ExCollectionInterface
     {
-        $collection = Collection::for(ForeignName::class);
+        $collection = ($this->discord->getCollectionClass())::for(ForeignName::class);
 
         if (! isset($this->attributes['foreignNames']) || ! is_array($this->attributes['foreignNames'])) {
             return $collection;
@@ -171,7 +169,7 @@ public function getForeignNamesAttribute(): ExCollectionInterface
      */
     public function getLegalitiesAttribute(): ExCollectionInterface
     {
-        $collection = Collection::for(Legality::class);
+        $collection = ($this->discord->getCollectionClass())::for(Legality::class);
 
         if (! isset($this->attributes['legalities']) || ! is_array($this->attributes['legalities'])) {
             return $collection;
@@ -243,7 +241,7 @@ public function getImageEmbedAttribute(): ?Embed
      */
     public function normalLayoutContainer(?Interaction $interaction): Container
     {
-        /** @var HelperTrait $mtg */
+        /** @var MTG $mtg */
         $mtg = $this->discord;
 
         $ci_emoji = (($this->colorIdentity) ? implode('', array_map(fn ($c) => $this->discord->emojis->get('name', 'CI_'.$c.'_'), $this->colorIdentity)) : '');

src/MTG/Repository/AbstractRepository.php

@@ -36,12 +36,12 @@ abstract class AbstractRepository extends DiscordAbstractRepository
     /**
      * AbstractRepository constructor.
      *
-     * @param MTG   $mtg
-     * @param array $vars An array of variables used for the endpoint.
+     * @param MTG|Discord $discord
+     * @param array       $vars    An array of variables used for the endpoint.
      */
-    public function __construct(protected $mtg, array $vars = [])
+    public function __construct(protected $discord, array $vars = [])
     {
-        parent::__construct($mtg, $vars);
-        $this->mtg_http = $mtg->getMtgHttpClient();
+        parent::__construct($discord, $vars);
+        $this->mtg_http = $discord->getMtgHttpClient();
     }
 }

src/MTG/Repository/AbstractRepositoryTrait.php

@@ -13,12 +13,14 @@
 
 namespace MTG\Repository;
 
+use Discord\Discord;
 use Discord\Helpers\CollectionTrait;
 use Discord\Helpers\ExCollectionInterface;
 use Discord\Http\Http;
 use Discord\Parts\Part;
 use MTG\Http\Endpoint;
 use MTG\Http\Http as MTGHttp;
+use MTG\MTG;
 use React\Promise\PromiseInterface;
 
 use function Discord\nowait;
@@ -28,11 +30,11 @@
 /**
  * Provides common functionality for all repositories.
  *
- * @property Discord      $discord   The Discord client instance.
+ * @property MTG|Discord  $discord   The Discord client instance.
  * @property string       $discrim   The collection discriminator.
  * @property array        $items     The items contained in the collection.
  * @property string       $class     Class type allowed into the collection.
- * @property Http         $http  The HTTP client.
+ * @property Http         $http      The HTTP client.
  * @property MTGHttp      $mtg_http  The extended HTTP client.
  * @property Factory      $factory   The parts factory.
  * @property array        $endpoints Endpoints for interacting with the Discord servers.
@@ -557,7 +559,7 @@ public function has(...$keys): bool
     public function filter(callable $callback)
     {
         /** @var ExCollectionInterface $collection */
-        $collection = new $this->discord->getCollectionClass()([], $this->discrim, $this->class);
+        $collection = new ($this->discord->getCollectionClass())([], $this->discrim, $this->class);
 
         foreach ($this->items as $offset => $item) {
             if ($item instanceof \WeakReference) {

src/MTG/Repository/CardRepository.php

@@ -13,7 +13,6 @@
 
 namespace MTG\Repository;
 
-use Discord\Helpers\Collection;
 use Discord\Helpers\ExCollectionInterface;
 use Discord\Http\Endpoint;
 use MTG\Http\Endpoint as HttpEndpoint;
@@ -133,7 +132,7 @@ public function getCards(Card|array $params = []): PromiseInterface
         return $this->mtg_http->get($endpoint)->then(function ($response) {
             $response = $response->cards;
 
-            $collection = Collection::for($this->class);
+            $collection = ($this->discord->getCollectionClass())::for($this->class);
 
             foreach ($response as $cardData) {
                 $card = $this->factory->create($this->class, array_merge($this->vars, (array) $cardData), true);

src/MTG/Repository/SetRepository.php

@@ -13,7 +13,6 @@
 
 namespace MTG\Repository;
 
-use Discord\Helpers\Collection;
 use Discord\Helpers\ExCollectionInterface;
 use Discord\Http\Endpoint;
 use MTG\Http\Endpoint as HttpEndpoint;
@@ -110,7 +109,7 @@ public function getSets($params = []): PromiseInterface
         return $this->mtg_http->get($endpoint)->then(function ($response) {
             $response = $response->sets;
 
-            $collection = Collection::for($this->class, $this->discrim);
+            $collection = ($this->discord->getCollectionClass())::for($this->class, $this->discrim);
 
             foreach ($response as $setData) {
                 $set = $this->factory->create($this->class, array_merge($this->vars, (array) $setData), true);