Add support for Guzzle 8

.github/workflows/phpunit.yml

@@ -14,6 +14,7 @@ jobs:
       fail-fast: false
       matrix:
         php-version: ['8.1', '8.2', '8.3', '8.4', '8.5']
+        guzzle: ['^7', '^8']
 
     steps:
       - name: Checkout code
@@ -26,7 +27,9 @@ jobs:
           coverage: xdebug
 
       - name: Install dependencies
-        run: composer install --no-interaction --no-progress --prefer-dist
+        run: |
+          composer require "guzzlehttp/guzzle:${{ matrix.guzzle }}" --no-update --no-interaction
+          composer update --no-interaction --no-progress --prefer-dist
 
       - name: Run PHPUnit with coverage
         run: vendor/bin/phpunit --coverage-clover coverage.xml

Tests/Unit/Model/PayOrderTest.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Tests\Unit;
+namespace Tests\Unit\Model;
 
 use PayNL\Sdk\Model\Amount;
 use PayNL\Sdk\Model\Pay\PayOrder;

Tests/Unit/Model/PayStatusTest.php

@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Tests\Unit\Model;
+
 use PayNL\Sdk\Model\Pay\PayStatus;
 use PHPUnit\Framework\TestCase;
 

Tests/Unit/Model/PayloadTest.php

@@ -2,12 +2,12 @@
 
 declare(strict_types=1);
 
-namespace Tests\Unit;
+namespace Tests\Unit\Model;
 
 use PayNL\Sdk\Model\Pay\PayLoad;
 use PHPUnit\Framework\TestCase;
 
-class PayLoadTest extends TestCase
+class PayloadTest extends TestCase
 {
     public function testLegacyPayloadMapping(): void
     {

Tests/Unit/OrderRequests/OrderApproveRequestTest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Unit;
+namespace Tests\Unit\OrderRequests;
 
 use PayNL\Sdk\Model\Pay\PayOrder;
 use PayNL\Sdk\Model\Request\OrderApproveRequest;

Tests/Unit/OrderRequests/OrderCaptureRequestTest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Unit;
+namespace Tests\Unit\OrderRequests;
 
 use PayNL\Sdk\Model\Pay\PayOrder;
 use PayNL\Sdk\Model\Request\OrderCaptureRequest;

Tests/Unit/OrderRequests/OrderCreateRequestTest.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Tests\Unit;
+namespace Tests\Unit\OrderRequests;
 
 use PayNL\Sdk\Model\Amount;
 use PayNL\Sdk\Model\Customer;
@@ -23,7 +23,6 @@ public function testEnableFastCheckout(): void
 
         $reflection = new \ReflectionClass($request);
         $optimizeProperty = $reflection->getProperty('optimize');
-        $optimizeProperty->setAccessible(true);
 
         $this->assertEquals([
             'flow' => 'fastCheckout',
@@ -43,7 +42,6 @@ public function testSetReturnUrl(): void
 
         $reflection = new \ReflectionClass($request);
         $returnUrlProperty = $reflection->getProperty('returnUrl');
-        $returnUrlProperty->setAccessible(true);
 
         $this->assertEquals('https://example.com/return', $returnUrlProperty->getValue($request));
     }
@@ -58,7 +56,6 @@ public function testSetAmount(): void
 
         $reflection = new \ReflectionClass($request);
         $amountProperty = $reflection->getProperty('amount');
-        $amountProperty->setAccessible(true);
 
         $this->assertEquals(12345, $amountProperty->getValue($request));
     }
@@ -73,10 +70,8 @@ public function testSetAmountUsingObject(): void
 
         $reflection = new \ReflectionClass($request);
         $amountProperty = $reflection->getProperty('amount');
-        $amountProperty->setAccessible(true);
 
         $currencyProperty = $reflection->getProperty('currency');
-        $currencyProperty->setAccessible(true);
 
         $this->assertEquals(12345, $amountProperty->getValue($request));
         $this->assertEquals('EUR', $currencyProperty->getValue($request));
@@ -94,7 +89,6 @@ public function testSetReference(): void
 
         $reflection = new \ReflectionClass($request);
         $referenceProperty = $reflection->getProperty('reference');
-        $referenceProperty->setAccessible(true);
 
         $this->assertEquals('Order123', $referenceProperty->getValue($request));
     }
@@ -124,9 +118,7 @@ public function testSetNotification(): void
 
         $reflection = new \ReflectionClass($request);
         $notificationTypeProperty = $reflection->getProperty('notificationType');
-        $notificationTypeProperty->setAccessible(true);
         $notificationRecipientProperty = $reflection->getProperty('notificationRecipient');
-        $notificationRecipientProperty->setAccessible(true);
 
         $this->assertEquals('email', $notificationTypeProperty->getValue($request));
         $this->assertEquals('test@example.com', $notificationRecipientProperty->getValue($request));
@@ -170,7 +162,6 @@ public function testSetCustomer(): void
 
         $reflection = new \ReflectionClass($request);
         $customerProperty = $reflection->getProperty('customer');
-        $customerProperty->setAccessible(true);
 
         $this->assertSame($mockCustomer, $customerProperty->getValue($request));
     }
