wip

mollie · Dec 12, 2024 · 9f693e4 · 9f693e4
1 parent 8c56845
commit 9f693e4
Show file tree

Hide file tree

Showing 67 changed files with 218 additions and 215 deletions.
diff --git a/docs/requests.md b/docs/requests.md
@@ -21,6 +21,7 @@ To send a request using the Mollie API client, you typically need to:
 
 3. **Send the request**:
    Use the client to send the request and handle the response.
+
    ```php
    use Mollie\Api\MollieApiClient;
    use Mollie\Api\Http\Data\Money;

diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -361,37 +361,37 @@ parameters:
 			path: tests/Fixtures/MockResponse.php
 
 		-
-			message: '#^Property Tests\\Helpers\\TestPropertiesClass\:\:\$privateProp is unused\.$#'
-			identifier: property.unused
-			count: 1
-			path: tests/Helpers/HelpersTest.php
+			message: '#^Unsafe access to private property Tests\\Http\\Adapter\\MockMollieHttpAdapter\:\:\$factories through static\:\:\.$#'
+			identifier: staticClassAccess.privateProperty
+			count: 3
+			path: tests/Http/Adapter/MockMollieHttpAdapter.php
 
 		-
-			message: '#^Trait Tests\\Helpers\\TestTraitBase is used zero times and is not analysed\.$#'
-			identifier: trait.unused
+			message: '#^Call to method PHPUnit\\Framework\\Assert\:\:assertTrue\(\) with true will always evaluate to true\.$#'
+			identifier: method.alreadyNarrowedType
 			count: 1
-			path: tests/Helpers/HelpersTest.php
+			path: tests/Http/Middleware/GuardResponseTest.php
 
 		-
-			message: '#^Trait Tests\\Helpers\\TestTraitMain is used zero times and is not analysed\.$#'
-			identifier: trait.unused
+			message: '#^Property Tests\\Utils\\TestPropertiesClass\:\:\$privateProp is unused\.$#'
+			identifier: property.unused
 			count: 1
-			path: tests/Helpers/HelpersTest.php
+			path: tests/Utils/UtilityTest.php
 
 		-
-			message: '#^Trait Tests\\Helpers\\TestTraitNested is used zero times and is not analysed\.$#'
+			message: '#^Trait Tests\\Utils\\TestTraitBase is used zero times and is not analysed\.$#'
 			identifier: trait.unused
 			count: 1
-			path: tests/Helpers/HelpersTest.php
+			path: tests/Utils/UtilityTest.php
 
 		-
-			message: '#^Unsafe access to private property Tests\\Http\\Adapter\\MockMollieHttpAdapter\:\:\$factories through static\:\:\.$#'
-			identifier: staticClassAccess.privateProperty
-			count: 3
-			path: tests/Http/Adapter/MockMollieHttpAdapter.php
+			message: '#^Trait Tests\\Utils\\TestTraitMain is used zero times and is not analysed\.$#'
+			identifier: trait.unused
+			count: 1
+			path: tests/Utils/UtilityTest.php
 
 		-
-			message: '#^Call to method PHPUnit\\Framework\\Assert\:\:assertTrue\(\) with true will always evaluate to true\.$#'
-			identifier: method.alreadyNarrowedType
+			message: '#^Trait Tests\\Utils\\TestTraitNested is used zero times and is not analysed\.$#'
+			identifier: trait.unused
 			count: 1
-			path: tests/Http/Middleware/GuardResponseTest.php
+			path: tests/Utils/UtilityTest.php
diff --git a/src/Contracts/Connector.php b/src/Contracts/Connector.php
@@ -2,7 +2,7 @@
 
 namespace Mollie\Api\Contracts;
 
-use Mollie\Api\Helpers\MiddlewareHandlers;
+use Mollie\Api\Http\Middleware;
 use Mollie\Api\Http\Request;
 
 interface Connector extends Authenticatable, Hydratable, IdempotencyContract, SupportsDebuggingContract, Testable
@@ -15,7 +15,7 @@ public function headers(): ArrayRepository;
 
     public function query(): ArrayRepository;
 
-    public function middleware(): MiddlewareHandlers;
+    public function middleware(): Middleware;
 
     public function addVersionString($versionString): self;
 

diff --git a/src/Contracts/HttpAdapterContract.php b/src/Contracts/HttpAdapterContract.php
@@ -2,7 +2,7 @@
 
 namespace Mollie\Api\Contracts;
 
-use Mollie\Api\Helpers\Factories;
+use Mollie\Api\Utils\Factories;
 use Mollie\Api\Http\PendingRequest;
 use Mollie\Api\Http\Response;
 

diff --git a/src/EndpointCollection/BalanceEndpointCollection.php b/src/EndpointCollection/BalanceEndpointCollection.php
@@ -4,7 +4,7 @@
 
 use Mollie\Api\Exceptions\ApiException;
 use Mollie\Api\Factories\GetPaginatedBalanceQueryFactory;
-use Mollie\Api\Helpers;
+use Mollie\Api\Utils\Utility;
 use Mollie\Api\Http\Requests\GetBalanceRequest;
 use Mollie\Api\Http\Requests\GetPaginatedBalanceRequest;
 use Mollie\Api\Resources\Balance;
@@ -24,7 +24,7 @@ class BalanceEndpointCollection extends EndpointCollection
      */
     public function get(string $id, $testmode = []): Balance
     {
-        $testmode = Helpers::extractBool($testmode, 'testmode', false);
+        $testmode = Utility::extractBool($testmode, 'testmode', false);
 
         /** @var Balance */
         return $this->send((new GetBalanceRequest($id))->test($testmode));
@@ -48,7 +48,7 @@ public function primary(array $testmode = []): Balance
      */
     public function page(?string $from = null, ?int $limit = null, array $filters = []): BalanceCollection
     {
-        $testmode = Helpers::extractBool($filters, 'testmode', false);
+        $testmode = Utility::extractBool($filters, 'testmode', false);
 
         $query = GetPaginatedBalanceQueryFactory::new([
             'from' => $from,
@@ -67,7 +67,7 @@ public function page(?string $from = null, ?int $limit = null, array $filters =
      */
     public function iterator(?string $from = null, ?int $limit = null, array $filters = [], bool $iterateBackwards = false): LazyCollection
     {
-        $testmode = Helpers::extractBool($filters, 'testmode', false);
+        $testmode = Utility::extractBool($filters, 'testmode', false);
 
         $query = GetPaginatedBalanceQueryFactory::new([
             'from' => $from,

diff --git a/src/EndpointCollection/BalanceReportEndpointCollection.php b/src/EndpointCollection/BalanceReportEndpointCollection.php
@@ -3,7 +3,7 @@
 namespace Mollie\Api\EndpointCollection;
 
 use Mollie\Api\Factories\GetBalanceReportQueryFactory;
-use Mollie\Api\Helpers;
+use Mollie\Api\Utils\Utility;
 use Mollie\Api\Http\Data\GetBalanceReportQuery;
 use Mollie\Api\Http\Requests\GetBalanceReportRequest;
 use Mollie\Api\Resources\Balance;
@@ -20,7 +20,7 @@ class BalanceReportEndpointCollection extends EndpointCollection
      */
     public function getForId(string $balanceId, $query = []): ?BalanceReport
     {
-        $testmode = Helpers::extractBool($query, 'testmode', false);
+        $testmode = Utility::extractBool($query, 'testmode', false);
 
         $query = GetBalanceReportQueryFactory::new($query)
             ->create();

diff --git a/src/EndpointCollection/ChargebackEndpointCollection.php b/src/EndpointCollection/ChargebackEndpointCollection.php
@@ -4,7 +4,7 @@
 
 use Mollie\Api\Exceptions\ApiException;
 use Mollie\Api\Factories\GetPaginatedChargebackQueryFactory;
-use Mollie\Api\Helpers;
+use Mollie\Api\Utils\Utility;
 use Mollie\Api\Http\Requests\GetPaginatedChargebacksRequest;
 use Mollie\Api\Resources\ChargebackCollection;
 use Mollie\Api\Resources\LazyCollection;
@@ -20,7 +20,7 @@ class ChargebackEndpointCollection extends EndpointCollection
      */
     public function page(?string $from = null, ?int $limit = null, array $filters = []): ChargebackCollection
     {
-        $testmode = Helpers::extractBool($filters, 'testmode', false);
+        $testmode = Utility::extractBool($filters, 'testmode', false);
 
         $query = GetPaginatedChargebackQueryFactory::new([
             'from' => $from,
@@ -41,7 +41,7 @@ public function page(?string $from = null, ?int $limit = null, array $filters =
      */
     public function iterator(?string $from = null, ?int $limit = null, $filters = [], bool $iterateBackwards = false): LazyCollection
     {
-        $testmode = Helpers::extractBool($filters, 'testmode', false);
+        $testmode = Utility::extractBool($filters, 'testmode', false);
 
         $query = GetPaginatedChargebackQueryFactory::new([
             'from' => $from,

diff --git a/src/EndpointCollection/CustomerEndpointCollection.php b/src/EndpointCollection/CustomerEndpointCollection.php
@@ -6,7 +6,7 @@
 use Mollie\Api\Factories\CreateCustomerPayloadFactory;
 use Mollie\Api\Factories\PaginatedQueryFactory;
 use Mollie\Api\Factories\UpdateCustomerPayloadFactory;
-use Mollie\Api\Helpers;
+use Mollie\Api\Utils\Utility;
 use Mollie\Api\Http\Data\CreateCustomerPayload;
 use Mollie\Api\Http\Data\UpdateCustomerPayload;
 use Mollie\Api\Http\Requests\CreateCustomerRequest;
@@ -30,7 +30,7 @@ class CustomerEndpointCollection extends EndpointCollection
      */
     public function create($data = [], $testmode = []): Customer
     {
-        $testmode = Helpers::extractBool($testmode, 'testmode', false);
+        $testmode = Utility::extractBool($testmode, 'testmode', false);
 
         if (! $data instanceof CreateCustomerPayload) {
             $data = CreateCustomerPayloadFactory::new($data)->create();
@@ -51,7 +51,7 @@ public function create($data = [], $testmode = []): Customer
      */
     public function get(string $id, $testmode = []): Customer
     {
-        $testmode = Helpers::extractBool($testmode, 'testmode', false);
+        $testmode = Utility::extractBool($testmode, 'testmode', false);
 
         /** @var Customer */
         return $this->send((new GetCustomerRequest($id))->test($testmode));
@@ -86,7 +86,7 @@ public function update(string $id, $data = []): ?Customer
      */
     public function delete(string $id, $testmode = []): void
     {
-        $testmode = Helpers::extractBool($testmode, 'testmode', false);
+        $testmode = Utility::extractBool($testmode, 'testmode', false);
 
         $this->send((new DeleteCustomerRequest($id))->test($testmode));
     }
@@ -100,7 +100,7 @@ public function delete(string $id, $testmode = []): void
      */
     public function page(?string $from = null, ?int $limit = null, array $filters = []): CustomerCollection
     {
-        $testmode = Helpers::extractBool($filters, 'testmode', false);
+        $testmode = Utility::extractBool($filters, 'testmode', false);
 
         $query = PaginatedQueryFactory::new([
             'from' => $from,
@@ -120,7 +120,7 @@ public function page(?string $from = null, ?int $limit = null, array $filters =
      */
     public function iterator(?string $from = null, ?int $limit = null, array $filters = [], bool $iterateBackwards = false): LazyCollection
     {
-        $testmode = Helpers::extractBool($filters, 'testmode', false);
+        $testmode = Utility::extractBool($filters, 'testmode', false);
 
         $query = PaginatedQueryFactory::new([
             'from' => $from,

diff --git a/src/EndpointCollection/CustomerPaymentsEndpointCollection.php b/src/EndpointCollection/CustomerPaymentsEndpointCollection.php
@@ -5,8 +5,8 @@
 use Mollie\Api\Exceptions\ApiException;
 use Mollie\Api\Factories\CreatePaymentPayloadFactory;
 use Mollie\Api\Factories\GetPaginatedCustomerPaymentsQueryFactory;
-use Mollie\Api\Helpers;
-use Mollie\Api\Helpers\Arr;
+use Mollie\Api\Utils\Utility;
+use Mollie\Api\Utils\Arr;
 use Mollie\Api\Http\Data\CreatePaymentPayload;
 use Mollie\Api\Http\Data\CreatePaymentQuery;
 use Mollie\Api\Http\Requests\CreateCustomerPaymentRequest;
@@ -43,7 +43,7 @@ public function createFor(Customer $customer, $payload = [], $query = [], bool $
     public function createForId($customerId, $payload = [], $query = [], bool $testmode = false): Payment
     {
         if (! $payload instanceof CreatePaymentPayload) {
-            $testmode = Helpers::extractBool($payload, 'testmode', $testmode);
+            $testmode = Utility::extractBool($payload, 'testmode', $testmode);
             $payload = CreatePaymentPayloadFactory::new($payload)
                 ->create();
         }
@@ -73,7 +73,7 @@ public function pageFor(Customer $customer, ?string $from = null, ?int $limit =
      */
     public function pageForId(string $customerId, ?string $from = null, ?int $limit = null, array $filters = []): PaymentCollection
     {
-        $testmode = Helpers::extractBool($filters, 'testmode', false);
+        $testmode = Utility::extractBool($filters, 'testmode', false);
         $query = GetPaginatedCustomerPaymentsQueryFactory::new([
             'from' => $from,
             'limit' => $limit,
@@ -115,7 +115,7 @@ public function iteratorForId(
         array $filters = [],
         bool $iterateBackwards = false
     ): LazyCollection {
-        $testmode = Helpers::extractBool($filters, 'testmode', false);
+        $testmode = Utility::extractBool($filters, 'testmode', false);
         $query = GetPaginatedCustomerPaymentsQueryFactory::new([
             'from' => $from,
             'limit' => $limit,

diff --git a/src/EndpointCollection/MandateEndpointCollection.php b/src/EndpointCollection/MandateEndpointCollection.php
@@ -5,7 +5,7 @@
 use Mollie\Api\Exceptions\ApiException;
 use Mollie\Api\Factories\CreateMandatePayloadFactory;
 use Mollie\Api\Factories\PaginatedQueryFactory;
-use Mollie\Api\Helpers;
+use Mollie\Api\Utils\Utility;
 use Mollie\Api\Http\Data\CreateMandatePayload;
 use Mollie\Api\Http\Requests\CreateMandateRequest;
 use Mollie\Api\Http\Requests\GetMandateRequest;
@@ -40,7 +40,7 @@ public function createFor(Customer $customer, $payload = [], bool $testmode = fa
     public function createForId(string $customerId, $payload = [], bool $testmode = false): Mandate
     {
         if (! $payload instanceof CreateMandatePayload) {
-            $testmode = Helpers::extractBool($payload, 'testmode', $testmode);
+            $testmode = Utility::extractBool($payload, 'testmode', $testmode);
             $payload = CreateMandatePayloadFactory::new($payload)->create();
         }
 
@@ -68,7 +68,7 @@ public function getFor(Customer $customer, string $mandateId, array $parameters
      */
     public function getForId(string $customerId, string $mandateId, $testmode = []): Mandate
     {
-        $testmode = Helpers::extractBool($testmode, 'testmode', false);
+        $testmode = Utility::extractBool($testmode, 'testmode', false);
 
         /** @var Mandate */
         return $this->send((new GetMandateRequest($customerId, $mandateId))->test($testmode));
@@ -94,7 +94,7 @@ public function revokeFor(Customer $customer, string $mandateId, $data = []): vo
      */
     public function revokeForId(string $customerId, string $mandateId, $testmode = []): void
     {
-        $testmode = Helpers::extractBool($testmode, 'testmode', false);
+        $testmode = Utility::extractBool($testmode, 'testmode', false);
 
         $this->send((new RevokeMandateRequest($customerId, $mandateId))->test($testmode));
     }
@@ -120,7 +120,7 @@ public function pageFor(Customer $customer, ?string $from = null, ?int $limit =
      */
     public function pageForId(string $customerId, ?string $from = null, ?int $limit = null, array $filters = []): MandateCollection
     {
-        $testmode = Helpers::extractBool($filters, 'testmode', false);
+        $testmode = Utility::extractBool($filters, 'testmode', false);
         $query = PaginatedQueryFactory::new([
             'from' => $from,
             'limit' => $limit,
@@ -160,7 +160,7 @@ public function iteratorForId(
         array $filters = [],
         bool $iterateBackwards = false
     ): LazyCollection {
-        $testmode = Helpers::extractBool($filters, 'testmode', false);
+        $testmode = Utility::extractBool($filters, 'testmode', false);
         $query = PaginatedQueryFactory::new([
             'from' => $from,
             'limit' => $limit,

diff --git a/src/EndpointCollection/MethodEndpointCollection.php b/src/EndpointCollection/MethodEndpointCollection.php
@@ -6,7 +6,7 @@
 use Mollie\Api\Factories\GetAllPaymentMethodsQueryFactory;
 use Mollie\Api\Factories\GetEnabledPaymentMethodsQueryFactory;
 use Mollie\Api\Factories\GetPaymentMethodQueryFactory;
-use Mollie\Api\Helpers;
+use Mollie\Api\Utils\Utility;
 use Mollie\Api\Http\Data\GetAllMethodsQuery as GetAllPaymentMethodsQuery;
 use Mollie\Api\Http\Data\GetEnabledPaymentMethodsQuery;
 use Mollie\Api\Http\Data\GetPaymentMethodQuery;
@@ -47,7 +47,7 @@ public function all($query = []): MethodCollection
     public function allEnabled($query = [], bool $testmode = false): MethodCollection
     {
         if (! $query instanceof GetEnabledPaymentMethodsQuery) {
-            $testmode = Helpers::extractBool($query, 'testmode', $testmode);
+            $testmode = Utility::extractBool($query, 'testmode', $testmode);
             $query = GetEnabledPaymentMethodsQueryFactory::new($query)
                 ->create();
         }
@@ -76,7 +76,7 @@ public function allActive($query = [], ?bool $testmode = null): MethodCollection
     public function get(string $methodId, $query = [], bool $testmode = false): Method
     {
         if (! $query instanceof GetPaymentMethodQuery) {
-            $testmode = Helpers::extractBool($query, 'testmode', $testmode);
+            $testmode = Utility::extractBool($query, 'testmode', $testmode);
             $query = GetPaymentMethodQueryFactory::new($query)
                 ->create();
         }

diff --git a/src/EndpointCollection/OrganizationEndpointCollection.php b/src/EndpointCollection/OrganizationEndpointCollection.php
@@ -3,7 +3,7 @@
 namespace Mollie\Api\EndpointCollection;
 
 use Mollie\Api\Exceptions\ApiException;
-use Mollie\Api\Helpers;
+use Mollie\Api\Utils\Utility;
 use Mollie\Api\Http\Requests\GetOrganizationPartnerStatusRequest;
 use Mollie\Api\Http\Requests\GetOrganizationRequest;
 use Mollie\Api\Resources\Organization;
@@ -22,7 +22,7 @@ class OrganizationEndpointCollection extends EndpointCollection
      */
     public function get(string $id, $testmode = []): Organization
     {
-        $testmode = Helpers::extractBool($testmode, 'testmode', false);
+        $testmode = Utility::extractBool($testmode, 'testmode', false);
 
         /** @var Organization */
         return $this->send((new GetOrganizationRequest($id))->test($testmode));