Merge pull request #152 from weierophinney/feature/function-removal

Remove marshalUriFromSapi function

composer.json

@@ -60,7 +60,6 @@
             "src/functions/marshal_headers_from_sapi.php",
             "src/functions/marshal_method_from_sapi.php",
             "src/functions/marshal_protocol_version_from_sapi.php",
-            "src/functions/marshal_uri_from_sapi.php",
             "src/functions/normalize_server.php",
             "src/functions/normalize_uploaded_files.php",
             "src/functions/parse_cookie_header.php"

docs/book/v3/api.md

@@ -153,9 +153,6 @@ and even the `Cookie` header. These include:
   when under Apache)
 - `Laminas\Diactoros\marshalProtocolVersionFromSapi(array $server) : string`
 - `Laminas\Diactoros\marshalMethodFromSapi(array $server) : string`.
-- `Laminas\Diactoros\marshalUriFromSapi(array $server, array $headers) : Uri`.
-  Please note: **this function is deprecated as of version 2.11.1**, and no longer used in `ServerRequestFactory::fromGlobals()`.
-  Use `ServerRequestFactory::fromGlobals()` instead.
 - `Laminas\Diactoros\marshalHeadersFromSapi(array $server) : array`
 - `Laminas\Diactoros\parseCookieHeader(string $header) : array`
 - `Laminas\Diactoros\createUploadedFile(array $spec) : UploadedFile` (creates the

docs/book/v3/migration.md

@@ -12,3 +12,9 @@ With the update in PHP 8.0 to usage of opaque resource types for all GD resource
 As such, we have removed the feature entirely.
 
 If you need to stream an image, the recommendation is to use the functionality in the GD extension to write the image to a temporary file (e.g., `php://temp`), and then to pass that to `Laminas\Diactoros\Stream`.
+
+### marshalUriFromSapi function
+
+The `Laminas\Diactoros\marshalUriFromSapi()` function was deprecated starting in version 2.11.0, and now removed.
+The functionality that was present in it was moved to `Laminas\Diactoros\UriFactory::createFromSapi()`.
+If you were using the function previously, use this static method instead.

psalm-baseline.xml

@@ -305,52 +305,6 @@
       <code><![CDATA[$server['SERVER_PROTOCOL']]]></code>
     </MixedArgument>
   </file>
-  <file src="src/functions/marshal_uri_from_sapi.php">
-    <MissingClosureParamType>
-      <code>$default</code>
-      <code>$host</code>
-      <code>$https</code>
-    </MissingClosureParamType>
-    <MissingClosureReturnType>
-      <code>static function ($host) {</code>
-      <code>static function (string $name, array $headers, $default = null) {</code>
-    </MissingClosureReturnType>
-    <MixedArgument>
-      <code><![CDATA[$getHeaderFromArray('x-forwarded-proto', $headers, '')]]></code>
-      <code>$host</code>
-      <code>$host</code>
-      <code>$host</code>
-      <code>$host</code>
-      <code>$port</code>
-      <code>$requestUri</code>
-      <code><![CDATA[$server['QUERY_STRING']]]></code>
-    </MixedArgument>
-    <MixedArgumentTypeCoercion>
-      <code>$headers[$header]</code>
-      <code>$host</code>
-    </MixedArgumentTypeCoercion>
-    <MixedAssignment>
-      <code>$host</code>
-      <code>$iisUrlRewritten</code>
-      <code>$origPathInfo</code>
-      <code>$unencodedUrl</code>
-    </MixedAssignment>
-    <MixedInferredReturnType>
-      <code>array</code>
-      <code>string</code>
-    </MixedInferredReturnType>
-    <MixedOperand>
-      <code><![CDATA[$server['SERVER_ADDR']]]></code>
-    </MixedOperand>
-    <MixedReturnStatement>
-      <code>$defaults</code>
-      <code>$origPathInfo</code>
-      <code>$unencodedUrl</code>
-    </MixedReturnStatement>
-    <PossiblyFalseOperand>
-      <code><![CDATA[strrpos($host, ':')]]></code>
-    </PossiblyFalseOperand>
-  </file>
   <file src="src/functions/normalize_server.php">
     <MixedArrayAccess>
       <code><![CDATA[$apacheRequestHeaders['Authorization']]]></code>

psalm.xml.dist

@@ -22,12 +22,6 @@
     </stubs>
 
     <issueHandlers>
-        <DeprecatedFunction>
-            <errorLevel type="suppress">
-                <referencedFunction name="laminas\diactoros\marshalurifromsapi"/>
-            </errorLevel>
-        </DeprecatedFunction>
-
         <InternalClass>
             <errorLevel type="suppress">
                 <referencedClass name="Laminas\Diactoros\ServerRequestFilter\IPRange"/>
@@ -44,12 +38,6 @@
                 <referencedMethod name="Laminas\Diactoros\ServerRequestFilter\IPRange::matchesIPv6"/>
             </errorLevel>
         </InternalMethod>
-
-        <UndefinedClass>
-            <errorLevel type="suppress">
-                <referencedClass name="GdImage" />
-            </errorLevel>
-        </UndefinedClass>
     </issueHandlers>
     <plugins>
         <pluginClass class="Psalm\PhpUnitPlugin\Plugin"/>