Gather data from responses

cerbero90 · Dec 19, 2023 · 333facb · 333facb
1 parent 12c977d
commit 333facb
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 7 deletions.
diff --git a/src/Services/ConfigFactory.php b/src/Services/ConfigFactory.php
@@ -4,12 +4,15 @@
 
 namespace Cerbero\LazyJsonPages\Services;
 
+use Cerbero\JsonParser\Concerns\DetectsEndpoints;
 use Cerbero\LazyJsonPages\Dtos\Config;
 use Cerbero\LazyJsonPages\Sources\AnySource;
 use Closure;
 
 final class ConfigFactory
 {
+    use DetectsEndpoints;
+
     /**
      * The dot to extract items from.
      */
@@ -159,7 +162,7 @@ private function integerFromResponse(Closure|string $key, int $minimum = 0): int
     {
         return (int) max($minimum, match (true) {
             $key instanceof Closure => $key($this->source->response()),
-            default => $this->source->response()->json($key) ?? $this->source->response()->header($key),
+            default => $this->source->response($key),
         });
     }
 
@@ -185,7 +188,7 @@ protected function resolvePage($value)
     {
         if (is_numeric($value)) {
             return (int) $value;
-        } elseif ($this->isEndpoint($value = $this->source->json($value))) {
+        } elseif (is_string($value) && $this->isEndpoint($value = $this->source->response($value))) {
             parse_str(parse_url($value, PHP_URL_QUERY), $query);
             $value = $query[$this->pageName];
         }
@@ -230,7 +233,7 @@ private function pageFromResponse(Closure|string $key, int $minimum = 0): string
     {
         return (int) max($minimum, match (true) {
             $key instanceof Closure => $key($this->source->response()),
-            default => $this->source->response()->json($key) ?? $this->source->response()->header($key),
+            default => $this->source->response($key),
         });
     }
 

diff --git a/src/Sources/Source.php b/src/Sources/Source.php
@@ -5,11 +5,17 @@
 namespace Cerbero\LazyJsonPages\Sources;
 
 use Psr\Http\Message\RequestInterface;
-use Psr\Http\Message\ResponseInterface;
 
-interface Source
+abstract class Source
 {
-    public function request(): RequestInterface;
+    public final function __construct(
+        protected readonly mixed $source,
+    ) {
+    }
 
-    public function response(): ResponseInterface;
+    abstract public function matches(): bool;
+
+    abstract public function request(): RequestInterface;
+
+    abstract public function response(?string $key = null): mixed;
 }