Skip to content

Commit

Permalink
Psalm fixes
Browse files Browse the repository at this point in the history
Signed-off-by: Aleksei Khudiakov <aleksey@xerkus.pro>
  • Loading branch information
Xerkus committed Sep 10, 2024
1 parent 1de1db6 commit 949570d
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 10 deletions.
5 changes: 1 addition & 4 deletions psalm-baseline.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<files psalm-version="5.25.0@01a8eb06b9e9cc6cfb6a320bf9fb14331919d505">
<files psalm-version="5.26.0@4787eaf414e16c661902b94dfe5d882223e5b513">
<file src="src/AbstractSerializer.php">
<RedundantCondition>
<code><![CDATA[! $crFound]]></code>
Expand Down Expand Up @@ -190,9 +190,6 @@
<code><![CDATA[$headers]]></code>
<code><![CDATA[$server]]></code>
</MixedArgumentTypeCoercion>
<RedundantConditionGivenDocblockType>
<code><![CDATA[is_callable(self::$apacheRequestHeaders)]]></code>
</RedundantConditionGivenDocblockType>
</file>
<file src="src/ServerRequestFilter/FilterUsingXForwardedHeaders.php">
<ImpureMethodCall>
Expand Down
12 changes: 6 additions & 6 deletions src/ServerRequestFactory.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ class ServerRequestFactory implements ServerRequestFactoryInterface
/**
* Function to use to get apache request headers; present only to simplify mocking.
*
* @var callable
* @var callable|string
*/
private static $apacheRequestHeaders = 'apache_request_headers';

Expand All @@ -35,11 +35,11 @@ class ServerRequestFactory implements ServerRequestFactoryInterface
*
* @see fromServer()
*
* @param array $server $_SERVER superglobal
* @param array $query $_GET superglobal
* @param array $body $_POST superglobal
* @param array $cookies $_COOKIE superglobal
* @param array $files $_FILES superglobal
* @param null|array $server $_SERVER superglobal
* @param null|array $query $_GET superglobal
* @param null|array $body $_POST superglobal
* @param null|array $cookies $_COOKIE superglobal
* @param null|array $files $_FILES superglobal
* @param null|FilterServerRequestInterface $requestFilter If present, the
* generated request will be passed to this instance and the result
* returned by this method. When not present, a default instance of
Expand Down

0 comments on commit 949570d

Please sign in to comment.