Remove dead PHP_VERSION_ID check (#712)

staabm · Nov 14, 2024 · df9c68f · df9c68f
1 parent 24b567f
commit df9c68f
Show file tree

Hide file tree

Showing 12 changed files with 15 additions and 61 deletions.
diff --git a/tests/default/DbaInferenceTest.php b/tests/default/DbaInferenceTest.php
@@ -13,19 +13,17 @@ class DbaInferenceTest extends TypeInferenceTestCase
 {
     public function dataFileAsserts(): iterable
     {
-        if (\PHP_VERSION_ID >= 70300) {
-            if (! InstalledVersions::isInstalled('doctrine/dbal')) {
-                throw new \Exception('doctrine/dbal 3.x is required to run tests for php 7.3+. Please install it via composer.');
-            }
-
-            yield from $this->gatherAssertTypes(__DIR__ . '/data/doctrine-dbal-union-result.php');
-            yield from $this->gatherAssertTypes(__DIR__ . '/data/doctrine-dbal.php');
-            yield from $this->gatherAssertTypes(__DIR__ . '/data/inference-placeholder.php');
-
-            // for some reason does not work in pgsql
-            if ('pdo-pgsql' !== getenv('DBA_REFLECTOR')) {
-                yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-680.php');
-            }
+        if (! InstalledVersions::isInstalled('doctrine/dbal')) {
+            throw new \Exception('doctrine/dbal 3.x is required to run tests for php 7.3+. Please install it via composer.');
+        }
+
+        yield from $this->gatherAssertTypes(__DIR__ . '/data/doctrine-dbal-union-result.php');
+        yield from $this->gatherAssertTypes(__DIR__ . '/data/doctrine-dbal.php');
+        yield from $this->gatherAssertTypes(__DIR__ . '/data/inference-placeholder.php');
+
+        // for some reason does not work in pgsql
+        if ('pdo-pgsql' !== getenv('DBA_REFLECTOR')) {
+            yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-680.php');
         }
 
         // make sure class constants can be resolved

diff --git a/tests/rules/QueryPlanAnalyzerRuleTest.php b/tests/rules/QueryPlanAnalyzerRuleTest.php
@@ -62,10 +62,6 @@ public function testNotUsingIndex(): void
             self::markTestSkipped('query plan analyzer requires a active database connection');
         }
 
-        if (\PHP_VERSION_ID < 70300) {
-            self::markTestSkipped('not yet supported on php < 7.3');
-        }
-
         $this->numberOfAllowedUnindexedReads = true;
         $this->numberOfRowsNotRequiringIndex = 2;
 
@@ -111,10 +107,6 @@ public function testNotUsingIndexInDebugMode(): void
             self::markTestSkipped('query plan analyzer requires a active database connection');
         }
 
-        if (\PHP_VERSION_ID < 70300) {
-            self::markTestSkipped('not yet supported on php < 7.3');
-        }
-
         $this->debugMode = true;
         $this->numberOfAllowedUnindexedReads = true;
         $this->numberOfRowsNotRequiringIndex = 2;

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

diff --git a/tests/rules/SyntaxErrorInPreparedStatementMethodRuleTest.php b/tests/rules/SyntaxErrorInPreparedStatementMethodRuleTest.php
@@ -30,10 +30,6 @@ public static function getAdditionalConfigFiles(): array
 
     public function testSyntaxErrorInQueryRule(): void
     {
-        if (\PHP_VERSION_ID < 70400) {
-            self::markTestSkipped('Test requires PHP 7.4.');
-        }
-
         if (MysqliQueryReflector::NAME === getenv('DBA_REFLECTOR')) {
             $expectedErrors = [
                 [
@@ -232,10 +228,6 @@ public function testSyntaxErrorInQueryRule(): void
 
     public function testBug94()
     {
-        if (\PHP_VERSION_ID < 70400) {
-            self::markTestSkipped('Test requires PHP 7.4.');
-        }
-
         if (MysqliQueryReflector::NAME === getenv('DBA_REFLECTOR')) {
             self::markTestSkipped('Error message different depending on version of the database.');
         } elseif (PdoPgSqlQueryReflector::NAME === getenv('DBA_REFLECTOR')) {
@@ -263,10 +255,6 @@ public function testBug94()
 
     public function testSyntaxErrorWithInferencePlaceholder()
     {
-        if (\PHP_VERSION_ID < 70400) {
-            self::markTestSkipped('Test requires PHP 7.4.');
-        }
-
         if (MysqliQueryReflector::NAME === getenv('DBA_REFLECTOR')) {
             $expectedErrors = [
                 [

diff --git a/tests/rules/SyntaxErrorInPreparedStatementMethodSubclassedRuleTest.php b/tests/rules/SyntaxErrorInPreparedStatementMethodSubclassedRuleTest.php
@@ -30,10 +30,6 @@ public static function getAdditionalConfigFiles(): array
 
     public function testSyntaxErrorInQueryRule(): void
     {
-        if (\PHP_VERSION_ID < 70400) {
-            self::markTestSkipped('Test requires PHP 7.4.');
-        }
-
         $this->analyse([__DIR__ . '/data/syntax-error-in-method-subclassed.php'], $this->getExpectedErrors());
     }
 

diff --git a/tests/rules/SyntaxErrorInQueryFunctionRuleTest.php b/tests/rules/SyntaxErrorInQueryFunctionRuleTest.php
@@ -30,10 +30,6 @@ public static function getAdditionalConfigFiles(): array
 
     public function testSyntaxErrorInQueryRule(): void
     {
-        if (\PHP_VERSION_ID < 70400) {
-            self::markTestSkipped('Test requires PHP 7.4.');
-        }
-
         $this->analyse([__DIR__ . '/data/syntax-error-in-query-function.php'], $this->getExpectedErrors());
     }
 

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

diff --git a/tests/rules/SyntaxErrorInQueryMethodSubclassedRuleTest.php b/tests/rules/SyntaxErrorInQueryMethodSubclassedRuleTest.php
@@ -30,10 +30,6 @@ public static function getAdditionalConfigFiles(): array
 
     public function testSyntaxErrorInQueryRule(): void
     {
-        if (\PHP_VERSION_ID < 70400) {
-            self::markTestSkipped('Test requires PHP 7.4.');
-        }
-
         $this->analyse([__DIR__ . '/data/syntax-error-in-method-subclassed.php'], $this->getExpectedErrors());
     }
 

diff --git a/tests/sqlAst/SqlAstInferenceTest.php b/tests/sqlAst/SqlAstInferenceTest.php
@@ -11,7 +11,7 @@ class SqlAstInferenceTest extends TypeInferenceTestCase
 {
     public function dataFileAsserts(): iterable
     {
-        if (\PHP_VERSION_ID >= 70400 && 'pdo-pgsql' !== getenv('DBA_REFLECTOR')) {
+        if ('pdo-pgsql' !== getenv('DBA_REFLECTOR')) {
             yield from $this->gatherAssertTypes(__DIR__ . '/data/sql-ast-narrowing.php');
         }
     }

diff --git a/tests/sqlAst/config/bootstrap.php b/tests/sqlAst/config/bootstrap.php
@@ -17,9 +17,7 @@
 $config = RuntimeConfiguration::create();
 $config->errorMode(RuntimeConfiguration::ERROR_MODE_EXCEPTION);
 $config->analyzeWriteQueries(true);
-if (\PHP_VERSION_ID >= 70400) {
-    $config->utilizeSqlAst(true);
-}
+$config->utilizeSqlAst(true);
 
 // $config->debugMode(true);
 $reflector = ReflectorFactory::create(__DIR__);

diff --git a/tests/stringify/InferenceStringifyTest.php b/tests/stringify/InferenceStringifyTest.php
@@ -12,7 +12,7 @@ public function dataFileAsserts(): iterable
     {
         yield from $this->gatherAssertTypes(__DIR__ . '/data/stringify.php');
 
-        if (\PHP_VERSION_ID >= 70400 && 'pdo-pgsql' !== getenv('DBA_REFLECTOR')) {
+        if ('pdo-pgsql' !== getenv('DBA_REFLECTOR')) {
             yield from $this->gatherAssertTypes(__DIR__ . '/data/ast-narrowed-stringify.php');
         }
     }

diff --git a/tests/stringify/config/bootstrap.php b/tests/stringify/config/bootstrap.php
@@ -17,9 +17,7 @@
 $config = RuntimeConfiguration::create();
 $config->errorMode(RuntimeConfiguration::ERROR_MODE_EXCEPTION);
 $config->stringifyTypes(true);
-if (\PHP_VERSION_ID >= 70400) {
-    $config->utilizeSqlAst(true);
-}
+$config->utilizeSqlAst(true);
 
 $reflector = ReflectorFactory::create(__DIR__);