Merge pull request #203 from phpDocumentor/php73

jaapio · web-flow · commit 153ae6627837 · 2024-02-23T12:10:43.000+01:00
Downgrade to php 7.3
diff --git a/composer.json b/composer.json
@@ -10,7 +10,7 @@
         }
     ],
     "require": {
-        "php": "^7.4 || ^8.0",
+        "php": "^7.3 || ^8.0",
         "phpdocumentor/reflection-common": "^2.0",
         "phpstan/phpdoc-parser": "^1.13",
         "doctrine/deprecations": "^1.0"
@@ -42,7 +42,7 @@
     },
     "config": {
         "platform": {
-            "php": "7.4.0"
+            "php": "7.3.0"
         },
         "allow-plugins": {
             "phpstan/extension-installer": true
diff --git a/composer.lock b/composer.lock
diff --git a/rector.php b/rector.php
@@ -4,6 +4,7 @@
 
 use Rector\CodeQuality\Rector\Class_\InlineConstructorDefaultToPropertyRector;
 use Rector\Config\RectorConfig;
+use Rector\Set\ValueObject\DowngradeLevelSetList;
 use Rector\Set\ValueObject\LevelSetList;
 
 return static function (RectorConfig $rectorConfig): void {
@@ -21,6 +22,6 @@
 
     // define sets of rules
     $rectorConfig->sets([
-        LevelSetList::UP_TO_PHP_74
+        DowngradeLevelSetList::DOWN_TO_PHP_73
     ]);
 };
diff --git a/src/PseudoTypes/ArrayShape.php b/src/PseudoTypes/ArrayShape.php
@@ -25,7 +25,7 @@
 class ArrayShape implements PseudoType
 {
     /** @var ArrayShapeItem[] */
-    private array $items;
+    private $items;
 
     public function __construct(ArrayShapeItem ...$items)
     {
diff --git a/src/PseudoTypes/ArrayShapeItem.php b/src/PseudoTypes/ArrayShapeItem.php
@@ -20,9 +20,12 @@
 
 final class ArrayShapeItem
 {
-    private ?string $key;
-    private Type $value;
-    private bool $optional;
+    /** @var string|null */
+    private $key;
+    /** @var Type */
+    private $value;
+    /** @var bool */
+    private $optional;
 
     public function __construct(?string $key, ?Type $value, bool $optional)
     {
diff --git a/src/PseudoTypes/ConstExpression.php b/src/PseudoTypes/ConstExpression.php
@@ -22,8 +22,10 @@
 /** @psalm-immutable */
 final class ConstExpression implements PseudoType
 {
-    private Type $owner;
-    private string $expression;
+    /** @var Type */
+    private $owner;
+    /** @var string */
+    private $expression;
 
     public function __construct(Type $owner, string $expression)
     {
diff --git a/src/PseudoTypes/FloatValue.php b/src/PseudoTypes/FloatValue.php
@@ -20,7 +20,8 @@
 /** @psalm-immutable */
 class FloatValue implements PseudoType
 {
-    private float $value;
+    /** @var float */
+    private $value;
 
     public function __construct(float $value)
     {
diff --git a/src/PseudoTypes/IntegerRange.php b/src/PseudoTypes/IntegerRange.php
@@ -24,9 +24,11 @@
  */
 final class IntegerRange extends Integer implements PseudoType
 {
-    private string $minValue;
+    /** @var string */
+    private $minValue;
 
-    private string $maxValue;
+    /** @var string */
+    private $maxValue;
 
     public function __construct(string $minValue, string $maxValue)
     {
diff --git a/src/PseudoTypes/IntegerValue.php b/src/PseudoTypes/IntegerValue.php
@@ -20,7 +20,8 @@
 /** @psalm-immutable */
 final class IntegerValue implements PseudoType
 {
-    private int $value;
+    /** @var int */
+    private $value;
 
     public function __construct(int $value)
     {
diff --git a/src/PseudoTypes/StringValue.php b/src/PseudoTypes/StringValue.php
@@ -22,7 +22,8 @@
 /** @psalm-immutable */
 class StringValue implements PseudoType
 {
-    private string $value;
+    /** @var string */
+    private $value;
 
     public function __construct(string $value)
     {
diff --git a/src/TypeResolver.php b/src/TypeResolver.php
@@ -115,7 +115,7 @@ final class TypeResolver
      * @var array<string, string> List of recognized keywords and unto which Value Object they map
      * @psalm-var array<string, class-string<Type>>
      */
-    private array $keywords = [
+    private $keywords = [
         'string' => String_::class,
         'class-string' => ClassString::class,
         'interface-string' => InterfaceString::class,
@@ -159,12 +159,21 @@ final class TypeResolver
         'non-empty-list' => NonEmptyList::class,
     ];
 
-    /** @psalm-readonly */
-    private FqsenResolver $fqsenResolver;
-    /** @psalm-readonly */
-    private TypeParser $typeParser;
-    /** @psalm-readonly */
-    private Lexer $lexer;
+    /**
+     * @psalm-readonly
+     * @var FqsenResolver
+     */
+    private $fqsenResolver;
+    /**
+     * @psalm-readonly
+     * @var TypeParser
+     */
+    private $typeParser;
+    /**
+     * @psalm-readonly
+     * @var Lexer
+     */
+    private $lexer;
 
     /**
      * Initializes this TypeResolver with the means to create and resolve Fqsen objects.
@@ -227,11 +236,13 @@ public function createType(?TypeNode $type, Context $context): Type
             case ArrayShapeNode::class:
                 return new ArrayShape(
                     ...array_map(
-                        fn (ArrayShapeItemNode $item) => new ArrayShapeItem(
-                            (string) $item->keyName,
-                            $this->createType($item->valueType, $context),
-                            $item->optional
-                        ),
+                        function (ArrayShapeItemNode $item) use ($context): ArrayShapeItem {
+                            return new ArrayShapeItem(
+                                (string) $item->keyName,
+                                $this->createType($item->valueType, $context),
+                                $item->optional
+                            );
+                        },
                         $type->items
                     )
                 );
@@ -252,7 +263,7 @@ public function createType(?TypeNode $type, Context $context): Type
                 return new Intersection(
                     array_filter(
                         array_map(
-                            function (TypeNode $nestedType) use ($context) {
+                            function (TypeNode $nestedType) use ($context): Type {
                                 $type = $this->createType($nestedType, $context);
                                 if ($type instanceof AggregatedType) {
                                     return new Expression($type);
@@ -274,7 +285,7 @@ function (TypeNode $nestedType) use ($context) {
                 return new Compound(
                     array_filter(
                         array_map(
-                            function (TypeNode $nestedType) use ($context) {
+                            function (TypeNode $nestedType) use ($context): Type {
                                 $type = $this->createType($nestedType, $context);
                                 if ($type instanceof AggregatedType) {
                                     return new Expression($type);
@@ -343,16 +354,15 @@ private function createFromGeneric(GenericTypeNode $type, Context $context): Typ
                     throw new RuntimeException('int<min,max> has not the correct format');
                 }
 
-                return new IntegerRange(
-                    (string) $type->genericTypes[0],
-                    (string) $type->genericTypes[1],
-                );
+                return new IntegerRange((string) $type->genericTypes[0], (string) $type->genericTypes[1]);
 
             case 'iterable':
                 return new Iterable_(
                     ...array_reverse(
                         array_map(
-                            fn (TypeNode $genericType) => $this->createType($genericType, $context),
+                            function (TypeNode $genericType) use ($context): Type {
+                                return $this->createType($genericType, $context);
+                            },
                             $type->genericTypes
                         )
                     )
@@ -368,7 +378,9 @@ private function createFromGeneric(GenericTypeNode $type, Context $context): Typ
                     $collectionType->getFqsen(),
                     ...array_reverse(
                         array_map(
-                            fn (TypeNode $genericType) => $this->createType($genericType, $context),
+                            function (TypeNode $genericType) use ($context): Type {
+                                return $this->createType($genericType, $context);
+                            },
                             $type->genericTypes
                         )
                     )
@@ -378,21 +390,18 @@ private function createFromGeneric(GenericTypeNode $type, Context $context): Typ
 
     private function createFromCallable(CallableTypeNode $type, Context $context): Callable_
     {
-        return new Callable_(
-            array_map(
-                function (CallableTypeParameterNode $param) use ($context) {
-                    return new CallableParameter(
-                        $this->createType($param->type, $context),
-                        $param->parameterName !== '' ? trim($param->parameterName, '$') : null,
-                        $param->isReference,
-                        $param->isVariadic,
-                        $param->isOptional
-                    );
-                },
-                $type->parameters
-            ),
-            $this->createType($type->returnType, $context),
-        );
+        return new Callable_(array_map(
+            function (CallableTypeParameterNode $param) use ($context): CallableParameter {
+                return new CallableParameter(
+                    $this->createType($param->type, $context),
+                    $param->parameterName !== '' ? trim($param->parameterName, '$') : null,
+                    $param->isReference,
+                    $param->isVariadic,
+                    $param->isOptional
+                );
+            },
+            $type->parameters
+        ), $this->createType($type->returnType, $context));
     }
 
     private function createFromConst(ConstTypeNode $type, Context $context): Type
@@ -542,7 +551,9 @@ private function createArray(array $typeNodes, Context $context): Array_
     {
         $types = array_reverse(
             array_map(
-                fn (TypeNode $node) => $this->createType($node, $context),
+                function (TypeNode $node) use ($context): Type {
+                    return $this->createType($node, $context);
+                },
                 $typeNodes
             )
         );
@@ -596,7 +607,7 @@ private function tryParseRemainingCompoundTypes(TokenIterator $tokenIterator, Co
                 'phpdocumentor/type-resolver',
                 'https://github.com/phpDocumentor/TypeResolver/issues/184',
                 'Legacy nullable type detected, please update your code as
-                you are using nullable types in a docblock. support will be removed in v2.0.0',
+                you are using nullable types in a docblock. support will be removed in v2.0.0'
             );
         }
 
diff --git a/src/Types/AggregatedType.php b/src/Types/AggregatedType.php
@@ -34,9 +34,10 @@ abstract class AggregatedType implements Type, IteratorAggregate
      * @psalm-allow-private-mutation
      * @var array<int, Type>
      */
-    private array $types = [];
+    private $types = [];
 
-    private string $token;
+    /** @var string */
+    private $token;
 
     /**
      * @param array<Type> $types
diff --git a/src/Types/CallableParameter.php b/src/Types/CallableParameter.php
@@ -21,15 +21,20 @@
  */
 final class CallableParameter
 {
-    private Type $type;
+    /** @var Type */
+    private $type;
 
-    private bool $isReference;
+    /** @var bool */
+    private $isReference;
 
-    private bool $isVariadic;
+    /** @var bool */
+    private $isVariadic;
 
-    private bool $isOptional;
+    /** @var bool */
+    private $isOptional;
 
-    private ?string $name;
+    /** @var string|null */
+    private $name;
 
     public function __construct(
         Type $type,
diff --git a/src/Types/Callable_.php b/src/Types/Callable_.php
@@ -22,9 +22,10 @@
  */
 final class Callable_ implements Type
 {
-    private ?Type $returnType;
+    /** @var Type|null */
+    private $returnType;
     /** @var CallableParameter[] */
-    private array $parameters;
+    private $parameters;
 
     /**
      * @param CallableParameter[] $parameters
diff --git a/src/Types/ClassString.php b/src/Types/ClassString.php
@@ -24,7 +24,8 @@
  */
 final class ClassString extends String_ implements PseudoType
 {
-    private ?Fqsen $fqsen;
+    /** @var Fqsen|null */
+    private $fqsen;
 
     /**
      * Initializes this representation of a class string with the given Fqsen.
diff --git a/src/Types/Collection.php b/src/Types/Collection.php
@@ -31,7 +31,8 @@
  */
 final class Collection extends AbstractList
 {
-    private ?Fqsen $fqsen;
+    /** @var Fqsen|null */
+    private $fqsen;
 
     /**
      * Initializes this representation of an array with the given Type or Fqsen.
diff --git a/src/Types/Context.php b/src/Types/Context.php
@@ -36,13 +36,13 @@
 final class Context
 {
     /** @var string The current namespace. */
-    private string $namespace;
+    private $namespace;
 
     /**
      * @var string[] List of namespace aliases => Fully Qualified Namespace.
      * @psalm-var array<string, string>
      */
-    private array $namespaceAliases;
+    private $namespaceAliases;
 
     /**
      * Initializes the new context and normalizes all passed namespaces to be in Qualified Namespace Name (QNN)
diff --git a/src/Types/Expression.php b/src/Types/Expression.php
@@ -22,7 +22,8 @@
  */
 final class Expression implements Type
 {
-    protected Type $valueType;
+    /** @var Type */
+    protected $valueType;
 
     /**
      * Initializes this representation of an array with the given Type.
diff --git a/src/Types/InterfaceString.php b/src/Types/InterfaceString.php
@@ -23,7 +23,8 @@
  */
 final class InterfaceString implements Type
 {
-    private ?Fqsen $fqsen;
+    /** @var Fqsen|null */
+    private $fqsen;
 
     /**
      * Initializes this representation of a class string with the given Fqsen.
diff --git a/src/Types/Nullable.php b/src/Types/Nullable.php
@@ -23,7 +23,7 @@
 final class Nullable implements Type
 {
     /** @var Type The actual type that is wrapped */
-    private Type $realType;
+    private $realType;
 
     /**
      * Initialises this nullable type using the real type embedded
diff --git a/src/Types/Object_.php b/src/Types/Object_.php

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@`
`25`	`25`	`class ArrayShape implements PseudoType`
`26`	`26`	`{`
`27`	`27`	`/** @var ArrayShapeItem[] */`
`28`		`- private array $items;`
	`28`	`+ private $items;`
`29`	`29`
`30`	`30`	`public function __construct(ArrayShapeItem ...$items)`
`31`	`31`	`{`
Original file line number	Diff line number	Diff line change
`@@ -20,9 +20,12 @@`
`20`	`20`
`21`	`21`	`final class ArrayShapeItem`
`22`	`22`	`{`
`23`		`- private ?string $key;`
`24`		`- private Type $value;`
`25`		`- private bool $optional;`
	`23`	`+ /** @var string\|null */`
	`24`	`+ private $key;`
	`25`	`+ /** @var Type */`
	`26`	`+ private $value;`
	`27`	`+ /** @var bool */`
	`28`	`+ private $optional;`
`26`	`29`
`27`	`30`	`public function __construct(?string $key, ?Type $value, bool $optional)`
`28`	`31`	`{`
Original file line number	Diff line number	Diff line change
`@@ -22,8 +22,10 @@`
`22`	`22`	`/** @psalm-immutable */`
`23`	`23`	`final class ConstExpression implements PseudoType`
`24`	`24`	`{`
`25`		`- private Type $owner;`
`26`		`- private string $expression;`
	`25`	`+ /** @var Type */`
	`26`	`+ private $owner;`
	`27`	`+ /** @var string */`
	`28`	`+ private $expression;`
`27`	`29`
`28`	`30`	`public function __construct(Type $owner, string $expression)`
`29`	`31`	`{`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,8 @@`
`20`	`20`	`/** @psalm-immutable */`
`21`	`21`	`class FloatValue implements PseudoType`
`22`	`22`	`{`
`23`		`- private float $value;`
	`23`	`+ /** @var float */`
	`24`	`+ private $value;`
`24`	`25`
`25`	`26`	`public function __construct(float $value)`
`26`	`27`	`{`
Original file line number	Diff line number	Diff line change
`@@ -24,9 +24,11 @@`
`24`	`24`	`*/`
`25`	`25`	`final class IntegerRange extends Integer implements PseudoType`
`26`	`26`	`{`
`27`		`- private string $minValue;`
	`27`	`+ /** @var string */`
	`28`	`+ private $minValue;`
`28`	`29`
`29`		`- private string $maxValue;`
	`30`	`+ /** @var string */`
	`31`	`+ private $maxValue;`
`30`	`32`
`31`	`33`	`public function __construct(string $minValue, string $maxValue)`
`32`	`34`	`{`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,8 @@`
`22`	`22`	`/** @psalm-immutable */`
`23`	`23`	`class StringValue implements PseudoType`
`24`	`24`	`{`
`25`		`- private string $value;`
	`25`	`+ /** @var string */`
	`26`	`+ private $value;`
`26`	`27`
`27`	`28`	`public function __construct(string $value)`
`28`	`29`	`{`