From cf8ffb9c692fe898661a35fcba4c2e51ff3ce4ac Mon Sep 17 00:00:00 2001
From: Aleksei Khudiakov <aleksey@xerkus.pro>
Date: Tue, 2 May 2023 02:34:31 +1000
Subject: [PATCH 1/3] Drop legacy helper functions in Zend namespace

Signed-off-by: Aleksei Khudiakov <aleksey@xerkus.pro>
---
 composer.json                                 | 10 +----
 psalm-baseline.xml                            | 42 -------------------
 src/functions/create_uploaded_file.legacy.php | 18 --------
 .../marshal_headers_from_sapi.legacy.php      | 16 -------
 .../marshal_method_from_sapi.legacy.php       | 16 -------
 ...shal_protocol_version_from_sapi.legacy.php | 16 -------
 .../marshal_uri_from_sapi.legacy.php          | 18 --------
 src/functions/normalize_server.legacy.php     | 16 -------
 .../normalize_uploaded_files.legacy.php       | 16 -------
 src/functions/parse_cookie_header.legacy.php  | 19 ---------
 10 files changed, 1 insertion(+), 186 deletions(-)
 delete mode 100644 src/functions/create_uploaded_file.legacy.php
 delete mode 100644 src/functions/marshal_headers_from_sapi.legacy.php
 delete mode 100644 src/functions/marshal_method_from_sapi.legacy.php
 delete mode 100644 src/functions/marshal_protocol_version_from_sapi.legacy.php
 delete mode 100644 src/functions/marshal_uri_from_sapi.legacy.php
 delete mode 100644 src/functions/normalize_server.legacy.php
 delete mode 100644 src/functions/normalize_uploaded_files.legacy.php
 delete mode 100644 src/functions/parse_cookie_header.legacy.php

diff --git a/composer.json b/composer.json
index b0c7a482..2a4fdcec 100644
--- a/composer.json
+++ b/composer.json
@@ -66,15 +66,7 @@
             "src/functions/marshal_uri_from_sapi.php",
             "src/functions/normalize_server.php",
             "src/functions/normalize_uploaded_files.php",
-            "src/functions/parse_cookie_header.php",
-            "src/functions/create_uploaded_file.legacy.php",
-            "src/functions/marshal_headers_from_sapi.legacy.php",
-            "src/functions/marshal_method_from_sapi.legacy.php",
-            "src/functions/marshal_protocol_version_from_sapi.legacy.php",
-            "src/functions/marshal_uri_from_sapi.legacy.php",
-            "src/functions/normalize_server.legacy.php",
-            "src/functions/normalize_uploaded_files.legacy.php",
-            "src/functions/parse_cookie_header.legacy.php"
+            "src/functions/parse_cookie_header.php"
         ],
         "psr-4": {
             "Laminas\\Diactoros\\": "src/"
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
index 23ba42ad..90d56ad1 100644
--- a/psalm-baseline.xml
+++ b/psalm-baseline.xml
@@ -276,11 +276,6 @@
       <code>parseUri</code>
     </UnusedMethodCall>
   </file>
-  <file src="src/functions/create_uploaded_file.legacy.php">
-    <MixedArgument>
-      <code>func_get_args()</code>
-    </MixedArgument>
-  </file>
   <file src="src/functions/create_uploaded_file.php">
     <MixedArgument>
       <code><![CDATA[$spec['error']]]></code>
@@ -289,11 +284,6 @@
       <code><![CDATA[$spec['type'] ?? null]]></code>
     </MixedArgument>
   </file>
-  <file src="src/functions/marshal_headers_from_sapi.legacy.php">
-    <MixedArgument>
-      <code>func_get_args()</code>
-    </MixedArgument>
-  </file>
   <file src="src/functions/marshal_headers_from_sapi.php">
     <MixedAssignment>
       <code>$headers[$name]</code>
@@ -301,11 +291,6 @@
       <code>$value</code>
     </MixedAssignment>
   </file>
-  <file src="src/functions/marshal_method_from_sapi.legacy.php">
-    <MixedArgument>
-      <code>func_get_args()</code>
-    </MixedArgument>
-  </file>
   <file src="src/functions/marshal_method_from_sapi.php">
     <MixedInferredReturnType>
       <code>string</code>
@@ -315,22 +300,11 @@
       <code><![CDATA[$server['REQUEST_METHOD'] ?? 'GET']]></code>
     </MixedReturnStatement>
   </file>
-  <file src="src/functions/marshal_protocol_version_from_sapi.legacy.php">
-    <MixedArgument>
-      <code>func_get_args()</code>
-    </MixedArgument>
-  </file>
   <file src="src/functions/marshal_protocol_version_from_sapi.php">
     <MixedArgument>
       <code><![CDATA[$server['SERVER_PROTOCOL']]]></code>
     </MixedArgument>
   </file>
-  <file src="src/functions/marshal_uri_from_sapi.legacy.php">
-    <MixedArgument>
-      <code>func_get_args()</code>
-      <code>func_get_args()</code>
-    </MixedArgument>
-  </file>
   <file src="src/functions/marshal_uri_from_sapi.php">
     <MissingClosureParamType>
       <code>$default</code>
@@ -377,12 +351,6 @@
       <code><![CDATA[strrpos($host, ':')]]></code>
     </PossiblyFalseOperand>
   </file>
-  <file src="src/functions/normalize_server.legacy.php">
-    <MixedArgument>
-      <code>func_get_args()</code>
-      <code>func_get_args()</code>
-    </MixedArgument>
-  </file>
   <file src="src/functions/normalize_server.php">
     <MixedArrayAccess>
       <code><![CDATA[$apacheRequestHeaders['Authorization']]]></code>
@@ -394,11 +362,6 @@
       <code><![CDATA[$server['HTTP_AUTHORIZATION']]]></code>
     </MixedAssignment>
   </file>
-  <file src="src/functions/normalize_uploaded_files.legacy.php">
-    <MixedArgument>
-      <code>func_get_args()</code>
-    </MixedArgument>
-  </file>
   <file src="src/functions/normalize_uploaded_files.php">
     <InvalidReturnStatement>
       <code>$normalized</code>
@@ -440,11 +403,6 @@
         )]]></code>
     </MixedReturnStatement>
   </file>
