Merge pull request #7 from farzai/fix-build-error

Use support package

.github/workflows/run-tests.yml

@@ -9,7 +9,7 @@ jobs:
       fail-fast: true
       matrix:
         os: [ubuntu-latest, windows-latest]
-        php: [8.2, 8.1, 8.0]
+        php: [8.3, 8.2, 8.1]
         stability: [prefer-lowest, prefer-stable]
 
     name: P${{ matrix.php }} - ${{ matrix.stability }} - ${{ matrix.os }}

README.md

@@ -13,7 +13,7 @@ A HTTP client for Farzai Package.
 You can install the package via composer:
 
 ```bash
-composer require farzai/transport:dev-main
+composer require farzai/transport
 ```
 
 ## Testing

composer.json

@@ -14,7 +14,8 @@
         }
     ],
     "require": {
-        "php": "^8.0",
+        "php": "^8.1",
+        "farzai/support": "^1.1",
         "guzzlehttp/guzzle": "^7.7",
         "guzzlehttp/psr7": "^2.5",
         "psr/http-client": "^1.0",

src/Contracts/ResponseInterface.php

@@ -30,7 +30,7 @@ public function isSuccessfull(): bool;
     /**
      * Return the json decoded response.
      */
-    public function json(string $key = null): mixed;
+    public function json(?string $key = null): mixed;
 
     /**
      * Throw an exception if the response is not successfull.
@@ -39,7 +39,7 @@ public function json(string $key = null): mixed;
      *
      * @throws \Psr\Http\Client\ClientExceptionInterface
      */
-    public function throw(callable $callback = null);
+    public function throw(?callable $callback = null);
 
     /**
      * Return the psr request.

src/Exceptions/ResponseExceptionFactory.php

@@ -13,7 +13,7 @@ class ResponseExceptionFactory
     /**
      * Create a new exception instance.
      */
-    public static function create(ResponseInterface $response, Throwable $previous = null)
+    public static function create(ResponseInterface $response, ?Throwable $previous = null)
     {
         $statusCode = $response->statusCode();
 

src/Response.php

@@ -2,6 +2,7 @@
 
 namespace Farzai\Transport;
 
+use Farzai\Support\Arr;
 use Farzai\Transport\Contracts\ResponseInterface;
 use Farzai\Transport\Exceptions\ResponseExceptionFactory;
 use Farzai\Transport\Traits\PsrResponseTrait;
@@ -73,7 +74,7 @@ public function isSuccessfull(): bool
     /**
      * Return the json decoded response.
      */
-    public function json(string $key = null): mixed
+    public function json(?string $key = null): mixed
     {
         if (is_null($this->jsonDecoded)) {
             $this->jsonDecoded = @json_decode($this->body(), true) ?: false;
@@ -87,7 +88,7 @@ public function json(string $key = null): mixed
             return $this->jsonDecoded;
         }
 
-        return $this->jsonDecoded[$key] ?? null;
+        return Arr::get($this->jsonDecoded, $key);
     }
 
     /**
@@ -98,7 +99,7 @@ public function json(string $key = null): mixed
      *
      * @throws \Psr\Http\Client\ClientExceptionInterface
      */
-    public function throw(callable $callback = null)
+    public function throw(?callable $callback = null)
     {
         $callback = $callback ?? function (ResponseInterface $response, ?\Exception $e) {
             if (! $this->isSuccessfull()) {

tests/ResponseTest.php

@@ -75,6 +75,21 @@
     expect($response->json())->toBe(['foo' => 'bar']);
 });
 
+it('can get json body with dot notation', function () {
+    $stream = $this->createMock(StreamInterface::class);
+    $stream->method('getContents')->willReturn('{"foo":{"bar":"baz"}}');
+
+    $baseResponse = $this->createMock(ResponseInterface::class);
+    $baseResponse->method('getBody')->willReturn($stream);
+
+    $response = new Response(
+        $this->createMock(RequestInterface::class),
+        $baseResponse,
+    );
+
+    expect($response->json('foo.bar'))->toBe('baz');
+});
+
 it('cannot get json when invalid json format', function () {
     $stream = $this->createMock(StreamInterface::class);
     $stream->method('getContents')->willReturn('{"foo":"bar"');
@@ -116,7 +131,6 @@
     $response = new Response(
         $this->createMock(RequestInterface::class),
         $baseResponse,
-
     );
 
     $response->throw();