Merge pull request #1 from vazaha-nl/abstracts-separation

refactored away abstract request classes; separated other abstracts
vazaha-nl · Aug 10, 2023 · 2f15806 · 2f15806
2 parents 7e109aa + 3c8aa77
commit 2f15806
Show file tree

Hide file tree

Showing 457 changed files with 1,838 additions and 1,595 deletions.
diff --git a/src/Models/Model.php → src/Abstracts/Model.php b/src/Models/Model.php → src/Abstracts/Model.php
@@ -2,13 +2,12 @@
 
 declare(strict_types=1);
 
-namespace Vazaha\Mastodon\Models;
+namespace Vazaha\Mastodon\Abstracts;
 
 use Carbon\Carbon;
 use DateTimeInterface;
 use ReflectionClass;
 use ReflectionNamedType;
-use Vazaha\Mastodon\Collections\ModelCollection;
 use Vazaha\Mastodon\Interfaces\ModelInterface;
 
 abstract class Model implements ModelInterface

diff --git a/src/Collections/ModelCollection.php → src/Abstracts/ModelCollection.php b/src/Collections/ModelCollection.php → src/Abstracts/ModelCollection.php
@@ -2,20 +2,20 @@
 
 declare(strict_types=1);
 
-namespace Vazaha\Mastodon\Collections;
+namespace Vazaha\Mastodon\Abstracts;
 
 use Illuminate\Support\Collection;
 
 /**
  * @template TKey of array-key
- * @template TModel of \Vazaha\Mastodon\Models\Model
+ * @template TModel of \Vazaha\Mastodon\Abstracts\Model
  *
  * @extends Collection<TKey, TModel>
  */
 abstract class ModelCollection extends Collection
 {
     /**
-     * @return class-string<\Vazaha\Mastodon\Models\Model>
+     * @return class-string<\Vazaha\Mastodon\Abstracts\Model>
      */
     abstract public static function getModelClass(): string;
 

diff --git a/src/Proxies/Proxy.php → src/Abstracts/Proxy.php b/src/Proxies/Proxy.php → src/Abstracts/Proxy.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Vazaha\Mastodon\Proxies;
+namespace Vazaha\Mastodon\Abstracts;
 
 use Vazaha\Mastodon\ApiClient;
 

diff --git a/src/Requests/Request.php → src/Abstracts/Request.php b/src/Requests/Request.php → src/Abstracts/Request.php
@@ -2,15 +2,14 @@
 
 declare(strict_types=1);
 
-namespace Vazaha\Mastodon\Requests;
+namespace Vazaha\Mastodon\Abstracts;
 
 use Vazaha\Mastodon\Helpers\MultipartFormData;
 use Vazaha\Mastodon\Interfaces\RequestInterface;
 use Vazaha\Mastodon\Requests\Concerns\HasPaging;
-use Vazaha\Mastodon\Results\Result;
 
 /**
- * @implements \Vazaha\Mastodon\Interfaces\RequestInterface<\Vazaha\Mastodon\Results\Result>
+ * @implements \Vazaha\Mastodon\Interfaces\RequestInterface<\Vazaha\Mastodon\Abstracts\Result>
  */
 abstract class Request implements RequestInterface
 {

diff --git a/src/Results/Result.php → src/Abstracts/Result.php b/src/Results/Result.php → src/Abstracts/Result.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Vazaha\Mastodon\Results;
+namespace Vazaha\Mastodon\Abstracts;
 
 use Illuminate\Support\Collection;
 use Psr\Http\Message\ResponseInterface;
@@ -13,7 +13,7 @@
 use Vazaha\Mastodon\Models\EmptyOrUnknownModel;
 use Vazaha\Mastodon\Results\Concerns\HasPaging;
 
-class Result extends Collection implements ResultInterface
+abstract class Result extends Collection implements ResultInterface
 {
     use HasPaging;
 

diff --git a/src/Collections/AccountCollection.php b/src/Collections/AccountCollection.php
@@ -8,6 +8,7 @@
 
 namespace Vazaha\Mastodon\Collections;
 
+use Vazaha\Mastodon\Abstracts\ModelCollection;
 use Vazaha\Mastodon\Models\AccountModel;
 
 /**

diff --git a/src/Collections/Admin/IpCollection.php b/src/Collections/Admin/IpCollection.php
@@ -8,7 +8,7 @@
 
 namespace Vazaha\Mastodon\Collections\Admin;
 
-use Vazaha\Mastodon\Collections\ModelCollection;
+use Vazaha\Mastodon\Abstracts\ModelCollection;
 use Vazaha\Mastodon\Models\Admin\IpModel;
 
 /**

diff --git a/src/Collections/Announcement/AccountCollection.php b/src/Collections/Announcement/AccountCollection.php
@@ -8,7 +8,7 @@
 
 namespace Vazaha\Mastodon\Collections\Announcement;
 
-use Vazaha\Mastodon\Collections\ModelCollection;
+use Vazaha\Mastodon\Abstracts\ModelCollection;
 use Vazaha\Mastodon\Models\Announcement\AccountModel;
 
 /**

diff --git a/src/Collections/Announcement/StatusCollection.php b/src/Collections/Announcement/StatusCollection.php
@@ -8,7 +8,7 @@
 
 namespace Vazaha\Mastodon\Collections\Announcement;
 
-use Vazaha\Mastodon\Collections\ModelCollection;
+use Vazaha\Mastodon\Abstracts\ModelCollection;
 use Vazaha\Mastodon\Models\Announcement\StatusModel;
 
 /**

diff --git a/src/Collections/CohortDataCollection.php b/src/Collections/CohortDataCollection.php
@@ -8,6 +8,7 @@
 
 namespace Vazaha\Mastodon\Collections;
 
+use Vazaha\Mastodon\Abstracts\ModelCollection;
 use Vazaha\Mastodon\Models\CohortDataModel;
 
 /**

diff --git a/src/Collections/CustomEmojiCollection.php b/src/Collections/CustomEmojiCollection.php
@@ -8,6 +8,7 @@
 
 namespace Vazaha\Mastodon\Collections;
 
+use Vazaha\Mastodon\Abstracts\ModelCollection;
 use Vazaha\Mastodon\Models\CustomEmojiModel;
 
 /**

diff --git a/src/Collections/FieldCollection.php b/src/Collections/FieldCollection.php
@@ -8,6 +8,7 @@
 
 namespace Vazaha\Mastodon\Collections;
 
+use Vazaha\Mastodon\Abstracts\ModelCollection;
 use Vazaha\Mastodon\Models\FieldModel;
 
 /**

diff --git a/src/Collections/FilterKeywordCollection.php b/src/Collections/FilterKeywordCollection.php
@@ -8,6 +8,7 @@
 
 namespace Vazaha\Mastodon\Collections;
 
+use Vazaha\Mastodon\Abstracts\ModelCollection;
 use Vazaha\Mastodon\Models\FilterKeywordModel;
 
 /**

diff --git a/src/Collections/FilterResultCollection.php b/src/Collections/FilterResultCollection.php
@@ -8,6 +8,7 @@
 
 namespace Vazaha\Mastodon\Collections;
 
+use Vazaha\Mastodon\Abstracts\ModelCollection;
 use Vazaha\Mastodon\Models\FilterResultModel;
 
 /**

diff --git a/src/Collections/FilterStatusCollection.php b/src/Collections/FilterStatusCollection.php
@@ -8,6 +8,7 @@
 
 namespace Vazaha\Mastodon\Collections;
 
+use Vazaha\Mastodon\Abstracts\ModelCollection;
 use Vazaha\Mastodon\Models\FilterStatusModel;
 
 /**

diff --git a/src/Collections/MediaAttachmentCollection.php b/src/Collections/MediaAttachmentCollection.php
@@ -8,6 +8,7 @@
 
 namespace Vazaha\Mastodon\Collections;
 
+use Vazaha\Mastodon\Abstracts\ModelCollection;
 use Vazaha\Mastodon\Models\MediaAttachmentModel;
 
 /**

diff --git a/src/Collections/Poll/OptionCollection.php b/src/Collections/Poll/OptionCollection.php
@@ -8,7 +8,7 @@
 
 namespace Vazaha\Mastodon\Collections\Poll;
 
-use Vazaha\Mastodon\Collections\ModelCollection;
+use Vazaha\Mastodon\Abstracts\ModelCollection;
 use Vazaha\Mastodon\Models\Poll\OptionModel;
 
 /**

diff --git a/src/Collections/ReactionCollection.php b/src/Collections/ReactionCollection.php
@@ -8,6 +8,7 @@
 
 namespace Vazaha\Mastodon\Collections;
 
+use Vazaha\Mastodon\Abstracts\ModelCollection;
 use Vazaha\Mastodon\Models\ReactionModel;
 
 /**

diff --git a/src/Collections/RuleCollection.php b/src/Collections/RuleCollection.php
@@ -8,6 +8,7 @@
 
 namespace Vazaha\Mastodon\Collections;
 
+use Vazaha\Mastodon\Abstracts\ModelCollection;
 use Vazaha\Mastodon\Models\RuleModel;
 
 /**

diff --git a/src/Collections/Status/MentionCollection.php b/src/Collections/Status/MentionCollection.php
@@ -8,7 +8,7 @@
 
 namespace Vazaha\Mastodon\Collections\Status;
 
-use Vazaha\Mastodon\Collections\ModelCollection;
+use Vazaha\Mastodon\Abstracts\ModelCollection;
 use Vazaha\Mastodon\Models\Status\MentionModel;
 
 /**

diff --git a/src/Collections/Status/TagCollection.php b/src/Collections/Status/TagCollection.php
@@ -8,7 +8,7 @@
 
 namespace Vazaha\Mastodon\Collections\Status;
 
-use Vazaha\Mastodon\Collections\ModelCollection;
+use Vazaha\Mastodon\Abstracts\ModelCollection;
 use Vazaha\Mastodon\Models\Status\TagModel;
 
 /**

diff --git a/src/Collections/StatusCollection.php b/src/Collections/StatusCollection.php
@@ -8,6 +8,7 @@
 
 namespace Vazaha\Mastodon\Collections;
 
+use Vazaha\Mastodon\Abstracts\ModelCollection;
 use Vazaha\Mastodon\Models\StatusModel;
 
 /**

diff --git a/src/Collections/TagCollection.php b/src/Collections/TagCollection.php
@@ -8,6 +8,7 @@
 
 namespace Vazaha\Mastodon\Collections;
 
+use Vazaha\Mastodon\Abstracts\ModelCollection;
 use Vazaha\Mastodon\Models\TagModel;
 
 /**

diff --git a/src/Factories/ModelFactory.php b/src/Factories/ModelFactory.php
@@ -5,13 +5,13 @@
 namespace Vazaha\Mastodon\Factories;
 
 use LogicException;
+use Vazaha\Mastodon\Abstracts\Model;
 use Vazaha\Mastodon\Interfaces\ModelInterface;
-use Vazaha\Mastodon\Models\Model;
 
 class ModelFactory
 {
     /**
-     * @template T of \Vazaha\Mastodon\Models\Model
+     * @template T of \Vazaha\Mastodon\Abstracts\Model
      *
      * @param class-string<T> $className
      * @param mixed[]         $modelData

diff --git a/src/Factories/ResultFactory.php b/src/Factories/ResultFactory.php
@@ -6,15 +6,15 @@
 
 use LogicException;
 use Psr\Http\Message\ResponseInterface;
+use Vazaha\Mastodon\Abstracts\Result;
 use Vazaha\Mastodon\ApiClient;
 use Vazaha\Mastodon\Interfaces\RequestInterface;
 use Vazaha\Mastodon\Interfaces\ResultInterface;
-use Vazaha\Mastodon\Results\Result;
 
 class ResultFactory
 {
     /**
-     * @template T of \Vazaha\Mastodon\Results\Result
+     * @template T of \Vazaha\Mastodon\Abstracts\Result
      * @template T2 of \Vazaha\Mastodon\Interfaces\ResultInterface
      *
      * @param class-string<T>                                  $className

diff --git a/src/Results/PagingLinks.php → src/Helpers/PagingLinks.php b/src/Results/PagingLinks.php → src/Helpers/PagingLinks.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Vazaha\Mastodon\Results;
+namespace Vazaha\Mastodon\Helpers;
 
 class PagingLinks
 {

diff --git a/src/Interfaces/RequestInterface.php b/src/Interfaces/RequestInterface.php
@@ -34,7 +34,7 @@ public function getFormParams(): array;
     public function getOptions(): array;
 
     /**
-     * @return class-string<\Vazaha\Mastodon\Results\Result>
+     * @return class-string<\Vazaha\Mastodon\Abstracts\Result>
      */
     public function getResultClass(): string;
 

diff --git a/src/Interfaces/ResultInterface.php b/src/Interfaces/ResultInterface.php
@@ -9,7 +9,7 @@
 interface ResultInterface
 {
     /**
-     * @return class-string<\Vazaha\Mastodon\Models\Model>
+     * @return class-string<\Vazaha\Mastodon\Abstracts\Model>
      */
     public function getModelClass(): string;
 

diff --git a/src/Models/AccountModel.php b/src/Models/AccountModel.php
@@ -9,6 +9,7 @@
 namespace Vazaha\Mastodon\Models;
 
 use DateTimeInterface;
+use Vazaha\Mastodon\Abstracts\Model;
 use Vazaha\Mastodon\Collections\CustomEmojiCollection;
 use Vazaha\Mastodon\Collections\FieldCollection;
 

diff --git a/src/Models/Admin/AccountModel.php b/src/Models/Admin/AccountModel.php
@@ -9,9 +9,9 @@
 namespace Vazaha\Mastodon\Models\Admin;
 
 use DateTimeInterface;
+use Vazaha\Mastodon\Abstracts\Model;
 use Vazaha\Mastodon\Collections\Admin\IpCollection;
 use Vazaha\Mastodon\Models\AccountModel as ModelsAccountModel;
-use Vazaha\Mastodon\Models\Model;
 use Vazaha\Mastodon\Models\RoleModel;
 
 /**

diff --git a/src/Models/Admin/CanonicalEmailBlockModel.php b/src/Models/Admin/CanonicalEmailBlockModel.php
@@ -8,7 +8,7 @@
 
 namespace Vazaha\Mastodon\Models\Admin;
 
-use Vazaha\Mastodon\Models\Model;
+use Vazaha\Mastodon\Abstracts\Model;
 
 /**
  * Represents a canonical email block (hashed).

diff --git a/src/Models/Admin/CohortModel.php b/src/Models/Admin/CohortModel.php
@@ -9,8 +9,8 @@
 namespace Vazaha\Mastodon\Models\Admin;
 
 use DateTimeInterface;
+use Vazaha\Mastodon\Abstracts\Model;
 use Vazaha\Mastodon\Collections\CohortDataCollection;
-use Vazaha\Mastodon\Models\Model;
 
 /**
  * Represents a retention metric.

diff --git a/src/Models/Admin/DimensionModel.php b/src/Models/Admin/DimensionModel.php
@@ -8,7 +8,7 @@
 
 namespace Vazaha\Mastodon\Models\Admin;
 
-use Vazaha\Mastodon\Models\Model;
+use Vazaha\Mastodon\Abstracts\Model;
 
 /**
  * Represents qualitative data about the server.

diff --git a/src/Models/Admin/DomainAllowModel.php b/src/Models/Admin/DomainAllowModel.php
@@ -9,7 +9,7 @@
 namespace Vazaha\Mastodon\Models\Admin;
 
 use DateTimeInterface;
-use Vazaha\Mastodon\Models\Model;
+use Vazaha\Mastodon\Abstracts\Model;
 
 /**
  * Represents a domain allowed to federate.

diff --git a/src/Models/Admin/DomainBlockModel.php b/src/Models/Admin/DomainBlockModel.php
@@ -9,7 +9,7 @@
 namespace Vazaha\Mastodon\Models\Admin;
 
 use DateTimeInterface;
-use Vazaha\Mastodon\Models\Model;
+use Vazaha\Mastodon\Abstracts\Model;
 
 /**
  * Represents a domain limited from federating.

diff --git a/src/Models/Admin/EmailDomainBlockModel.php b/src/Models/Admin/EmailDomainBlockModel.php
@@ -9,7 +9,7 @@
 namespace Vazaha\Mastodon\Models\Admin;
 
 use DateTimeInterface;
-use Vazaha\Mastodon\Models\Model;
+use Vazaha\Mastodon\Abstracts\Model;
 
 /**
  * Represents an email domain that cannot be used to sign up.

diff --git a/src/Models/Admin/IpBlockModel.php b/src/Models/Admin/IpBlockModel.php
@@ -9,7 +9,7 @@
 namespace Vazaha\Mastodon\Models\Admin;
 
 use DateTimeInterface;
-use Vazaha\Mastodon\Models\Model;
+use Vazaha\Mastodon\Abstracts\Model;
 
 /**
  * Represents an IP address range that cannot be used to sign up.

diff --git a/src/Models/Admin/IpModel.php b/src/Models/Admin/IpModel.php
@@ -9,7 +9,7 @@
 namespace Vazaha\Mastodon\Models\Admin;
 
 use DateTimeInterface;
-use Vazaha\Mastodon\Models\Model;
+use Vazaha\Mastodon\Abstracts\Model;
 
 /**
  * Represents an IP address associated with a user.

diff --git a/src/Models/Admin/MeasureModel.php b/src/Models/Admin/MeasureModel.php
@@ -8,7 +8,7 @@
 
 namespace Vazaha\Mastodon\Models\Admin;
 
-use Vazaha\Mastodon\Models\Model;
+use Vazaha\Mastodon\Abstracts\Model;
 
 /**
  * Represents quantitative data about the server.