Fixed handling of null queries for PR #321

contentful · Jan 26, 2023 · 7327939 · 7327939
1 parent 490a585
commit 7327939
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/src/Client.php b/src/Client.php
@@ -402,8 +402,7 @@ public function getAllTags(): array
      */
     public function getEntries(Query $query = null): ResourceArray
     {
-        $queryData = $query ? $query->getQueryData() : [];
-        if (!isset($queryData['locale'])) {
+        if (null !== $query && null === $query->getLocale()) {
             $query->setLocale($this->defaultLocale);
         }
 
@@ -415,7 +414,7 @@ public function getEntries(Query $query = null): ResourceArray
         $entries = $this->request(
             'GET',
             '/spaces/'.$this->spaceId.'/environments/'.$this->environmentId.'/entries',
-            ['query' => $query->getQueryData()]
+            ['query' => null === $query ? [] : $query->getQueryData()]
         );
 
         $this->queryPool->save($query, $entries);

diff --git a/src/Query.php b/src/Query.php
@@ -71,4 +71,12 @@ public function setLocale(string $locale = null)
 
         return $this;
     }
+
+    /**
+     * Get the locale currently set for this query.
+     */
+    public function getLocale(): ?string
+    {
+        return $this->locale;
+    }
 }