native types

staabm · staabm · commit 49c78bfa059b · 2024-11-07T17:46:32.000+01:00
diff --git a/src/Analyzer/QueryPlanResult.php b/src/Analyzer/QueryPlanResult.php
@@ -15,12 +15,9 @@ final class QueryPlanResult
     /**
      * @var array<string, self::*>
      */
-    private $result = [];
+    private array $result = [];
 
-    /**
-     * @var string
-     */
-    private $simulatedQuery;
+    private string $simulatedQuery;
 
     public function __construct(string $simulatedQuery)
     {
diff --git a/src/Ast/ExpressionFinder.php b/src/Ast/ExpressionFinder.php
@@ -16,10 +16,7 @@
 
 final class ExpressionFinder
 {
-    /**
-     * @var NodeFinder
-     */
-    private $nodeFinder;
+    private NodeFinder $nodeFinder;
 
     public function __construct()
     {
diff --git a/src/Ast/PreviousConnectingVisitor.php b/src/Ast/PreviousConnectingVisitor.php
@@ -17,12 +17,9 @@ final class PreviousConnectingVisitor extends NodeVisitorAbstract
     /**
      * @var list<Node>
      */
-    private $stack = [];
+    private array $stack = [];
 
-    /**
-     * @var ?Node
-     */
-    private $previous;
+    private ?Node $previous;
 
     public function beforeTraverse(array $nodes)
     {
diff --git a/src/DbSchema/LazySchemaHasher.php b/src/DbSchema/LazySchemaHasher.php
@@ -11,10 +11,7 @@ class LazySchemaHasher implements SchemaHasher
      */
     private $schemaHasherFactory;
 
-    /**
-     * @var SchemaHasher|null
-     */
-    private $schemaHasher;
+    private ?SchemaHasher $schemaHasher;
 
     /**
      * @param callable():SchemaHasher $schemaHasherFactory
diff --git a/src/DbSchema/SchemaHasherMysql.php b/src/DbSchema/SchemaHasherMysql.php
@@ -15,10 +15,7 @@ final class SchemaHasherMysql implements SchemaHasher
      */
     private $connection;
 
-    /**
-     * @var string|null
-     */
-    private $hash = null;
+    private ?string $hash = null;
 
     /**
      * @param PDO|mysqli $connection
diff --git a/src/Error.php b/src/Error.php
@@ -15,10 +15,7 @@
  */
 final class Error
 {
-    /**
-     * @var string
-     */
-    private $message;
+    private string $message;
 
     /**
      * @var ErrorCodes
diff --git a/src/Extensions/MysqliEscapeStringDynamicReturnTypeExtension.php b/src/Extensions/MysqliEscapeStringDynamicReturnTypeExtension.php
@@ -25,10 +25,7 @@
 
 final class MysqliEscapeStringDynamicReturnTypeExtension implements DynamicMethodReturnTypeExtension, DynamicFunctionReturnTypeExtension
 {
-    /**
-     * @var PhpVersion
-     */
-    private $phpVersion;
+    private PhpVersion $phpVersion;
 
     public function __construct(PhpVersion $phpVersion)
     {
diff --git a/src/Extensions/MysqliQueryDynamicReturnTypeExtension.php b/src/Extensions/MysqliQueryDynamicReturnTypeExtension.php
@@ -26,10 +26,7 @@
 
 final class MysqliQueryDynamicReturnTypeExtension implements DynamicMethodReturnTypeExtension, DynamicFunctionReturnTypeExtension
 {
-    /**
-     * @var PhpVersion
-     */
-    private $phpVersion;
+    private PhpVersion $phpVersion;
 
     public function __construct(PhpVersion $phpVersion)
     {
diff --git a/src/Extensions/PdoPrepareDynamicReturnTypeExtension.php b/src/Extensions/PdoPrepareDynamicReturnTypeExtension.php
@@ -22,10 +22,7 @@
 
 final class PdoPrepareDynamicReturnTypeExtension implements DynamicMethodReturnTypeExtension
 {
-    /**
-     * @var PhpVersion
-     */
-    private $phpVersion;
+    private PhpVersion $phpVersion;
 
     public function __construct(PhpVersion $phpVersion)
     {
diff --git a/src/Extensions/PdoQueryDynamicReturnTypeExtension.php b/src/Extensions/PdoQueryDynamicReturnTypeExtension.php
@@ -24,10 +24,7 @@
 
 final class PdoQueryDynamicReturnTypeExtension implements DynamicMethodReturnTypeExtension
 {
-    /**
-     * @var PhpVersion
-     */
-    private $phpVersion;
+    private PhpVersion $phpVersion;
 
     public function __construct(PhpVersion $phpVersion)
     {
diff --git a/src/Extensions/PdoQuoteDynamicReturnTypeExtension.php b/src/Extensions/PdoQuoteDynamicReturnTypeExtension.php
@@ -24,10 +24,7 @@
 
 final class PdoQuoteDynamicReturnTypeExtension implements DynamicMethodReturnTypeExtension
 {
-    /**
-     * @var PhpVersion
-     */
-    private $phpVersion;
+    private PhpVersion $phpVersion;
 
     public function __construct(PhpVersion $phpVersion)
     {
diff --git a/src/Extensions/PdoStatementExecuteTypeSpecifyingExtension.php b/src/Extensions/PdoStatementExecuteTypeSpecifyingExtension.php
@@ -20,10 +20,7 @@
 
 final class PdoStatementExecuteTypeSpecifyingExtension implements MethodTypeSpecifyingExtension, TypeSpecifierAwareExtension
 {
-    /**
-     * @var TypeSpecifier
-     */
-    private $typeSpecifier;
+    private TypeSpecifier $typeSpecifier;
 
     public function getClass(): string
     {
diff --git a/src/Extensions/PdoStatementFetchDynamicReturnTypeExtension.php b/src/Extensions/PdoStatementFetchDynamicReturnTypeExtension.php
@@ -26,15 +26,9 @@
 
 final class PdoStatementFetchDynamicReturnTypeExtension implements DynamicMethodReturnTypeExtension
 {
-    /**
-     * @var PhpVersion
-     */
-    private $phpVersion;
-
-    /**
-     * @var ReflectionProvider
-     */
-    private $reflectionProvider;
+    private PhpVersion $phpVersion;
+
+    private ReflectionProvider $reflectionProvider;
 
     public function __construct(PhpVersion $phpVersion, ReflectionProvider $reflectionProvider)
     {
diff --git a/src/Extensions/PdoStatementFetchObjectDynamicReturnTypeExtension.php b/src/Extensions/PdoStatementFetchObjectDynamicReturnTypeExtension.php
@@ -18,10 +18,7 @@
 
 final class PdoStatementFetchObjectDynamicReturnTypeExtension implements DynamicMethodReturnTypeExtension
 {
-    /**
-     * @var ReflectionProvider
-     */
-    private $reflectionProvider;
+    private ReflectionProvider $reflectionProvider;
 
     public function __construct(ReflectionProvider $reflectionProvider)
     {
diff --git a/src/Extensions/PdoStatementSetFetchModeTypeSpecifyingExtension.php b/src/Extensions/PdoStatementSetFetchModeTypeSpecifyingExtension.php
@@ -18,10 +18,7 @@
 
 final class PdoStatementSetFetchModeTypeSpecifyingExtension implements MethodTypeSpecifyingExtension, TypeSpecifierAwareExtension
 {
-    /**
-     * @var TypeSpecifier
-     */
-    private $typeSpecifier;
+    private TypeSpecifier $typeSpecifier;
 
     public function getClass(): string
     {
diff --git a/src/QueryReflection/BasePdoQueryReflector.php b/src/QueryReflection/BasePdoQueryReflector.php
@@ -55,7 +55,7 @@ abstract class BasePdoQueryReflector implements QueryReflector, RecordingReflect
     /**
      * @var array<string, PDOException|list<ColumnMeta>|null>
      */
-    protected $cache = [];
+    protected array $cache = [];
 
     /**
      * @var TypeMapper
@@ -71,12 +71,9 @@ abstract class BasePdoQueryReflector implements QueryReflector, RecordingReflect
     /**
      * @var array<string, array<string, list<string>>>
      */
-    protected $emulatedFlags = [];
+    protected array $emulatedFlags = [];
 
-    /**
-     * @var PDO
-     */
-    protected $pdo;
+    protected PDO $pdo;
 
     public function __construct(PDO $pdo)
     {
diff --git a/src/QueryReflection/ChainedReflector.php b/src/QueryReflection/ChainedReflector.php
@@ -12,7 +12,7 @@ final class ChainedReflector implements QueryReflector
     /**
      * @var QueryReflector[]
      */
-    private $reflectors;
+    private array $reflectors;
 
     /**
      * @param QueryReflector ...$reflectors
diff --git a/src/QueryReflection/LazyQueryReflector.php b/src/QueryReflection/LazyQueryReflector.php
@@ -14,15 +14,9 @@ final class LazyQueryReflector implements QueryReflector, RecordingReflector
      */
     private $reflectorFactory;
 
-    /**
-     * @var QueryReflector|null
-     */
-    private $reflector;
+    private ?QueryReflector $reflector;
 
-    /**
-     * @var DbaApi|null
-     */
-    private $dbaApi;
+    private ?DbaApi $dbaApi;
 
     /**
      * @param callable():QueryReflector $reflectorFactory
diff --git a/src/QueryReflection/Parameter.php b/src/QueryReflection/Parameter.php
@@ -14,22 +14,13 @@ final class Parameter
     /**
      * @var non-empty-string|null
      */
-    public $name;
+    public ?string $name = null;
 
-    /**
-     * @var Type
-     */
-    public $type;
+    public Type $type;
 
-    /**
-     * @var ?string
-     */
-    public $simulatedValue;
+    public ?string $simulatedValue = null;
 
-    /**
-     * @var bool
-     */
-    public $isOptional;
+    public bool $isOptional;
 
     /**
      * @param non-empty-string|null $name
diff --git a/src/QueryReflection/QueryReflection.php b/src/QueryReflection/QueryReflection.php
@@ -44,20 +44,11 @@ final class QueryReflection
 
     private const REGEX_NAMED_PLACEHOLDER = '{(["\'])((?:(?!\1)(?s:.))*\1)|(' . self::NAMED_PATTERN . ')}';
 
-    /**
-     * @var QueryReflector|null
-     */
-    private static $reflector;
+    private static ?QueryReflector $reflector = null;
 
-    /**
-     * @var RuntimeConfiguration|null
-     */
-    private static $runtimeConfiguration;
+    private static ?RuntimeConfiguration $runtimeConfiguration = null;
 
-    /**
-     * @var SchemaReflection
-     */
-    private $schemaReflection;
+    private ?SchemaReflection $schemaReflection = null;
 
     public function __construct(?DbaApi $dbaApi = null)
     {
diff --git a/src/QueryReflection/RecordingQueryReflector.php b/src/QueryReflection/RecordingQueryReflector.php
@@ -9,15 +9,9 @@
 
 final class RecordingQueryReflector implements QueryReflector, RecordingReflector
 {
-    /**
-     * @var ReflectionCache
-     */
-    private $reflectionCache;
-
-    /**
-     * @var QueryReflector
-     */
-    private $reflector;
+    private ReflectionCache $reflectionCache;
+
+    private QueryReflector $reflector;
 
     public function __construct(ReflectionCache $cache, QueryReflector $wrappedReflector)
     {

Original file line number	Diff line number	Diff line change
`@@ -16,10 +16,7 @@`
`16`	`16`
`17`	`17`	`final class ExpressionFinder`
`18`	`18`	`{`
`19`		`- /**`
`20`		`- * @var NodeFinder`
`21`		`- */`
`22`		`- private $nodeFinder;`
	`19`	`+ private NodeFinder $nodeFinder;`
`23`	`20`
`24`	`21`	`public function __construct()`
`25`	`22`	`{`
Original file line number	Diff line number	Diff line change
`@@ -25,10 +25,7 @@`
`25`	`25`
`26`	`26`	`final class MysqliEscapeStringDynamicReturnTypeExtension implements DynamicMethodReturnTypeExtension, DynamicFunctionReturnTypeExtension`
`27`	`27`	`{`
`28`		`- /**`
`29`		`- * @var PhpVersion`
`30`		`- */`
`31`		`- private $phpVersion;`
	`28`	`+ private PhpVersion $phpVersion;`
`32`	`29`
`33`	`30`	`public function __construct(PhpVersion $phpVersion)`
`34`	`31`	`{`
Original file line number	Diff line number	Diff line change
`@@ -26,10 +26,7 @@`
`26`	`26`
`27`	`27`	`final class MysqliQueryDynamicReturnTypeExtension implements DynamicMethodReturnTypeExtension, DynamicFunctionReturnTypeExtension`
`28`	`28`	`{`
`29`		`- /**`
`30`		`- * @var PhpVersion`
`31`		`- */`
`32`		`- private $phpVersion;`
	`29`	`+ private PhpVersion $phpVersion;`
`33`	`30`
`34`	`31`	`public function __construct(PhpVersion $phpVersion)`
`35`	`32`	`{`
Original file line number	Diff line number	Diff line change
`@@ -22,10 +22,7 @@`
`22`	`22`
`23`	`23`	`final class PdoPrepareDynamicReturnTypeExtension implements DynamicMethodReturnTypeExtension`
`24`	`24`	`{`
`25`		`- /**`
`26`		`- * @var PhpVersion`
`27`		`- */`
`28`		`- private $phpVersion;`
	`25`	`+ private PhpVersion $phpVersion;`
`29`	`26`
`30`	`27`	`public function __construct(PhpVersion $phpVersion)`
`31`	`28`	`{`
Original file line number	Diff line number	Diff line change
`@@ -24,10 +24,7 @@`
`24`	`24`
`25`	`25`	`final class PdoQueryDynamicReturnTypeExtension implements DynamicMethodReturnTypeExtension`
`26`	`26`	`{`
`27`		`- /**`
`28`		`- * @var PhpVersion`
`29`		`- */`
`30`		`- private $phpVersion;`
	`27`	`+ private PhpVersion $phpVersion;`
`31`	`28`
`32`	`29`	`public function __construct(PhpVersion $phpVersion)`
`33`	`30`	`{`