@@ -187,7 +178,6 @@ public function testSetOrder(): void
 
         $reflection = new \ReflectionClass($request);
         $orderProperty = $reflection->getProperty('order');
-        $orderProperty->setAccessible(true);
 
         $this->assertSame($mockOrder, $orderProperty->getValue($request));
     }
@@ -204,7 +194,6 @@ public function testSetStats(): void
 
         $reflection = new \ReflectionClass($request);
         $statsProperty = $reflection->getProperty('stats');
-        $statsProperty->setAccessible(true);
 
         $this->assertSame($mockStats, $statsProperty->getValue($request));
     }

Tests/Unit/OrderRequests/OrderStatusRequestTest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Unit;
+namespace Tests\Unit\OrderRequests;
 
 use PayNL\Sdk\Model\Pay\PayOrder;
 use PayNL\Sdk\Model\Request\OrderStatusRequest;

Tests/Unit/OrderRequests/OrderVoidRequestTest.php

@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Tests\Unit\OrderRequests;
+
 use PayNL\Sdk\Model\Pay\PayOrder;
 use PayNL\Sdk\Model\Request\OrderVoidRequest;
 use PayNL\Sdk\Request\RequestData;

Tests/Unit/OrderRequests/ServiceGetConfigRequestTest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Unit;
+namespace Tests\Unit\OrderRequests;
 
 use PayNL\Sdk\Model\Request\ServiceGetConfigRequest;
 use PayNL\Sdk\Model\Response\ServiceGetConfigResponse;

Tests/Unit/OrderRequests/ServiceGetConfigResponseTest.php

@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Tests\Unit\OrderRequests;
+
 use PayNL\Sdk\Model\CheckoutOptions;
 use PayNL\Sdk\Model\Method;
 use PayNL\Sdk\Model\Response\ServiceGetConfigResponse;

Tests/Unit/OrderRequests/TerminalsBrowseRequestTest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Unit;
+namespace Tests\Unit\OrderRequests;
 
 use PayNL\Sdk\Application\Application;
 use PayNL\Sdk\Config\Config;

Tests/Unit/OrderRequests/TerminalsGetRequestTest.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Tests\Unit;
+namespace Tests\Unit\OrderRequests;
 
 use PayNL\Sdk\Model\Request\TerminalsGetRequest;
 use PHPUnit\Framework\TestCase;

Tests/Unit/OrderRequests/TransactionRefundResponseTest.php

@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Tests\Unit\OrderRequests;
+
 use PayNL\Sdk\Model\Amount;
 use PayNL\Sdk\Model\Response\TransactionRefundResponse;
 use PHPUnit\Framework\TestCase;

Tests/Unit/OrderRequests/TransactionStatusResponseTest.php

@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Tests\Unit\OrderRequests;
+
 use PayNL\Sdk\Model\Amount;
 use PayNL\Sdk\Model\Response\TransactionStatusResponse;
 use PHPUnit\Framework\TestCase;

Tests/Unit/OrderRequests/VoucherInfoRequestTest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Unit;
+namespace Tests\Unit\OrderRequests;
 
 use PayNL\Sdk\Application\Application;
 use PayNL\Sdk\Config\Config;
@@ -61,7 +61,6 @@ public function testSetServiceId(): void
         $request->setServiceId('SL-1234-5678');
         $reflection = new \ReflectionClass($request);
         $serviceIdProperty = $reflection->getProperty('serviceId');
-        $serviceIdProperty->setAccessible(true);
 
         $this->assertEquals('SL-1234-5678', $serviceIdProperty->getValue($request));
     }
@@ -77,7 +76,6 @@ public function testSetCardNumber(): void
         $request->setCardNumber('1234-5678-9012-3456');
         $reflection = new \ReflectionClass($request);
         $cardNumberProperty = $reflection->getProperty('cardNumber');
-        $cardNumberProperty->setAccessible(true);
 
         $this->assertEquals('1234-5678-9012-3456', $cardNumberProperty->getValue($request));
     }
@@ -93,7 +91,6 @@ public function testSetPinCode(): void
         $request->setPinCode('123456');
         $reflection = new \ReflectionClass($request);
         $pinCodeProperty = $reflection->getProperty('pinCode');
-        $pinCodeProperty->setAccessible(true);
 
         $this->assertEquals('123456', $pinCodeProperty->getValue($request));
     }
@@ -109,7 +106,6 @@ public function testSetPointOfInteraction(): void
         $request->setPointOfInteraction('ON_THE_MOVE');
         $reflection = new \ReflectionClass($request);
         $poiProperty = $reflection->getProperty('pointOfInteraction');
