added php 7.3 support (#369)

Co-authored-by: Markus Staab <m.staab@complex-it.de>
staabm · Jun 29, 2022 · 5533f24 · 5533f24
1 parent 7cd9666
commit 5533f24
Show file tree

Hide file tree

Showing 16 changed files with 100 additions and 24 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -16,6 +16,10 @@ jobs:
       fail-fast: false
       matrix:
         include:
+          - php-version: "7.3"
+            db-image: 'mysql:5.7'
+            reflector: "pdo-mysql"
+            mode: "recording"
           - php-version: "7.4"
             db-image: 'mysql:8.0'
             reflector: "pdo-mysql"

diff --git a/composer.json b/composer.json
@@ -3,7 +3,7 @@
 	"type": "phpstan-extension",
 	"license": "MIT",
 	"require": {
-		"php": "^7.4 || ^8.0",
+		"php": "^7.3 || ^8.0",
 		"composer-runtime-api": "^2.0",
 		"composer/semver": "^3.2",
 		"phpstan/phpstan": "^1.5.6"

diff --git a/src/Ast/ExpressionFinder.php b/src/Ast/ExpressionFinder.php
@@ -15,7 +15,10 @@
 
 final class ExpressionFinder
 {
-    private NodeFinder $nodeFinder;
+    /**
+     * @var NodeFinder
+     */
+    private $nodeFinder;
 
     public function __construct()
     {

diff --git a/src/DbSchema/SchemaHasherMysql.php b/src/DbSchema/SchemaHasherMysql.php
@@ -15,7 +15,10 @@ final class SchemaHasherMysql
      */
     private $connection;
 
-    private ?string $hash = null;
+    /**
+     * @var string|null
+     */
+    private $hash = null;
 
     /**
      * @param PDO|mysqli $connection

diff --git a/src/Extensions/PdoStatementExecuteTypeSpecifyingExtension.php b/src/Extensions/PdoStatementExecuteTypeSpecifyingExtension.php
@@ -20,7 +20,10 @@
 
 final class PdoStatementExecuteTypeSpecifyingExtension implements MethodTypeSpecifyingExtension, TypeSpecifierAwareExtension
 {
-    private TypeSpecifier $typeSpecifier;
+    /**
+     * @var TypeSpecifier
+     */
+    private $typeSpecifier;
 
     public function getClass(): string
     {

diff --git a/src/Extensions/PdoStatementSetFetchModeTypeSpecifyingExtension.php b/src/Extensions/PdoStatementSetFetchModeTypeSpecifyingExtension.php
@@ -18,7 +18,10 @@
 
 final class PdoStatementSetFetchModeTypeSpecifyingExtension implements MethodTypeSpecifyingExtension, TypeSpecifierAwareExtension
 {
-    private TypeSpecifier $typeSpecifier;
+    /**
+     * @var TypeSpecifier
+     */
+    private $typeSpecifier;
 
     public function getClass(): string
     {

diff --git a/src/PdoReflection/PdoStatementObjectType.php b/src/PdoReflection/PdoStatementObjectType.php
@@ -25,7 +25,10 @@
 
 class PdoStatementObjectType extends GenericObjectType
 {
-    private Type $bothType;
+    /**
+     * @var Type
+     */
+    private $bothType;
 
     /**
      * @param QueryReflector::FETCH_TYPE* $fetchType

diff --git a/src/QueryReflection/BasePdoQueryReflector.php b/src/QueryReflection/BasePdoQueryReflector.php
@@ -50,18 +50,27 @@ abstract class BasePdoQueryReflector implements QueryReflector, RecordingReflect
     /**
      * @var array<string, PDOException|list<ColumnMeta>|null>
      */
-    protected array $cache = [];
+    protected $cache = [];
 
-    protected TypeMapper $typeMapper;
+    /**
+     * @var TypeMapper
+     */
+    protected $typeMapper;
 
-    // @phpstan-ignore-next-line
-    protected ?PDOStatement $stmt = null;
+    /**
+     * @var PDOStatement|null
+     * @phpstan-ignore-next-line
+     */
+    protected $stmt = null;
     /**
      * @var array<string, array<string, list<string>>>
      */
-    protected array $emulatedFlags = [];
+    protected $emulatedFlags = [];
 
-    protected PDO $pdo;
+    /**
+     * @var PDO
+     */
+    protected $pdo;
 
     public function __construct(PDO $pdo, TypeMapper $typeMapper)
     {

diff --git a/src/QueryReflection/MysqliQueryReflector.php b/src/QueryReflection/MysqliQueryReflector.php
@@ -32,11 +32,17 @@ final class MysqliQueryReflector implements QueryReflector, RecordingReflector
     private const MAX_CACHE_SIZE = 50;
 
     /** @var array<string, mysqli_sql_exception|list<object>|null> */
-    private array $cache = [];
+    private $cache = [];
 
-    private mysqli $db;
+    /**
+     * @var mysqli
+     */
+    private $db;
 
-    private MysqliTypeMapper $typeMapper;
+    /**
+     * @var MysqliTypeMapper
+     */
+    private $typeMapper;
 
     public function __construct(mysqli $mysqli)
     {

diff --git a/src/QueryReflection/ReplayAndRecordingQueryReflector.php b/src/QueryReflection/ReplayAndRecordingQueryReflector.php
@@ -11,12 +11,27 @@
 
 final class ReplayAndRecordingQueryReflector implements QueryReflector, RecordingReflector
 {
-    private ReplayQueryReflector $replayReflector;
-
-    private ?RecordingQueryReflector $recordingReflector = null;
-    private QueryReflector $queryReflector;
-    private ReflectionCache $reflectionCache;
-    private SchemaHasherMysql $schemaHasher;
+    /**
+     * @var ReplayQueryReflector
+     */
+    private $replayReflector;
+
+    /**
+     * @var RecordingQueryReflector|null
+     */
+    private $recordingReflector = null;
+    /**
+     * @var QueryReflector
+     */
+    private $queryReflector;
+    /**
+     * @var ReflectionCache
+     */
+    private $reflectionCache;
+    /**
+     * @var SchemaHasherMysql
+     */
+    private $schemaHasher;
 
     public function __construct(ReflectionCache $reflectionCache, QueryReflector $queryReflector, SchemaHasherMysql $schemaHasher)
     {

diff --git a/src/TypeMapping/MysqliTypeMapper.php b/src/TypeMapping/MysqliTypeMapper.php
@@ -10,12 +10,15 @@
 final class MysqliTypeMapper
 {
     /** @var array<int, string> */
-    private array $nativeTypes = [];
+    private $nativeTypes = [];
 
     /** @var array<int, string> */
-    private array $nativeFlags = [];
+    private $nativeFlags = [];
 
-    private MysqlTypeMapper $typeMapper;
+    /**
+     * @var MysqlTypeMapper
+     */
+    private $typeMapper;
 
     public function __construct()
     {

diff --git a/tests/rules/SyntaxErrorInPreparedStatementMethodRuleReflectorTest.php b/tests/rules/SyntaxErrorInPreparedStatementMethodRuleReflectorTest.php
@@ -25,6 +25,10 @@ public static function getAdditionalConfigFiles(): array
 
     public function testSyntaxErrorInQueryRule(): void
     {
+        if (\PHP_VERSION_ID < 70400) {
+            self::markTestSkipped('Test requires PHP 7.4.');
+        }
+
         if ('mysqli' === getenv('DBA_REFLECTOR')) {
             $expectedErrors = [
             [

diff --git a/tests/rules/SyntaxErrorInPreparedStatementMethodSubclassedRulePdoReflectorTest.php b/tests/rules/SyntaxErrorInPreparedStatementMethodSubclassedRulePdoReflectorTest.php
@@ -25,6 +25,10 @@ public static function getAdditionalConfigFiles(): array
 
     public function testSyntaxErrorInQueryRule(): void
     {
+        if (\PHP_VERSION_ID < 70400) {
+            self::markTestSkipped('Test requires PHP 7.4.');
+        }
+
         if ('pdo-mysql' !== getenv('DBA_REFLECTOR')) {
             $this->markTestSkipped('Only works with PdoMysqlQueryReflector');
         }
@@ -49,6 +53,10 @@ public function testSyntaxErrorInQueryRule(): void
 
     public function testSyntaxErrorInPgsqlQueryRule(): void
     {
+        if (\PHP_VERSION_ID < 70400) {
+            self::markTestSkipped('Test requires PHP 7.4.');
+        }
+
         if ('pdo-pgsql' !== getenv('DBA_REFLECTOR')) {
             $this->markTestSkipped('Only works with PdoPgsqlQueryReflector');
         }

diff --git a/tests/rules/SyntaxErrorInQueryFunctionRulePdoReflectorTest.php b/tests/rules/SyntaxErrorInQueryFunctionRulePdoReflectorTest.php
@@ -25,6 +25,10 @@ public static function getAdditionalConfigFiles(): array
 
     public function testSyntaxErrorInQueryRule(): void
     {
+        if (\PHP_VERSION_ID < 70400) {
+            self::markTestSkipped('Test requires PHP 7.4.');
+        }
+
         if ('pdo-mysql' !== getenv('DBA_REFLECTOR')) {
             $this->markTestSkipped('Only works with PdoMysqlQueryReflector');
         }

diff --git a/tests/rules/SyntaxErrorInQueryMethodRuleTest.php b/tests/rules/SyntaxErrorInQueryMethodRuleTest.php
@@ -25,6 +25,10 @@ public static function getAdditionalConfigFiles(): array
 
     public function testSyntaxErrorInQueryRule(): void
     {
+        if (\PHP_VERSION_ID < 70400) {
+            self::markTestSkipped('Test requires PHP 7.4.');
+        }
+
         if ('mysqli' === getenv('DBA_REFLECTOR')) {
             $expected = [
                 [

diff --git a/tests/rules/SyntaxErrorInQueryMethodSubclassedRulePdoReflectorTest.php b/tests/rules/SyntaxErrorInQueryMethodSubclassedRulePdoReflectorTest.php
@@ -25,6 +25,10 @@ public static function getAdditionalConfigFiles(): array
 
     public function testSyntaxErrorInQueryRule(): void
     {
+        if (\PHP_VERSION_ID < 70400) {
+            self::markTestSkipped('Test requires PHP 7.4.');
+        }
+
         if ('pdo-mysql' !== getenv('DBA_REFLECTOR')) {
             $this->markTestSkipped('Only works with PdoMysqlQueryReflector');
         }