Merge pull request #280 from phil-davis/php82

chore: drop PHP 7.4 8.0 8.1 support PHP 8.2 up

Author: phil-davis

.github/workflows/ci.yml

@@ -12,13 +12,13 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-versions: ['8.0', '8.1', '8.2', '8.3','8.4']
+        php-versions: ['8.3','8.4']
         coverage: ['xdebug']
         code-style: ['no']
         code-analysis: ['no']
         rector-check: ['no']
         include:
-          - php-versions: '7.4'
+          - php-versions: '8.2'
             coverage: 'xdebug'
             code-style: 'yes'
             code-analysis: 'yes'
@@ -73,5 +73,5 @@ jobs:
         run: vendor/bin/phpunit --configuration tests/phpunit.xml --coverage-clover clover.xml
 
       - name: Code Coverage
-        uses: codecov/codecov-action@v5
+        uses: codecov/codecov-action@v6
         if: matrix.coverage != 'none'

.gitignore

@@ -4,6 +4,7 @@ composer.lock
 
 # Tests
 tests/cov/
-.phpunit.result.cache
+tests/.phpunit.cache
+tests/.phpunit.result.cache
 .php_cs.cache
 .php-cs-fixer.cache

composer.json

@@ -5,7 +5,7 @@
     "homepage" : "https://github.com/fruux/sabre-http",
     "license" : "BSD-3-Clause",
     "require" : {
-        "php"          : "^7.4 || ^8.0",
+        "php"          : "^8.2",
         "ext-mbstring" : "*",
         "ext-ctype"    : "*",
         "ext-curl"     : "*",
@@ -18,7 +18,7 @@
         "phpstan/phpstan-phpunit": "^2.0",
         "phpstan/phpstan-strict-rules": "^2.0",
         "phpstan/extension-installer": "^1.4",
-        "phpunit/phpunit" : "^9.6",
+        "phpunit/phpunit" : "^10.5",
         "rector/rector": "^2.4"
     },
     "suggest" : {
@@ -74,6 +74,9 @@
     "config": {
         "allow-plugins": {
             "phpstan/extension-installer": true
+        },
+        "platform": {
+            "php": "8.2"
         }
     }
 }

lib/Auth/AWS.php

@@ -179,7 +179,7 @@ protected function getAmzHeaders(): string
         $amzHeaders = [];
         $headers = $this->request->getHeaders();
         foreach ($headers as $headerName => $headerValue) {
-            if (0 === strpos(strtolower($headerName), 'x-amz-')) {
+            if (str_starts_with(strtolower($headerName), 'x-amz-')) {
                 $amzHeaders[strtolower($headerName)] = str_replace(["\r\n"], [' '], $headerValue[0])."\n";
             }
         }

lib/Auth/AbstractAuth.php

@@ -18,29 +18,23 @@
  */
 abstract class AbstractAuth
 {
-    /**
-     * Authentication realm.
-     */
-    protected string $realm;
-
-    /**
-     * Request object.
-     */
-    protected RequestInterface $request;
-
-    /**
-     * Response object.
-     */
-    protected ResponseInterface $response;
-
     /**
      * Creates the object.
      */
-    public function __construct(string $realm, RequestInterface $request, ResponseInterface $response)
-    {
-        $this->realm = $realm;
-        $this->request = $request;
-        $this->response = $response;
+    public function __construct(
+        /**
+         * Authentication realm.
+         */
+        protected string $realm,
+        /**
+         * Request object.
+         */
+        protected RequestInterface $request,
+        /**
+         * Response object.
+         */
+        protected ResponseInterface $response,
+    ) {
     }
 
     /**

lib/Client.php

@@ -74,15 +74,15 @@ public function __construct()
     {
         // See https://github.com/sabre-io/http/pull/115#discussion_r241292068
         // Preserve compatibility for sub-classes that implement their own method `parseCurlResult`
-        $separatedHeaders = self::class === get_class($this);
+        $separatedHeaders = self::class === static::class;
 
         $this->curlSettings = [
             CURLOPT_RETURNTRANSFER => true,
             CURLOPT_NOBODY => false,
             CURLOPT_USERAGENT => 'sabre-http/'.Version::VERSION.' (http://sabre.io/)',
         ];
         if ($separatedHeaders) {
-            $this->curlSettings[CURLOPT_HEADERFUNCTION] = [$this, 'receiveCurlHeader'];
+            $this->curlSettings[CURLOPT_HEADERFUNCTION] = $this->receiveCurlHeader(...);
         } else {
             $this->curlSettings[CURLOPT_HEADER] = true;
         }

lib/ClientHttpException.php

@@ -16,18 +16,15 @@
  */
 class ClientHttpException extends \Exception implements HttpException
 {
-    /**
-     * Response object.
-     */
-    protected ResponseInterface $response;
-
     /**
      * Constructor.
      */
-    public function __construct(ResponseInterface $response)
+    public function __construct(/**
+     * Response object.
+     */
+        protected ResponseInterface $response)
     {
-        $this->response = $response;
-        parent::__construct($response->getStatusText(), $response->getStatus());
+        parent::__construct($this->response->getStatusText(), $this->response->getStatus());
     }
 
     /**

lib/Request.php

@@ -171,7 +171,7 @@ public function getPath(): string
         $uri = Uri\normalize($uri);
         $baseUri = Uri\normalize($this->getBaseUrl());
 
-        if (0 === strpos($uri, $baseUri)) {
+        if (str_starts_with($uri, $baseUri)) {
             // We're not interested in the query part (everything after the ?).
             [$uri] = explode('?', $uri);
 
@@ -260,7 +260,7 @@ public function __toString(): string
         foreach ($this->getHeaders() as $key => $value) {
             foreach ($value as $v) {
                 if ('Authorization' === $key) {
-                    [$v] = explode(' ', $v, 2);
+                    [$v] = explode(' ', (string) $v, 2);
                     $v .= ' REDACTED';
                 }
                 $out .= $key.': '.$v."\r\n";

lib/RequestDecorator.php

@@ -17,19 +17,18 @@
 class RequestDecorator implements RequestInterface
 {
     use MessageDecoratorTrait;
-    /**
-     * The inner request object.
-     *
-     * All method calls will be forwarded here.
-     */
-    protected RequestInterface $inner;
 
     /**
      * Constructor.
      */
-    public function __construct(RequestInterface $inner)
-    {
-        $this->inner = $inner;
+    public function __construct(
+        /**
+         * The inner request object.
+         *
+         * All method calls will be forwarded here.
+         */
+        protected RequestInterface $inner,
+    ) {
     }
 
     /**

lib/ResponseDecorator.php

@@ -17,19 +17,18 @@
 class ResponseDecorator implements ResponseInterface
 {
     use MessageDecoratorTrait;
-    /**
-     * The inner request object.
-     *
-     * All method calls will be forwarded here.
-     */
-    protected ResponseInterface $inner;
 
     /**
      * Constructor.
      */
-    public function __construct(ResponseInterface $inner)
-    {
-        $this->inner = $inner;
+    public function __construct(
+        /**
+         * The inner request object.
+         *
+         * All method calls will be forwarded here.
+         */
+        protected ResponseInterface $inner,
+    ) {
     }
 
     /**