-        $poiProperty->setAccessible(true);
 
         $this->assertEquals('ON_THE_MOVE', $poiProperty->getValue($request));
     }

Tests/Unit/OrderRequests/VoucherPaymentRequestTest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Unit;
+namespace Tests\Unit\OrderRequests;
 
 use PayNL\Sdk\Application\Application;
 use PayNL\Sdk\Config\Config;
@@ -62,7 +62,6 @@ public function testSetCardNumber(): void
         $request->setCardNumber('1234-5678-9012-3456');
         $reflection = new \ReflectionClass($request);
         $cardNumberProperty = $reflection->getProperty('cardNumber');
-        $cardNumberProperty->setAccessible(true);
 
         $this->assertEquals('1234-5678-9012-3456', $cardNumberProperty->getValue($request));
     }
@@ -78,7 +77,6 @@ public function testSetPinCode(): void
         $request->setPinCode('123456');
         $reflection = new \ReflectionClass($request);
         $pinCodeProperty = $reflection->getProperty('pinCode');
-        $pinCodeProperty->setAccessible(true);
 
         $this->assertEquals('123456', $pinCodeProperty->getValue($request));
     }
@@ -94,7 +92,6 @@ public function testSetPointOfInteraction(): void
         $request->setPointOfInteraction('ON_THE_MOVE');
         $reflection = new \ReflectionClass($request);
         $poiProperty = $reflection->getProperty('pointOfInteraction');
-        $poiProperty->setAccessible(true);
 
         $this->assertEquals('ON_THE_MOVE', $poiProperty->getValue($request));
     }

Tests/Unit/Request/AbstractRequestExecuteTest.php

@@ -0,0 +1,65 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Tests\Unit\Request;
+
+use GuzzleHttp\Client;
+use GuzzleHttp\Handler\MockHandler;
+use GuzzleHttp\HandlerStack;
+use GuzzleHttp\Psr7\Response as GuzzleResponse;
+use PayNL\Sdk\Request\Request;
+use PayNL\Sdk\Response\Response;
+use PHPUnit\Framework\TestCase;
+
+class AbstractRequestExecuteTest extends TestCase
+{
+    public function testExecuteSendsGetAgainstClientBaseUri(): void
+    {
+        $mock = new MockHandler([
+            new GuzzleResponse(200, ['Content-Type' => 'application/json'], '{"id":"1"}'),
+        ]);
+        $client = new Client([
+            'handler' => HandlerStack::create($mock),
+            'base_uri' => 'https://rest.pay.nl/v2/',
+        ]);
+
+        $request = new Request('orders', Request::METHOD_GET);
+        $request->applyClient($client, 'https://rest.pay.nl/v2/');
+
+        $response = new Response();
+        $request->execute($response);
+
+        $this->assertSame(200, $response->getStatusCode());
+        $this->assertSame('{"id":"1"}', $response->getRawBody());
+
+        $lastRequest = $mock->getLastRequest();
+        $this->assertNotNull($lastRequest);
+        $this->assertSame('GET', $lastRequest->getMethod());
+        $this->assertSame('https://rest.pay.nl/v2/orders', (string)$lastRequest->getUri());
+    }
+
+    public function testExecuteUsesAbsoluteUriWhenUrlOptionIsSet(): void
+    {
+        $mock = new MockHandler([
+            new GuzzleResponse(200, ['Content-Type' => 'application/json'], '{"ok":true}'),
+        ]);
+        $client = new Client([
+            'handler' => HandlerStack::create($mock),
+            'base_uri' => 'https://rest.pay.nl/v2/',
+        ]);
+
+        $request = new Request('orders', Request::METHOD_POST, [], ['url' => 'https://failover.pay.nl']);
+        $request->applyClient($client, 'https://rest.pay.nl/v2/');
+
+        $response = new Response();
+        $request->execute($response);
+
+        $this->assertSame(200, $response->getStatusCode());
+
+        $lastRequest = $mock->getLastRequest();
+        $this->assertNotNull($lastRequest);
+        $this->assertSame('POST', $lastRequest->getMethod());
+        $this->assertSame('https://failover.pay.nl/orders', (string)$lastRequest->getUri());
+    }
+}

Tests/Unit/Response/VoucherInfoResponseTest.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Tests\Unit;
+namespace Tests\Unit\Response;
 
 use PayNL\Sdk\Model\Amount;
 use PayNL\Sdk\Model\Response\VoucherInfoResponse;

Tests/Unit/Util/ExchangeResponseTest.php

@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Tests\Unit\Util;
+
 use PayNL\Sdk\Util\ExchangeResponse;
 use PHPUnit\Framework\TestCase;
 
@@ -11,7 +13,6 @@ private function getProperty(object $object, string $name): mixed
     {
         $ref = new \ReflectionClass($object);
         $prop = $ref->getProperty($name);
-        $prop->setAccessible(true);
 
         return $prop->getValue($object);
     }