Added parameter and response types to support php 8.1 (#14)

Author: satalaondrej

.gitignore

@@ -1,3 +1,4 @@
 # Ignore files created by composer.
 composer.lock
 vendor/
+.idea

README.md

@@ -12,7 +12,7 @@ Dependencies
 ------------
 
  * Composer
- * PHP 5.4 or greater
+ * PHP 8.1
  * cURL with NTLM support (7.23.0+ recommended)
 
 Installation

composer.json

@@ -10,7 +10,7 @@
   ],
   "prefer-stable": true,
   "require": {
-    "php": ">=5.3.9",
+    "php": ">=8.1",
     "ext-soap": "*",
     "ext-curl": "*"
   },

src/SoapClient.php

@@ -1,10 +1,13 @@
 <?php
+declare(strict_types=1);
 /**
- * Contains \JamesIArmes\PhpNtlm\NTLMSoapClient.
+ * Contains \JamesIArmes\PhpNtlm\NTLMSoapClient
  */
 
 namespace jamesiarmes\PhpNtlm;
 
+use CurlHandle;
+
 /**
  * Soap Client using Microsoft's NTLM Authentication.
  *
@@ -15,18 +18,27 @@ class SoapClient extends \SoapClient
     /**
      * cURL resource used to make the SOAP request
      *
-     * @var resource
+     * @var resource|false|CurlHandle
      */
     protected $ch;
 
     /**
      * Options passed to the client constructor.
-     *
-     * @var array
      */
-    protected $options;
+    protected array $options;
 
-    /**
+	private string $__last_request;
+
+	/**
+	 * @var string[]
+	 */
+	private array $__last_request_headers;
+
+	private string|false $__last_response;
+
+	private string|false $__last_response_headers;
+
+	/**
      * {@inheritdoc}
      *
      * Additional options:
@@ -43,7 +55,7 @@ class SoapClient extends \SoapClient
      *   characters are stripped. This has no affect unless strip_bad_chars is
      *   true.
      */
-    public function __construct($wsdl, array $options = [])
+    public function __construct(?string $wsdl, array $options = [])
     {
         // Set missing indexes to their default value.
         $options += array(
@@ -68,8 +80,8 @@ public function __construct($wsdl, array $options = [])
     /**
      * {@inheritdoc}
      */
-    public function __doRequest($request, $location, $action, $version, $one_way = 0)
-    {
+    public function __doRequest(string $request, string $location, string $action, int $version, bool $oneWay = false): ?string
+	{
         $headers = $this->buildHeaders($action);
         $this->__last_request = $request;
         $this->__last_request_headers = $headers;
@@ -103,21 +115,19 @@ public function __doRequest($request, $location, $action, $version, $one_way = 0
     /**
      * {@inheritdoc}
      */
-    public function __getLastRequestHeaders()
-    {
+    public function __getLastRequestHeaders(): ?string
+	{
         return implode("\n", $this->__last_request_headers) . "\n";
     }
 
     /**
      * Returns the response code from the last request
      *
-     * @return integer
-     *
      * @throws \BadMethodCallException
      *   If no cURL resource has been initialized.
      */
-    public function getResponseCode()
-    {
+    public function getResponseCode(): int
+	{
         if (empty($this->ch)) {
             throw new \BadMethodCallException('No cURL resource has been '
                 . 'initialized. This is probably because no request has not '
@@ -129,12 +139,9 @@ public function getResponseCode()
 
     /**
      * Builds the headers for the request.
-     *
-     * @param string $action
-     *   The SOAP action to be performed.
      */
-    protected function buildHeaders($action)
-    {
+    protected function buildHeaders(string $action): array
+	{
         return array(
             'Method: POST',
             'Connection: Keep-Alive',
@@ -178,16 +185,9 @@ protected function cleanResponse()
 
     /**
      * Builds an array of curl options for the request
-     *
-     * @param string $action
-     *   The SOAP action to be performed.
-     * @param string $request
-     *   The XML SOAP request.
-     * @return array
-     *   Array of curl options.
      */
-    protected function curlOptions($action, $request)
-    {
+    protected function curlOptions(string $action, string $request): array
+	{
         $options = $this->options['curlopts'] + array(
             CURLOPT_SSL_VERIFYPEER => true,
             CURLOPT_RETURNTRANSFER => true,
@@ -212,7 +212,7 @@ protected function curlOptions($action, $request)
      * @param string $response
      *   The response from the cURL request, including headers and body.
      */
-    public function parseResponse($response)
+    public function parseResponse(string $response)
     {
         // Parse the response and set the last response and headers.
         $info = curl_getinfo($this->ch);