Merge pull request #43 from sunrise-php/release/v3.4.2

v3.4.2
sunrise-php · Feb 20, 2025 · 75aa45d · 75aa45d
2 parents c11998a + c877a8c
commit 75aa45d
Show file tree

Hide file tree

Showing 8 changed files with 144 additions and 131 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -11,5 +11,5 @@ indent_size = 4
 trim_trailing_whitespace = true
 insert_final_newline = true
 
-[*.yml]
+[*{.json,.xml,.xml.dist,.yml}]
 indent_size = 2
diff --git a/.scrutinizer.yml b/.scrutinizer.yml
@@ -3,34 +3,46 @@ build:
   nodes:
     analysis:
       environment:
-        php: 8.2
+        php: 8.3.16
       tests:
         override:
           - php-scrutinizer-run
     coverage:
       environment:
-        php: 8.2
+        php: 8.3.16
       tests:
         override:
           - command: XDEBUG_MODE=coverage php vendor/bin/phpunit --coverage-clover coverage.xml
             coverage:
               file: coverage.xml
               format: clover
+    php83:
+      environment:
+        php: 8.3.16
+      tests:
+        override:
+          - command: php vendor/bin/phpunit
+    php82:
+      environment:
+        php: 8.2.27
+      tests:
+        override:
+          - command: php vendor/bin/phpunit
     php81:
       environment:
-        php: 8.1
+        php: 8.1.31
       tests:
         override:
           - command: php vendor/bin/phpunit
     php80:
       environment:
-        php: 8.0
+        php: 8.0.30
       tests:
         override:
           - command: php vendor/bin/phpunit
     php74:
       environment:
-        php: 7.4
+        php: 7.4.33
       tests:
         override:
           - command: php vendor/bin/phpunit
