Merge branch 'master' into patch-1

Author: jaapio

Makefile

@@ -1,8 +1,8 @@
 .PHONY: install-phive
 install-phive:
 	mkdir tools; \
-	wget -O tools/phive.phar http://phar.io/releases/phive.phar; \
-	wget -O tools/phive.phar.asc http://phar.io/releases/phive.phar.asc; \
+	wget -O tools/phive.phar http://github.com/phar-io/phive/releases/download/0.13.2/phive-0.13.2.phar; \
+	wget -O tools/phive.phar.asc http://github.com/phar-io/phive/releases/download/0.13.2/phive-0.13.2.phar.asc; \
 	gpg --keyserver pool.sks-keyservers.net --recv-keys 0x9D8A98B29B2D5D79; \
 	gpg --verify tools/phive.phar.asc tools/phive.phar; \
 	chmod +x tools/phive.phar

composer.lock

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phive xmlns="http://phar.io/phive">
   <phar name="phpunit" version="^8.4" installed="8.4.3" location="./tools/phpunit" copy="true"/>
-  <phar name="psalm" version="^3.7.2" installed="3.9.3" location="./tools/psalm" copy="true"/>
+  <phar name="psalm" version="^3.7.2" installed="3.11.2" location="./tools/psalm" copy="true"/>
 </phive>

phive.xml

@@ -5,6 +5,3 @@ parameters:
         # Bug in PHPStan? The error is "expects A, A given"
         - '#Parameter \#1 \$tokens of method phpDocumentor\\Reflection\\Types\\ContextFactory::parse#'
         # ArrayIterator::current can return null if iterated even if ArrayIterator::valid isn't checked before
-        - '#Strict comparison using === between array\(int, string, int\)\|string and false will always evaluate to false#'
-        - '#Strict comparison using === between string and null will always evaluate to false#'
-        - '#Unreachable statement - code above always terminates#'

phpstan.neon

@@ -123,8 +123,6 @@ public function __construct(?FqsenResolver $fqsenResolver = null)
      * @uses Context::getNamespace()        to determine with what to prefix the type name.
      *
      * @param string $type The relative or absolute type.
-     *
-     * @psalm-pure
      */
     public function resolve(string $type, ?Context $context = null) : Type
     {
@@ -161,8 +159,6 @@ public function resolve(string $type, ?Context $context = null) : Type
      * @param ArrayIterator<int, string|null> $tokens        the iterator on tokens
      * @param int                        $parserContext on of self::PARSER_* constants, indicating
      * the context where we are in the parsing
-     *
-     * @psalm-pure
      */
     private function parseTypes(ArrayIterator $tokens, Context $context, int $parserContext) : Type
     {
@@ -175,7 +171,9 @@ private function parseTypes(ArrayIterator $tokens, Context $context, int $parser
                 throw new RuntimeException(
                     'Unexpected nullable character'
                 );
-            } elseif ($token === '|' || $token === '&') {
+            }
+
+            if ($token === '|' || $token === '&') {
                 if (count($types) === 0) {
                     throw new RuntimeException(
                         'A type is missing before a type separator'
@@ -411,9 +409,7 @@ private function resolveTypedObject(string $type, ?Context $context = null) : Ob
     /**
      * Resolves class string
      *
-     * @param ArrayIterator<int, null|string> $tokens
-     *
-     * @psalm-pure
+     * @param ArrayIterator<int, (string|null)> $tokens
      */
     private function resolveClassString(ArrayIterator $tokens, Context $context) : Type
     {
@@ -446,11 +442,9 @@ private function resolveClassString(ArrayIterator $tokens, Context $context) : T
     /**
      * Resolves the collection values and keys
      *
-     * @param ArrayIterator<int, null|string> $tokens
+     * @param ArrayIterator<int, (string|null)> $tokens
      *
      * @return Array_|Iterable_|Collection
-     *
-     * @psalm-mutation-free
      */
     private function resolveCollection(ArrayIterator $tokens, Type $classType, Context $context) : Type
     {

src/TypeResolver.php

@@ -47,8 +47,6 @@
  * Fully Qualified names.
  *
  * @see Context for more information.
- *
- * @psalm-immutable
  */
 final class ContextFactory
 {