Collections are non nullable anymore (#24)

* Collections are non nullable anymore

Author: silasjoisten

src/Request/StoriesRequest.php

@@ -13,7 +13,6 @@
 
 namespace Storyblok\Api\Request;
 
-use OskarStark\Value\TrimmedNonEmptyString;
 use Storyblok\Api\Domain\Value\Dto\Pagination;
 use Storyblok\Api\Domain\Value\Dto\SortBy;
 use Storyblok\Api\Domain\Value\Dto\Version;
@@ -36,11 +35,11 @@ public function __construct(
         public string $language = 'default',
         public Pagination $pagination = new Pagination(perPage: self::PER_PAGE),
         public ?SortBy $sortBy = null,
-        public ?FilterCollection $filters = null,
-        public ?FieldCollection $excludeFields = null,
-        public ?TagCollection $withTags = null,
-        public ?IdCollection $excludeIds = null,
-        public ?RelationCollection $withRelations = null,
+        public FilterCollection $filters = new FilterCollection(),
+        public FieldCollection $excludeFields = new FieldCollection(),
+        public TagCollection $withTags = new TagCollection(),
+        public IdCollection $excludeIds = new IdCollection(),
+        public RelationCollection $withRelations = new RelationCollection(),
         public ?Version $version = null,
         public ?string $searchTerm = null,
     ) {
@@ -74,23 +73,23 @@ public function toArray(): array
             $array['sort_by'] = $this->sortBy->toString();
         }
 
-        if (null !== $this->filters && $this->filters->count() > 0) {
+        if ($this->filters->count() > 0) {
             $array['filter_query'] = $this->filters->toArray();
         }
 
-        if (null !== $this->withTags && $this->withTags->count() > 0) {
+        if ($this->withTags->count() > 0) {
             $array['with_tag'] = $this->withTags->toString();
         }
 
-        if (null !== $this->excludeFields && $this->excludeFields->count() > 0) {
+        if ($this->excludeFields->count() > 0) {
             $array['excluding_fields'] = $this->excludeFields->toString();
         }
 
-        if (null !== $this->excludeIds && $this->excludeIds->count() > 0) {
+        if ($this->excludeIds->count() > 0) {
             $array['excluding_ids'] = $this->excludeIds->toString();
         }
 
-        if (null !== $this->withRelations && $this->withRelations->count() > 0) {
+        if ($this->withRelations->count() > 0) {
             $array['resolve_relations'] = $this->withRelations->toString();
         }
 

src/Request/StoryRequest.php

@@ -25,7 +25,7 @@
     public function __construct(
         public string $language = 'default',
         public ?Version $version = null,
-        public ?RelationCollection $withRelations = null,
+        public RelationCollection $withRelations = new RelationCollection(),
     ) {
         Assert::stringNotEmpty($language);
     }
@@ -47,7 +47,7 @@ public function toArray(): array
             $array['version'] = $this->version->value;
         }
 
-        if (null !== $this->withRelations && $this->withRelations->count() > 0) {
+        if ($this->withRelations->count() > 0) {
             $array['resolve_relations'] = $this->withRelations->toString();
         }
 

src/StoriesResolvedApi.php

@@ -36,10 +36,7 @@ public function all(?StoriesRequest $request = null): StoriesResponse
     {
         $response = $this->storiesApi->all($request);
 
-        if (null === $request
-            || null === $request->withRelations
-            || 0 === $request->withRelations->count()
-        ) {
+        if (null === $request || 0 === $request->withRelations->count()) {
             return $response;
         }
 
@@ -65,10 +62,7 @@ public function allByContentType(string $contentType, ?StoriesRequest $request =
     {
         $response = $this->storiesApi->allByContentType($contentType, $request);
 
-        if (null === $request
-            || null === $request->withRelations
-            || 0 === $request->withRelations->count()
-        ) {
+        if (null === $request || 0 === $request->withRelations->count()) {
             return $response;
         }