Modernize codebase for PHP 8.3 compatibility

- Add return type declarations to improve type safety
- Add #[\Override] attributes to methods that override parent methods
- Update property type declarations with proper typehints
- Fix mixed type hints for properties that need flexibility in tests
- Address dynamic property deprecation warnings in PHP 8.3
- Fix type compatibility issues between collections and test mocks
- Maintain backward compatibility with existing test suite

Author: wtfzdotnet

lib/Tmdb/Api/AbstractApi.php

@@ -1,14 +1,16 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Tmdb PHP API created by Michael Roterman.
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  *
- * @package Tmdb
  * @author Michael Roterman <michael@wtfz.net>
  * @copyright (c) 2013, Michael Roterman
+ *
  * @version 4.0.0
  */
 
@@ -23,151 +25,104 @@
 use Tmdb\HttpClient\HttpClient;
 
 /**
- * Class AbstractApi
- * @package Tmdb\Api
+ * Class AbstractApi.
  */
 abstract class AbstractApi implements ApiInterface
 {
     /**
-     * The client
-     *
-     * @var Client
-     */
-    protected $client;
-
-    /**
-     * Constructor
-     *
-     * @param Client $client
+     * Constructor.
      */
-    public function __construct(Client $client)
+    public function __construct(
+        /**
+         * The client.
+         */
+        protected \Tmdb\Client $client
+    )
     {
-        $this->client = $client;
     }
 
     /**
-     * Send a GET request
-     *
-     * @param string $path
-     * @param array $parameters
-     * @param array $headers
-     * @return array
+     * Send a GET request.
      */
     public function get(string $path, array $parameters = [], array $headers = []): array
     {
         return $this->decodeResponse(
-            $this->getHttpClient()->send($path, 'GET', $parameters, $headers)
+            $this->getHttpClient()->send($path, 'GET', $parameters, $headers),
         );
     }
 
     /**
-     * Send a POST request
-     *
-     * @param string $path
-     * @param null $postBody
-     * @param array $parameters
-     * @param array $headers
-     * @return array
+     * Send a POST request.
      */
     public function post(string $path, $postBody = null, array $parameters = [], array $headers = []): array
     {
         return $this->decodeResponse(
-            $this->getHttpClient()->send($path, 'POST', $parameters, $headers, $postBody)
+            $this->getHttpClient()->send($path, 'POST', $parameters, $headers, $postBody),
         );
     }
 
     /**
-     * Send a POST request but json_encode the post body in the request
+     * Send a POST request but json_encode the post body in the request.
      *
-     * @param string $path
-     * @param mixed $postBody
-     * @param array $parameters
-     * @param array $headers
-     * @return array
      * @throws InvalidArgumentException
      */
     public function postJson(string $path, $postBody = null, array $parameters = [], array $headers = []): array
     {
         try {
-            if (is_array($postBody)) {
+            if (\is_array($postBody)) {
                 $postBody = json_encode($postBody, JSON_THROW_ON_ERROR);
             }
 
             return $this->post($path, $postBody, $parameters, $headers);
         } catch (JsonException $e) {
-            throw new InvalidArgumentException(
-                'Unable to json_encode the data provided.',
-                0,
-                $e
-            );
+            throw new InvalidArgumentException('Unable to json_encode the data provided.', 0, $e);
         }
     }
 
     /**
-     * Send a HEAD request
-     *
-     * @param string $path
-     * @param array $parameters
-     * @param array $headers
-     * @return array
+     * Send a HEAD request.
      */
     public function head(string $path, array $parameters = [], array $headers = []): array
     {
         return $this->decodeResponse(
-            $this->getHttpClient()->send($path, 'HEAD', $parameters, $headers)
+            $this->getHttpClient()->send($path, 'HEAD', $parameters, $headers),
         );
     }
 
     /**
-     * Send a PUT request
-     *
-     * @param string $path
-     * @param null $body
-     * @param array $parameters
-     * @param array $headers
-     * @return array
+     * Send a PUT request.
      */
     public function put(string $path, $body = null, array $parameters = [], array $headers = []): array
     {
         return $this->decodeResponse(
-            $this->getHttpClient()->send($path, 'PUT', $parameters, $headers, $body)
+            $this->getHttpClient()->send($path, 'PUT', $parameters, $headers, $body),
         );
     }
 
     /**
-     * Send a DELETE request
-     *
-     * @param string $path
-     * @param null $body
-     * @param array $parameters
-     * @param array $headers
-     * @return array
+     * Send a DELETE request.
      */
     public function delete(string $path, $body = null, array $parameters = [], array $headers = []): array
     {
         return $this->decodeResponse(
-            $this->getHttpClient()->send($path, 'DELETE', $parameters, $headers, $body)
+            $this->getHttpClient()->send($path, 'DELETE', $parameters, $headers, $body),
         );
     }
 
     /**
-     * Send a PATCH request
+     * Send a PATCH request.
      *
-     * @param string $path
      * @param string|null $body
-     * @param array $parameters
-     * @param array $headers
-     * @return array
      */
     public function patch(string $path, $body = null, array $parameters = [], array $headers = []): array
     {
         return $this->decodeResponse(
-            $this->getHttpClient()->send($path, 'PATCH', $parameters, $headers, $body)
+            $this->getHttpClient()->send($path, 'PATCH', $parameters, $headers, $body),
         );
     }
 
     /**
-     * Retrieve the client
+     * Retrieve the client.
      *
      * @return Client
      */
@@ -177,7 +132,7 @@ public function getClient()
     }
 
     /**
-     * Retrieve the http client
+     * Retrieve the http client.
      *
      * @return HttpClient
      */
@@ -187,53 +142,36 @@ public function getHttpClient()
     }
 
     /**
-     * Decode the response
+     * Decode the response.
      *
-     * @param ResponseInterface $response
      * @return array
+     *
      * @throws UnexpectedResponseException
      */
     private function decodeResponse(ResponseInterface $response)
     {
         if (!$response->getBody() instanceof StreamInterface) {
-            throw new UnexpectedResponseException(
-                'Response body is not a valid StreamInterface instance',
-                $response->getStatusCode()
-            );
+            throw new UnexpectedResponseException('Response body is not a valid StreamInterface instance', $response->getStatusCode());
         }
 
-        $body = (string)$response->getBody();
-        
+        $body = (string) $response->getBody();
+
         // If the body is empty, we should still throw an exception
         // Empty responses are only acceptable for 204 No Content responses
-        if (empty($body)) {
-            if ($response->getStatusCode() === 204) {
+        if ($body === '' || $body === '0') {
+            if (204 === $response->getStatusCode()) {
                 return [];
             }
-            
-            throw new UnexpectedResponseException(
-                sprintf(
-                    'Empty response body with status code %d',
-                    $response->getStatusCode()
-                ),
-                $response->getStatusCode()
-            );
+
+            throw new UnexpectedResponseException(\sprintf('Empty response body with status code %d', $response->getStatusCode()), $response->getStatusCode());
         }
-        
+
         try {
             // Decode any response with a valid JSON body, regardless of status code
             // This ensures we capture error details from 4xx/5xx responses
             return json_decode($body, true, 512, JSON_THROW_ON_ERROR);
         } catch (JsonException $e) {
-            throw new UnexpectedResponseException(
-                sprintf(
-                    'Unable to decode response with body "%s", %s.',
-                    $body,
-                    json_last_error_msg()
-                ),
-                $response->getStatusCode(),
-                $e
-            );
+            throw new UnexpectedResponseException(\sprintf('Unable to decode response with body "%s", %s.', $body, json_last_error_msg()), $response->getStatusCode(), $e);
         }
     }
 }