diff --git a/composer.json b/composer.json
@@ -1,86 +1,85 @@
 {
-    "name": "sunrise/http-message",
-    "homepage": "https://github.com/sunrise-php/http-message",
-    "description": "HTTP message wrapper for PHP 7.4+ based on RFC-7230, PSR-7 and PSR-17",
-    "license": "MIT",
-    "keywords": [
-        "fenric",
-        "sunrise",
-        "http",
-        "header",
-        "message",
-        "request",
-        "response",
-        "stream",
-        "uri",
-        "upload",
-        "rfc-7230",
-        "psr-7",
-        "psr-17"
-    ],
-    "authors": [
-        {
-            "name": "Anatoly Nekhay",
-            "email": "afenric@gmail.com",
-            "homepage": "https://github.com/fenric"
-        }
+  "name": "sunrise/http-message",
+  "homepage": "https://github.com/sunrise-php/http-message",
+  "description": "HTTP message implementation for PHP 7.4+ based on RFC-7230, PSR-7 and PSR-17.",
+  "license": "MIT",
+  "keywords": [
+    "fenric",
+    "sunrise",
+    "http",
+    "header",
+    "message",
+    "request",
+    "response",
+    "stream",
+    "uri",
+    "upload",
+    "rfc-7230",
+    "psr-7",
+    "psr-17"
+  ],
+  "authors": [
+    {
+      "name": "Anatoly Nekhay",
+      "email": "afenric@gmail.com",
+      "homepage": "https://github.com/fenric"
+    }
+  ],
+  "provide": {
+    "psr/http-message-implementation": "1.0",
+    "psr/http-factory-implementation": "1.0"
+  },
+  "require": {
+    "php": ">=7.4",
+    "fig/http-message-util": "^1.1",
+    "psr/http-factory": "^1.0",
+    "psr/http-message": "^1.0"
+  },
+  "require-dev": {
+    "php-di/php-di": "^6.4 || ^7.0",
+    "php-http/psr7-integration-tests": "^1.4",
+    "phpstan/phpstan": "^2.1",
+    "phpunit/phpunit": "^9.6",
+    "sunrise/coding-standard": "^1.0",
+    "vimeo/psalm": "^5.26 || ^6.0"
+  },
+  "autoload": {
+    "files": [
+      "functions/server_request_files.php",
+      "functions/server_request_headers.php",
+      "functions/server_request_method.php",
+      "functions/server_request_protocol_version.php",
+      "functions/server_request_uri.php"
     ],
-    "provide": {
-        "psr/http-message-implementation": "1.0",
-        "psr/http-factory-implementation": "1.0"
-    },
-    "require": {
-        "php": ">=7.4",
-        "fig/http-message-util": "^1.1",
-        "psr/http-factory": "^1.0",
-        "psr/http-message": "^1.0"
-    },
-    "require-dev": {
-        "php-di/php-di": "^6.4 || ^7.0",
-        "php-http/psr7-integration-tests": "^1.4",
-        "phpstan/phpstan": "^2.1",
-        "phpunit/phpunit": "^9.6",
-        "sunrise/coding-standard": "^1.0",
-        "vimeo/psalm": "^5.26 || ^6.0"
-    },
-    "autoload": {
-        "files": [
-            "functions/server_request_files.php",
-            "functions/server_request_headers.php",
-            "functions/server_request_method.php",
-            "functions/server_request_protocol_version.php",
-            "functions/server_request_uri.php"
-        ],
-        "psr-4": {
-            "Sunrise\\Http\\Message\\": "src/"
-        }
-    },
-    "autoload-dev": {
-        "psr-4": {
-            "Sunrise\\Http\\Message\\Tests\\": "tests/"
-        }
-    },
-    "scripts": {
-        "phpcs": "@php phpcs --colors",
-        "psalm": "@php psalm --no-cache",
-        "phpstan": "@php phpstan analyse src --level=9 --memory-limit=-1",
-        "phpunit": "@php phpunit --colors=always",
-        "test": [
-            "@phpcs",
-            "@psalm",
-            "@phpstan",
-            "@phpunit"
-        ]
-    },
-    "conflict": {
-        "sunrise/http-factory": "*",
-        "sunrise/http-header": "*",
-        "sunrise/http-header-kit": "*",
-        "sunrise/http-server-request": "*",
-        "sunrise/stream": "*",
-        "sunrise/uri": "*"
-    },
-    "config": {
-        "sort-packages": true
+    "psr-4": {
+      "Sunrise\\Http\\Message\\": "src/"
+    }
+  },
+  "autoload-dev": {
+    "psr-4": {
+      "Sunrise\\Http\\Message\\Tests\\": "tests/"
     }
+  },
+  "scripts": {
+    "phpcs": "@php phpcs --colors",
+    "psalm": "@php psalm --no-cache",
+    "phpstan": "@php phpstan analyse src --level=9 --memory-limit=-1",
+    "phpunit": "@php phpunit --colors=always",
+    "test": [
+      "@phpcs",
+      "@psalm",
+      "@phpstan",
+      "@phpunit"
+    ]
+  },
+  "conflict": {
+    "sunrise/http-factory": "*",
+    "sunrise/http-header": "*",
+    "sunrise/http-server-request": "*",
+    "sunrise/stream": "*",
+    "sunrise/uri": "*"
+  },
+  "config": {
+    "sort-packages": true
+  }
 }
diff --git a/phpcs.xml.dist b/phpcs.xml.dist
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <ruleset name="Sunrise Coding Standard">
-    <rule ref="./vendor/sunrise/coding-standard/ruleset.xml"/>
+  <rule ref="./vendor/sunrise/coding-standard/ruleset.xml"/>
 
-    <file>functions</file>
-    <file>src</file>
-    <file>tests</file>
+  <file>functions</file>
+  <file>src</file>
+  <file>tests</file>
 </ruleset>
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,25 +1,25 @@
 <?xml version="1.0"?>
 <phpunit
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd"
 >
-    <coverage>
-        <include>
-            <directory>./functions</directory>
-            <directory>./src</directory>
-        </include>
-    </coverage>
-    <testsuites>
-        <testsuite name="sunrise/http-message">
-            <directory>./tests/</directory>
-        </testsuite>
-    </testsuites>
-    <php>
-        <const name="REQUEST_FACTORY" value="Sunrise\Http\Message\RequestFactory" />
-        <const name="RESPONSE_FACTORY" value="Sunrise\Http\Message\ResponseFactory" />
-        <const name="SERVER_REQUEST_FACTORY" value="Sunrise\Http\Message\ServerRequestFactory" />
-        <const name="STREAM_FACTORY" value="Sunrise\Http\Message\StreamFactory" />
-        <const name="UPLOADED_FILE_FACTORY" value="Sunrise\Http\Message\UploadedFileFactory" />
-        <const name="URI_FACTORY" value="Sunrise\Http\Message\UriFactory" />
-    </php>
+  <coverage>
+    <include>
+      <directory>./functions</directory>
+      <directory>./src</directory>
+    </include>
+  </coverage>
+  <testsuites>
+    <testsuite name="sunrise/http-message">
+      <directory>./tests/</directory>
+    </testsuite>
+  </testsuites>
+  <php>
+    <const name="REQUEST_FACTORY" value="Sunrise\Http\Message\RequestFactory" />
+    <const name="RESPONSE_FACTORY" value="Sunrise\Http\Message\ResponseFactory" />
+    <const name="SERVER_REQUEST_FACTORY" value="Sunrise\Http\Message\ServerRequestFactory" />
+    <const name="STREAM_FACTORY" value="Sunrise\Http\Message\StreamFactory" />
+    <const name="UPLOADED_FILE_FACTORY" value="Sunrise\Http\Message\UploadedFileFactory" />
+    <const name="URI_FACTORY" value="Sunrise\Http\Message\UriFactory" />
+  </php>
 </phpunit>
diff --git a/psalm.xml.dist b/psalm.xml.dist
@@ -1,21 +1,23 @@
 <?xml version="1.0"?>
 <psalm
-    errorLevel="1"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns="https://getpsalm.org/schema/config"
-    xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
-    phpVersion="7.4"
+  errorLevel="1"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xmlns="https://getpsalm.org/schema/config"
+  xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
+  phpVersion="7.4"
 >
-    <projectFiles>
-        <directory name="src" />
-        <ignoreFiles>
-            <directory name="vendor" />
-        </ignoreFiles>
-    </projectFiles>
+  <projectFiles>
+    <directory name="src" />
+    <ignoreFiles>
+      <directory name="vendor" />
+    </ignoreFiles>
+  </projectFiles>
 
-    <issueHandlers>
-        <PossiblyUnusedMethod errorLevel="suppress" />
-        <PossiblyUnusedReturnValue errorLevel="suppress" />
-        <UnusedClass errorLevel="suppress" />
-    </issueHandlers>
+  <issueHandlers>
+    <ClassMustBeFinal errorLevel="suppress" />
+    <MissingOverrideAttribute errorLevel="suppress" />
+    <PossiblyUnusedMethod errorLevel="suppress" />
+    <PossiblyUnusedReturnValue errorLevel="suppress" />
+    <UnusedClass errorLevel="suppress" />
+  </issueHandlers>
 </psalm>
diff --git a/src/Request.php b/src/Request.php
@@ -170,7 +170,7 @@ final protected function setUri($uri, $preserveHost = false): void
 
         $port = $this->uri->getPort();
         if ($port !== null) {
-            $host .= ':' . $port;
+            $host .= ':' . (string) $port;
         }
 
         $this->setHeader('Host', $host, true);

diff --git a/src/Uri.php b/src/Uri.php
@@ -235,7 +235,7 @@ public function getAuthority(): string
 
         $port = $this->getPort();
         if ($port !== null) {
-            $authority = $authority . ':' . $port;
+            $authority = $authority . ':' . (string) $port;
         }
 
         return $authority;