Merge pull request #137 from GW2Treasures/fix/paginated-endpoint-batc…

…h-signature-warning
GW2Treasures · Feb 7, 2024 · c4770ca · c4770ca
2 parents 44859f9 + 86ca0ac
commit c4770ca
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 3 deletions.
diff --git a/src/Exception/ApiException.php b/src/Exception/ApiException.php
@@ -9,7 +9,7 @@ class ApiException extends Exception {
     /** @var ResponseInterface $response */
     protected $response;
 
-    public function __construct( $message = "", ResponseInterface $response ) {
+    public function __construct( $message, ResponseInterface $response ) {
         $this->response = $response;
 
         parent::__construct( $message, $response->getStatusCode() );

diff --git a/src/V2/Pagination/IPaginatedEndpoint.php b/src/V2/Pagination/IPaginatedEndpoint.php
@@ -30,5 +30,5 @@ function page( $page, $size = null );
      * @param callable $callback
      * @return void
      */
-    function batch( $parallelRequests = null, callable $callback );
+    function batch( $parallelRequests, $callback = null );
 }
diff --git a/src/V2/Pagination/PaginatedEndpoint.php b/src/V2/Pagination/PaginatedEndpoint.php
@@ -81,7 +81,7 @@ public function page( $page, $size = null ) {
      * @param callable $callback
      * @return void
      */
-    public function batch( $parallelRequests = null, callable $callback = null ) {
+    public function batch( $parallelRequests, $callback = null ) {
         /** @noinspection PhpParamsInspection */
         if( !isset( $callback ) && is_callable( $parallelRequests )) {
             $callback = $parallelRequests;

diff --git a/tests/Stubs/BulkEndpointStub.php b/tests/Stubs/BulkEndpointStub.php
@@ -8,6 +8,12 @@
 
 class BulkEndpointStub extends EndpointStub implements IBulkEndpoint {
     use BulkEndpoint;
+
+    /** @var bool $supportsIdsAll */
+    protected $supportsIdsAll = false;
+
+    /** @var int $maxPageSize */
+    protected $maxPageSize = false;
 
     public function __construct( GW2Api $api, $supportsIdsAll, $maxPageSize ) {
         $this->supportsIdsAll = $supportsIdsAll;

diff --git a/tests/Stubs/PaginatedEndpointStub.php b/tests/Stubs/PaginatedEndpointStub.php
@@ -9,6 +9,9 @@
 class PaginatedEndpointStub extends EndpointStub implements IPaginatedEndpoint {
     use PaginatedEndpoint;
 
+    /** @var int $maxPageSize */
+    protected $maxPageSize = false;
+
     public function __construct(  GW2Api $api, $maxPageSize = 10 ) {
         parent::__construct( $api );