-  <file src="src/functions/parse_cookie_header.legacy.php">
-    <MixedArgument>
-      <code>func_get_args()</code>
-    </MixedArgument>
-  </file>
   <file src="src/functions/parse_cookie_header.php">
     <LessSpecificReturnStatement>
       <code>$cookies</code>
diff --git a/src/functions/create_uploaded_file.legacy.php b/src/functions/create_uploaded_file.legacy.php
deleted file mode 100644
index fff753ff..00000000
--- a/src/functions/create_uploaded_file.legacy.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Zend\Diactoros;
-
-use Laminas\Diactoros\UploadedFile;
-
-use function func_get_args;
-use function Laminas\Diactoros\createUploadedFile as laminas_createUploadedFile;
-
-/**
- * @deprecated Use Laminas\Diactoros\createUploadedFile instead
- */
-function createUploadedFile(array $spec): UploadedFile
-{
-    return laminas_createUploadedFile(...func_get_args());
-}
diff --git a/src/functions/marshal_headers_from_sapi.legacy.php b/src/functions/marshal_headers_from_sapi.legacy.php
deleted file mode 100644
index 372ad292..00000000
--- a/src/functions/marshal_headers_from_sapi.legacy.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Zend\Diactoros;
-
-use function func_get_args;
-use function Laminas\Diactoros\marshalHeadersFromSapi as laminas_marshalHeadersFromSapi;
-
-/**
- * @deprecated Use Laminas\Diactoros\marshalHeadersFromSapi instead
- */
-function marshalHeadersFromSapi(array $server): array
-{
-    return laminas_marshalHeadersFromSapi(...func_get_args());
-}
diff --git a/src/functions/marshal_method_from_sapi.legacy.php b/src/functions/marshal_method_from_sapi.legacy.php
deleted file mode 100644
index 2eb83d97..00000000
--- a/src/functions/marshal_method_from_sapi.legacy.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Zend\Diactoros;
-
-use function func_get_args;
-use function Laminas\Diactoros\marshalMethodFromSapi as laminas_marshalMethodFromSapi;
-
-/**
- * @deprecated Use Laminas\Diactoros\marshalMethodFromSapi instead
- */
-function marshalMethodFromSapi(array $server): string
-{
-    return laminas_marshalMethodFromSapi(...func_get_args());
-}
diff --git a/src/functions/marshal_protocol_version_from_sapi.legacy.php b/src/functions/marshal_protocol_version_from_sapi.legacy.php
deleted file mode 100644
index 2c69d6db..00000000
--- a/src/functions/marshal_protocol_version_from_sapi.legacy.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Zend\Diactoros;
-
-use function func_get_args;
-use function Laminas\Diactoros\marshalProtocolVersionFromSapi as laminas_marshalProtocolVersionFromSapi;
-
-/**
- * @deprecated Use Laminas\Diactoros\marshalProtocolVersionFromSapi instead
- */
-function marshalProtocolVersionFromSapi(array $server): string
-{
-    return laminas_marshalProtocolVersionFromSapi(...func_get_args());
-}
diff --git a/src/functions/marshal_uri_from_sapi.legacy.php b/src/functions/marshal_uri_from_sapi.legacy.php
deleted file mode 100644
index 43fff2a8..00000000
--- a/src/functions/marshal_uri_from_sapi.legacy.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Zend\Diactoros;
-
-use Laminas\Diactoros\Uri;
-
-use function func_get_args;
-use function Laminas\Diactoros\marshalUriFromSapi as laminas_marshalUriFromSapi;
-
-/**
- * @deprecated Use Laminas\Diactoros\marshalUriFromSapi instead
- */
-function marshalUriFromSapi(array $server, array $headers): Uri
-{
-    return laminas_marshalUriFromSapi(...func_get_args());
-}
diff --git a/src/functions/normalize_server.legacy.php b/src/functions/normalize_server.legacy.php
deleted file mode 100644
index b355c4d8..00000000
--- a/src/functions/normalize_server.legacy.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Zend\Diactoros;
-
-use function func_get_args;
-use function Laminas\Diactoros\normalizeServer as laminas_normalizeServer;
-
-/**
- * @deprecated Use Laminas\Diactoros\normalizeServer instead
- */
-function normalizeServer(array $server, ?callable $apacheRequestHeaderCallback = null): array
-{
-    return laminas_normalizeServer(...func_get_args());
-}
diff --git a/src/functions/normalize_uploaded_files.legacy.php b/src/functions/normalize_uploaded_files.legacy.php
deleted file mode 100644
index b21323fa..00000000
--- a/src/functions/normalize_uploaded_files.legacy.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Zend\Diactoros;
-
-use function func_get_args;
-use function Laminas\Diactoros\normalizeUploadedFiles as laminas_normalizeUploadedFiles;
-
-/**
- * @deprecated Use Laminas\Diactoros\normalizeUploadedFiles instead
- */
-function normalizeUploadedFiles(array $files): array
-{
-    return laminas_normalizeUploadedFiles(...func_get_args());
-}
diff --git a/src/functions/parse_cookie_header.legacy.php b/src/functions/parse_cookie_header.legacy.php
deleted file mode 100644
index 8c9a46a3..00000000
--- a/src/functions/parse_cookie_header.legacy.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Zend\Diactoros;
-
-use function func_get_args;
-use function Laminas\Diactoros\parseCookieHeader as laminas_parseCookieHeader;
-
-/**
- * @deprecated Use {@see \Laminas\Diactoros\parseCookieHeader} instead
- *
- * @param string $cookieHeader A string cookie header value.
- * @return array<non-empty-string, string> key/value cookie pairs.
- */
-function parseCookieHeader($cookieHeader): array
-{
-    return laminas_parseCookieHeader(...func_get_args());
-}

