Merge branch '2.x' into 3.x

bkdotcom · bkdotcom · commit 9bc4ad5b7b80 · 2024-10-11T16:57:14.000-05:00
* 2.x:
  Use short-array syntax for lists
  1.x tweaks
diff --git a/src/HttpFactory/Factory.php b/src/HttpFactory/Factory.php
@@ -130,7 +130,7 @@ public function createStreamFromFile(string $filename, string $mode = 'r'): Stre
         $resource = \fopen($filename, $mode);
         \restore_error_handler();
         if ($resource === false) {
-            if ($mode === '' || \in_array($mode[0], array('r', 'w', 'a', 'x', 'c'), true) === false) {
+            if ($mode === '' || \in_array($mode[0], ['r', 'w', 'a', 'x', 'c'], true) === false) {
                 throw new InvalidArgumentException('The mode "' . $mode . '" is invalid.');
             }
             throw new RuntimeException(\sprintf(
diff --git a/src/HttpMessage/AbstractUri.php b/src/HttpMessage/AbstractUri.php
@@ -59,7 +59,7 @@ abstract class AbstractUri
     protected function assertHost($host): void
     {
         $this->assertString($host, 'host');
-        if (\in_array($host, array('', 'localhost'), true)) {
+        if (\in_array($host, ['', 'localhost'], true)) {
             // An empty host value is equivalent to removing the host.
             // No validation required
             return;
diff --git a/src/HttpMessage/AssertionTrait.php b/src/HttpMessage/AssertionTrait.php
@@ -27,34 +27,38 @@ trait AssertionTrait
      *
      * @var numeric-string[]
      */
-    protected array $validProtocolVers = array(
+    protected $validProtocolVers = array(
         '0.9',
         '1.0',
         '1.1',
         '2',
         '2.0',
         '3',
         '3.0',
-    );
+    ];
 
     /**
      * Test that value is a string (or optionally numeric)
      *
      * @param mixed  $value        The value to check.
      * @param string $what         The name of the value.
      * @param bool   $allowNumeric Allow float or int?
+     * @param bool   $allowNull    Allow null?
      *
      * @return void
      *
      * @throws InvalidArgumentException
      *
      * @psalm-assert string $value
      */
-    protected function assertString($value, string $what = '', bool $allowNumeric = false): void
+    protected function assertString($value, string $what = '', bool $allowNumeric = false, $allowNull = false): void
     {
         if (\is_string($value)) {
             return;
         }
+        if ($allowNull && $value === null) {
+            return;
+        }
         if ($allowNumeric && \is_numeric($value)) {
             return;
         }
@@ -126,7 +130,7 @@ private function assertHeaderName($name): void
     private function assertHeaderValue($value): void
     {
         if (\is_scalar($value) && \is_bool($value) === false) {
-            $value = array((string) $value);
+            $value = [(string) $value];
         }
         if (\is_array($value) === false) {
             throw new InvalidArgumentException(\sprintf(
@@ -443,7 +447,7 @@ protected function assertStatusCode($code): void
      */
     private function iteratorPath(RecursiveIteratorIterator $iterator): string
     {
-        $path = array();
+        $path = [];
         for ($i = 0, $depth = $iterator->getDepth(); $i <= $depth; $i++) {
             $key = $iterator->getSubIterator($i)->key();
             $path[] = $i > 0
diff --git a/src/HttpMessage/Message.php b/src/HttpMessage/Message.php
@@ -127,7 +127,7 @@ public function getHeader(string $name): array
     {
         $nameLower = \strtolower($name);
         if (!isset($this->headerNames[$nameLower])) {
-            return array();
+            return [];
         }
         $name = $this->headerNames[$nameLower];
         return $this->headers[$name];
diff --git a/src/HttpMessage/Response.php b/src/HttpMessage/Response.php
@@ -130,6 +130,6 @@ private function filterCodePhrase($code, $phrase)
             $phrase = ResponseUtil::codePhrase($code);
         }
         $this->assertReasonPhrase($phrase);
-        return array($code, $phrase);
+        return [$code, $phrase];
     }
 }
diff --git a/src/HttpMessage/ServerRequest.php b/src/HttpMessage/ServerRequest.php
@@ -127,8 +127,8 @@ public function __construct(string $method = 'GET', $uri = '', array $serverPara
                 ? $parsed
                 : null;
         });
-        $this->registerMediaTypeParser(ContentType::XML_APP, array(__CLASS__, 'parseXml'));
-        $this->registerMediaTypeParser(ContentType::XML, array(__CLASS__, 'parseXml'));
+        $this->registerMediaTypeParser(ContentType::XML_APP, [__CLASS__, 'parseXml']);
+        $this->registerMediaTypeParser(ContentType::XML, [__CLASS__, 'parseXml']);
     }
 
     /**
diff --git a/src/HttpMessage/ServerRequestExtended.php b/src/HttpMessage/ServerRequestExtended.php
@@ -87,7 +87,7 @@ public function getMediaTypeParams(): array
             'charset' => null,
         );
 
-        if ($contentType === array()) {
+        if ($contentType === []) {
             return $params;
         }
 
diff --git a/src/HttpMessage/Uri.php b/src/HttpMessage/Uri.php
@@ -311,11 +311,11 @@ public function withScheme(string $scheme): static
      */
     public function withUserInfo(string $user, ?string $password = null): static
     {
-        $this->assertString($user, 'user');
+        $this->assertString($user, 'user', true);
+        $this->assertString($password, 'password', true, true);
         $userInfo = (string) $user; // for versions without type hint in method signature
         $password = (string) $password; // for versions without type hint in method signature
         if ($userInfo !== '' && $password !== '') {
-            $this->assertString($password, 'password');
             $userInfo .= ':' . $password;
         }
         if ($userInfo === $this->userInfo) {
@@ -417,7 +417,7 @@ public function withPath(string $path): static
      */
     public function withQuery(string $query): static
     {
-        $this->assertString($query, 'query');
+        $this->assertString($query, 'query', true);
         $query = $this->filterQueryAndFragment($query);
         if ($query === $this->query) {
             return $this;
diff --git a/src/HttpMessage/Utility/ServerRequest.php b/src/HttpMessage/Utility/ServerRequest.php
@@ -77,7 +77,7 @@ public static function fromGlobals($parseStrOpts = array()): ServerRequestExtend
      *
      * @throws InvalidArgumentException
      */
-    private static function filesFromGlobals(array $phpFiles, array $path = array()): array
+    private static function filesFromGlobals(array $phpFiles, array $path = []): array
     {
         $files = array();
         /** @var mixed $value */
@@ -179,15 +179,15 @@ private static function fileFromGlobalCreate(array $fileInfo)
      */
     private static function isUploadFileInfoArray(array $array): bool
     {
-        $keysMustHave = array('name', 'type', 'tmp_name', 'size', 'error');
-        $keysMayHave = array('full_path');
+        $keysMustHave = ['name', 'type', 'tmp_name', 'size', 'error'];
+        $keysMayHave = ['full_path'];
         $keys = \array_keys($array);
         if (\array_intersect($keysMustHave, $keys) !== $keysMustHave) {
             // missing must have
             return false;
         }
         // return true if no unknown keys
-        return \array_diff($keys, \array_merge($keysMustHave, $keysMayHave)) === array();
+        return \array_diff($keys, \array_merge($keysMustHave, $keysMayHave)) === [];
     }
 
     /**
diff --git a/src/HttpMessage/Utility/Uri.php b/src/HttpMessage/Utility/Uri.php
@@ -62,13 +62,13 @@ public static function fromParsed(array $parsed): BdkUri
         $uriKeys = ['fragment', 'host', 'path', 'port', 'query', 'scheme', 'userInfo'];
         $parsed = \array_intersect_key(self::parsedPartsPrep($parsed), \array_flip($uriKeys));
         $parsed = \array_filter($parsed, static function ($val) {
-            return \in_array($val, array(null, ''), true) === false;
+            return \in_array($val, [null, ''], true) === false;
         });
         $uri = new BdkUri();
         foreach ($parsed as $key => $value) {
             $method = 'with' . \ucfirst($key);
             /** @var BdkUri */
-            $uri = \call_user_func_array(array($uri, $method), (array) $value);
+            $uri = \call_user_func_array([$uri, $method], (array) $value);
         }
         return $uri;
     }
@@ -199,7 +199,7 @@ private static function parsedPartsPrep(array $parsed): array
             'user' => '',
         ), $renamed, $parsed);
         if (\array_key_exists('userInfo', $parsed) === false) {
-            $parsed['userInfo'] = array($parsed['user'], $parsed['pass']);
+            $parsed['userInfo'] = [$parsed['user'], $parsed['pass']];
         }
         if (\is_array($parsed['userInfo']) === false) {
             $parsed['userInfo'] = \explode(':', (string) $parsed['userInfo'], 2);
@@ -282,7 +282,7 @@ private static function pathRemoveDots(string $path): string
         if ($path[0] === '/' && (!isset($pathNew[0]) || $pathNew[0] !== '/')) {
             // Re-add the leading slash if necessary for cases like "/.."
             $pathNew = '/' . $pathNew;
-        } elseif ($pathNew !== '' && \in_array(\end($segments), array('.', '..'), true)) {
+        } elseif ($pathNew !== '' && \in_array(\end($segments), ['.', '..'], true)) {
             // Add the trailing slash if necessary
             $pathNew .= '/';
         }
@@ -342,7 +342,7 @@ private static function resolveTargetPath(UriInterface $base, UriInterface $rel)
      */
     private static function uriInterfaceToParts(UriInterface $url): array
     {
-        $userInfo = \array_replace(array(null, null), \explode(':', $url->getUserInfo(), 2));
+        $userInfo = \array_replace([null, null], \explode(':', $url->getUserInfo(), 2));
         $parts = array(
             'pass' => $userInfo[1],
             'user' => $userInfo[0],

Original file line number	Diff line number	Diff line change
`@@ -130,7 +130,7 @@ public function createStreamFromFile(string $filename, string $mode = 'r'): Stre`
`130`	`130`	`$resource = \fopen($filename, $mode);`
`131`	`131`	`\restore_error_handler();`
`132`	`132`	`if ($resource === false) {`
`133`		`- if ($mode === '' \|\| \in_array($mode[0], array('r', 'w', 'a', 'x', 'c'), true) === false) {`
	`133`	`+ if ($mode === '' \|\| \in_array($mode[0], ['r', 'w', 'a', 'x', 'c'], true) === false) {`
`134`	`134`	`throw new InvalidArgumentException('The mode "' . $mode . '" is invalid.');`
`135`	`135`	`}`
`136`	`136`	`throw new RuntimeException(\sprintf(`
Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ abstract class AbstractUri`
`59`	`59`	`protected function assertHost($host): void`
`60`	`60`	`{`
`61`	`61`	`$this->assertString($host, 'host');`
`62`		`- if (\in_array($host, array('', 'localhost'), true)) {`
	`62`	`+ if (\in_array($host, ['', 'localhost'], true)) {`
`63`	`63`	`// An empty host value is equivalent to removing the host.`
`64`	`64`	`// No validation required`
`65`	`65`	`return;`
Original file line number	Diff line number	Diff line change
`@@ -27,34 +27,38 @@ trait AssertionTrait`
`27`	`27`	`*`
`28`	`28`	`* @var numeric-string[]`
`29`	`29`	`*/`
`30`		`- protected array $validProtocolVers = array(`
	`30`	`+ protected $validProtocolVers = array(`
`31`	`31`	`'0.9',`
`32`	`32`	`'1.0',`
`33`	`33`	`'1.1',`
`34`	`34`	`'2',`
`35`	`35`	`'2.0',`
`36`	`36`	`'3',`
`37`	`37`	`'3.0',`
`38`		`- );`
	`38`	`+ ];`
`39`	`39`
`40`	`40`	`/**`
`41`	`41`	`* Test that value is a string (or optionally numeric)`
`42`	`42`	`*`
`43`	`43`	`* @param mixed $value The value to check.`
`44`	`44`	`* @param string $what The name of the value.`
`45`	`45`	`* @param bool $allowNumeric Allow float or int?`
	`46`	`+ * @param bool $allowNull Allow null?`
`46`	`47`	`*`
`47`	`48`	`* @return void`
`48`	`49`	`*`
`49`	`50`	`* @throws InvalidArgumentException`
`50`	`51`	`*`
`51`	`52`	`* @psalm-assert string $value`
`52`	`53`	`*/`
`53`		`- protected function assertString($value, string $what = '', bool $allowNumeric = false): void`
	`54`	`+ protected function assertString($value, string $what = '', bool $allowNumeric = false, $allowNull = false): void`
`54`	`55`	`{`
`55`	`56`	`if (\is_string($value)) {`
`56`	`57`	`return;`
`57`	`58`	`}`
	`59`	`+ if ($allowNull && $value === null) {`
	`60`	`+ return;`
	`61`	`+ }`
`58`	`62`	`if ($allowNumeric && \is_numeric($value)) {`
`59`	`63`	`return;`
`60`	`64`	`}`
`@@ -126,7 +130,7 @@ private function assertHeaderName($name): void`
`126`	`130`	`private function assertHeaderValue($value): void`
`127`	`131`	`{`
`128`	`132`	`if (\is_scalar($value) && \is_bool($value) === false) {`
`129`		`- $value = array((string) $value);`
	`133`	`+ $value = [(string) $value];`
`130`	`134`	`}`
`131`	`135`	`if (\is_array($value) === false) {`
`132`	`136`	`throw new InvalidArgumentException(\sprintf(`
`@@ -443,7 +447,7 @@ protected function assertStatusCode($code): void`
`443`	`447`	`*/`
`444`	`448`	`private function iteratorPath(RecursiveIteratorIterator $iterator): string`
`445`	`449`	`{`
`446`		`- $path = array();`
	`450`	`+ $path = [];`
`447`	`451`	`for ($i = 0, $depth = $iterator->getDepth(); $i <= $depth; $i++) {`
`448`	`452`	`$key = $iterator->getSubIterator($i)->key();`
`449`	`453`	`$path[] = $i > 0`
Original file line number	Diff line number	Diff line change
`@@ -127,7 +127,7 @@ public function getHeader(string $name): array`
`127`	`127`	`{`
`128`	`128`	`$nameLower = \strtolower($name);`
`129`	`129`	`if (!isset($this->headerNames[$nameLower])) {`
`130`		`- return array();`
	`130`	`+ return [];`
`131`	`131`	`}`
`132`	`132`	`$name = $this->headerNames[$nameLower];`
`133`	`133`	`return $this->headers[$name];`
Original file line number	Diff line number	Diff line change
`@@ -130,6 +130,6 @@ private function filterCodePhrase($code, $phrase)`
`130`	`130`	`$phrase = ResponseUtil::codePhrase($code);`
`131`	`131`	`}`
`132`	`132`	`$this->assertReasonPhrase($phrase);`
`133`		`- return array($code, $phrase);`
	`133`	`+ return [$code, $phrase];`
`134`	`134`	`}`
`135`	`135`	`}`
Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,7 @@ public function getMediaTypeParams(): array`
`87`	`87`	`'charset' => null,`
`88`	`88`	`);`
`89`	`89`
`90`		`- if ($contentType === array()) {`
	`90`	`+ if ($contentType === []) {`
`91`	`91`	`return $params;`
`92`	`92`	`}`
`93`	`93`
Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ public static function fromGlobals($parseStrOpts = array()): ServerRequestExtend`
`77`	`77`	`*`
`78`	`78`	`* @throws InvalidArgumentException`
`79`	`79`	`*/`
`80`		`- private static function filesFromGlobals(array $phpFiles, array $path = array()): array`
	`80`	`+ private static function filesFromGlobals(array $phpFiles, array $path = []): array`
`81`	`81`	`{`
`82`	`82`	`$files = array();`
`83`	`83`	`/** @var mixed $value */`
`@@ -179,15 +179,15 @@ private static function fileFromGlobalCreate(array $fileInfo)`
`179`	`179`	`*/`
`180`	`180`	`private static function isUploadFileInfoArray(array $array): bool`
`181`	`181`	`{`
`182`		`- $keysMustHave = array('name', 'type', 'tmp_name', 'size', 'error');`
`183`		`- $keysMayHave = array('full_path');`
	`182`	`+ $keysMustHave = ['name', 'type', 'tmp_name', 'size', 'error'];`
	`183`	`+ $keysMayHave = ['full_path'];`
`184`	`184`	`$keys = \array_keys($array);`
`185`	`185`	`if (\array_intersect($keysMustHave, $keys) !== $keysMustHave) {`
`186`	`186`	`// missing must have`
`187`	`187`	`return false;`
`188`	`188`	`}`
`189`	`189`	`// return true if no unknown keys`
`190`		`- return \array_diff($keys, \array_merge($keysMustHave, $keysMayHave)) === array();`
	`190`	`+ return \array_diff($keys, \array_merge($keysMustHave, $keysMayHave)) === [];`
`191`	`191`	`}`
`192`	`192`
`193`	`193`	`/**`