🚿

Author: codemasher

.phan/config.php

@@ -34,7 +34,7 @@
 	// exclude from parsing. Actual value will exclude every
 	// "test", "tests", "Test" and "Tests" folders found in
 	// "vendor/" directory.
-	'exclude_file_regex'               => '@^vendor/.*/(tests?|Tests?)/@',
+	'exclude_file_regex'              => '@^vendor/.*/(tests?|Tests?)/@',
 
 	// A directory list that defines files that will be excluded
 	// from static analysis, but whose class and method

src/HeaderUtil.php

@@ -69,7 +69,7 @@ public static function normalize(array $headers):array{
 			// cookie headers may appear multiple times
 			// https://tools.ietf.org/html/rfc6265#section-4.1.2
 			if($key === 'Set-Cookie'){
-				// i'll just collect the last value here and leave parsing up to you :P
+				// we'll just collect the last value here and leave parsing up to you :P
 				$normalized[$key][strtolower(explode('=', $val, 2)[0])] = $val;
 			}
 			// combine header fields with the same name

src/MessageUtil.php

@@ -37,7 +37,7 @@ public static function getContents(MessageInterface $message):string{
 	 * @throws \JsonException
 	 */
 	public static function decodeJSON(MessageInterface $message, bool $assoc = null):mixed{
-		return json_decode(self::getContents($message), $assoc ?? false, 512, JSON_THROW_ON_ERROR);
+		return json_decode(self::getContents($message), ($assoc ?? false), 512, JSON_THROW_ON_ERROR);
 	}
 
 	/**

src/MimeTypeUtil.php

@@ -131,7 +131,7 @@ final class MimeTypeUtil{
 	 * Get the mime type for the given file extension
 	 */
 	public static function getFromExtension(string $extension):?string{
-		return self::MIMETYPES[strtolower($extension)] ?? null;
+		return (self::MIMETYPES[strtolower($extension)] ?? null);
 	}
 
 	/**

src/QueryUtil.php

@@ -162,9 +162,9 @@ public static function build(array $params, int $encoding = null, string $delimi
 	 * Merges additional query parameters into an existing query string
 	 */
 	public static function merge(string $uri, array $query):string{
-		$parsedquery = self::parse(self::parseUrl($uri)['query'] ?? '');
-		$requestURI  = explode('?', $uri)[0];
-		$params      = array_merge($parsedquery, $query);
+		$querypart  = (self::parseUrl($uri)['query'] ?? '');
+		$params     = array_merge(self::parse($querypart), $query);
+		$requestURI = explode('?', $uri)[0];
 
 		if(!empty($params)){
 			$requestURI .= '?'.self::build($params);
@@ -259,8 +259,6 @@ public static function parseUrl(string $url):?array{
 	/**
 	 * Recursive rawurlencode
 	 *
-	 * @param mixed $data
-	 *
 	 * @return string|string[]
 	 * @throws \InvalidArgumentException
 	 */

src/ServerUtil.php

@@ -41,7 +41,7 @@ public function __construct(
 	public function createServerRequestFromGlobals():ServerRequestInterface{
 
 		$serverRequest = $this->serverRequestFactory->createServerRequest(
-			$_SERVER['REQUEST_METHOD'] ?? 'GET',
+			($_SERVER['REQUEST_METHOD'] ?? 'GET'),
 			$this->createUriFromGlobals(),
 			$_SERVER
 		);
@@ -64,15 +64,15 @@ public function createServerRequestFromGlobals():ServerRequestInterface{
 	}
 
 	/**
-	 * Creates an Uri populated with values from $_SERVER.
+	 * Creates a UriInterface populated with values from $_SERVER.
 	 */
 	public function createUriFromGlobals():UriInterface{
 		$hasPort  = false;
 		$hasQuery = false;
 
 		$uri = $this->uriFactory
 			->createUri()
-			->withScheme(!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off' ? 'https' : 'http')
+			->withScheme((!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off') ? 'https' : 'http')
 		;
 
 		if(isset($_SERVER['HTTP_HOST'])){

src/UriUtil.php

@@ -122,7 +122,7 @@ public static function withoutQueryValue(UriInterface $uri, string $key):UriInte
 	public static function withQueryValue(UriInterface $uri, string $key, string $value = null):UriInterface{
 		$current = $uri->getQuery();
 
-		$result = $current !== ''
+		$result = ($current !== '')
 			? array_filter(explode('&', $current), fn($part) => rawurldecode(explode('=', $part)[0]) !== rawurldecode($key))
 			: [];