From 29cf68e2763f971af5fa3ee9ff9d8ace192327e0 Mon Sep 17 00:00:00 2001
From: Aleksei Khudiakov <aleksey@xerkus.pro>
Date: Tue, 2 May 2023 03:19:22 +1000
Subject: [PATCH 2/3] Bump psalm

Signed-off-by: Aleksei Khudiakov <aleksey@xerkus.pro>
---
 composer.json | 2 +-
 composer.lock | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/composer.json b/composer.json
index 2a4fdcec..86ef4247 100644
--- a/composer.json
+++ b/composer.json
@@ -48,7 +48,7 @@
         "php-http/psr7-integration-tests": "^1.3",
         "phpunit/phpunit": "^9.5.28",
         "psalm/plugin-phpunit": "^0.18.4",
-        "vimeo/psalm": "^5.6"
+        "vimeo/psalm": "^5.9"
     },
     "provide": {
         "psr/http-factory-implementation": "1.0",
diff --git a/composer.lock b/composer.lock
index df101525..37cdfe55 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "7e672869013f70d75ddb58f532efe73f",
+    "content-hash": "e0b175cb64e0f84163192b554fdb4836",
     "packages": [
         {
             "name": "psr/http-factory",

From f88a19c990262faeda2c05550b2afc68f07230e1 Mon Sep 17 00:00:00 2001
From: Aleksei Khudiakov <aleksey@xerkus.pro>
Date: Tue, 2 May 2023 03:29:46 +1000
Subject: [PATCH 3/3] Drop conflict with zend-diactoros

Signed-off-by: Aleksei Khudiakov <aleksey@xerkus.pro>
---
 composer.json | 3 ---
 composer.lock | 2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/composer.json b/composer.json
index 86ef4247..e64c99a9 100644
--- a/composer.json
+++ b/composer.json
@@ -54,9 +54,6 @@
         "psr/http-factory-implementation": "1.0",
         "psr/http-message-implementation": "1.0"
     },
-    "conflict": {
-        "zendframework/zend-diactoros": "*"
-    },
     "autoload": {
         "files": [
             "src/functions/create_uploaded_file.php",
diff --git a/composer.lock b/composer.lock
index 37cdfe55..374b4f92 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "e0b175cb64e0f84163192b554fdb4836",
+    "content-hash": "c0dbef991657278ec00fc58f809172f3",
     "packages": [
         {
             "name": "psr/http-factory",