Merge pull request #146 from Xerkus/feature/drop-legacy-remnants

Drop legacy helper functions in Zend namespace

composer.json

@@ -48,15 +48,12 @@
         "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",
         "psr/http-message-implementation": "1.0"
     },
-    "conflict": {
-        "zendframework/zend-diactoros": "*"
-    },
     "autoload": {
         "files": [
             "src/functions/create_uploaded_file.php",
@@ -66,15 +63,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/"

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,23 +284,13 @@
       <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>
       <code>$headers[$name]</code>
       <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>