From 49d855473ea08c339972f0cdc040acdb54d82b46 Mon Sep 17 00:00:00 2001 From: Markus Staab Date: Sun, 6 Feb 2022 21:57:55 +0100 Subject: [PATCH 1/2] enforce strict comparison --- .php-cs-fixer.dist.php | 1 + ...atementFetchDynamicReturnTypeExtension.php | 2 +- src/PdoReflection/PdoStatementReflection.php | 4 +- src/QueryReflection/ChainedReflector.php | 2 +- src/QueryReflection/PlaceholderValidation.php | 2 +- tests/default/config/.phpstan-dba.cache | 146 ------------------ .../default/config/.phpunit-phpstan-dba.cache | 81 +--------- tests/stringify/config/.phpstan-dba.cache | 1 + .../config/.phpunit-phpstan-dba.cache | 1 + 9 files changed, 13 insertions(+), 227 deletions(-) diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php index 5488326bb..435192915 100644 --- a/.php-cs-fixer.dist.php +++ b/.php-cs-fixer.dist.php @@ -16,6 +16,7 @@ ->setRules([ '@Symfony' => true, '@Symfony:risky' => true, + 'strict_param' => true, 'array_syntax' => ['syntax' => 'short'], 'fopen_flags' => false, 'ordered_imports' => true, diff --git a/src/Extensions/PdoStatementFetchDynamicReturnTypeExtension.php b/src/Extensions/PdoStatementFetchDynamicReturnTypeExtension.php index bcaebb790..43d450741 100644 --- a/src/Extensions/PdoStatementFetchDynamicReturnTypeExtension.php +++ b/src/Extensions/PdoStatementFetchDynamicReturnTypeExtension.php @@ -74,7 +74,7 @@ private function inferType(MethodReflection $methodReflection, MethodCall $metho } $fetchType = $fetchModeType->getValue(); - if (!\in_array($fetchType, [PDO::FETCH_ASSOC, PDO::FETCH_NUM, PDO::FETCH_BOTH])) { + if (!\in_array($fetchType, [PDO::FETCH_ASSOC, PDO::FETCH_NUM, PDO::FETCH_BOTH], true)) { return null; } } diff --git a/src/PdoReflection/PdoStatementReflection.php b/src/PdoReflection/PdoStatementReflection.php index 6e0988e99..2ac7003ea 100644 --- a/src/PdoReflection/PdoStatementReflection.php +++ b/src/PdoReflection/PdoStatementReflection.php @@ -34,9 +34,7 @@ public function findPrepareQueryStringExpression(MethodReflection $methodReflect } /** - * // the following param doesnt work, see phpstan bug https://github.com/phpstan/phpstan/issues/6577. - * - * @xx-param PDO::FETCH* $fetchType + * @param PDO::FETCH* $fetchType * * @return Type|null */ diff --git a/src/QueryReflection/ChainedReflector.php b/src/QueryReflection/ChainedReflector.php index ab4f89478..afa7e41ff 100644 --- a/src/QueryReflection/ChainedReflector.php +++ b/src/QueryReflection/ChainedReflector.php @@ -31,7 +31,7 @@ public function validateQueryString(string $queryString): ?Error // on "not found" error, we try the next reflector. if ($reflectorError) { - if (!\in_array($reflectorError->getCode(), [MysqliQueryReflector::MYSQL_UNKNOWN_TABLE])) { + if (!\in_array($reflectorError->getCode(), [MysqliQueryReflector::MYSQL_UNKNOWN_TABLE], true)) { return $reflectorError; } if (true === $nooneKnows) { diff --git a/src/QueryReflection/PlaceholderValidation.php b/src/QueryReflection/PlaceholderValidation.php index 20aa887fa..44617166e 100644 --- a/src/QueryReflection/PlaceholderValidation.php +++ b/src/QueryReflection/PlaceholderValidation.php @@ -111,7 +111,7 @@ private function validateNamedPlaceholders(string $queryString, array $parameter if ($parameter->isOptional) { continue; } - if (!\in_array($placeholderKey, $namedPlaceholders)) { + if (!\in_array($placeholderKey, $namedPlaceholders, true)) { yield sprintf('Value %s is given, but the query does not contain this placeholder.', $placeholderKey); } } diff --git a/tests/default/config/.phpstan-dba.cache b/tests/default/config/.phpstan-dba.cache index 934855636..76346ee12 100644 --- a/tests/default/config/.phpstan-dba.cache +++ b/tests/default/config/.phpstan-dba.cache @@ -9,10 +9,6 @@ 'message' => 'Unknown column \'doesNotExist\' in \'group statement\'', 'code' => 1054, )), - 'result' => - array ( - 3 => NULL, - ), ), 'SELECT * FROM ada ORDER BY doesNotExist' => array ( @@ -21,10 +17,6 @@ 'message' => 'Unknown column \'doesNotExist\' in \'order clause\'', 'code' => 1054, )), - 'result' => - array ( - 3 => NULL, - ), ), 'SELECT * FROM ada WHERE doesNotExist=1' => array ( @@ -33,14 +25,9 @@ 'message' => 'Unknown column \'doesNotExist\' in \'where clause\'', 'code' => 1054, )), - 'result' => - array ( - 3 => NULL, - ), ), 'SELECT * FROM typemix' => array ( - 'error' => NULL, 'result' => array ( 3 => @@ -674,14 +661,9 @@ 'message' => 'Table \'phpstan_dba.unknownTable\' doesn\'t exist', 'code' => 1146, )), - 'result' => - array ( - 3 => NULL, - ), ), 'SELECT MAX(adaid), MIN(adaid), COUNT(adaid), AVG(adaid) FROM ada WHERE adaid = 1' => array ( - 'error' => NULL, 'result' => array ( 3 => @@ -806,7 +788,6 @@ ), 'SELECT a.email, b.adaid, b.gesperrt FROM ada a LEFT JOIN ada b ON a.adaid=b.adaid' => array ( - 'error' => NULL, 'result' => array ( 3 => @@ -911,7 +892,6 @@ ), 'SELECT adaid FROM ada LIMIT 1 FOR SHARE' => array ( - 'error' => NULL, 'result' => array ( 3 => @@ -952,7 +932,6 @@ ), 'SELECT adaid FROM ada LIMIT 1 OFFSET 1' => array ( - 'error' => NULL, 'result' => array ( 3 => @@ -993,7 +972,6 @@ ), 'SELECT adaid FROM ada LIMIT 1 OFFSET 1 FOR UPDATE' => array ( - 'error' => NULL, 'result' => array ( 3 => @@ -1034,7 +1012,6 @@ ), 'SELECT adaid FROM ada WHERE adaid IN (\'1\')' => array ( - 'error' => NULL, 'result' => array ( 5 => @@ -1094,7 +1071,6 @@ ), 'SELECT adaid FROM ada WHERE adaid IN (\'1\') AND email LIKE \'1970-01-01\'' => array ( - 'error' => NULL, 'result' => array ( 5 => @@ -1154,7 +1130,6 @@ ), 'SELECT adaid FROM ada WHERE adaid IN (\'1.0\')' => array ( - 'error' => NULL, 'result' => array ( 5 => @@ -1219,10 +1194,6 @@ 'message' => 'You have an error in your SQL syntax; check the manual that corresponds to your MySQL/MariaDB server version for the right syntax to use near \':adaids) LIMIT 0\' at line 1', 'code' => 1064, )), - 'result' => - array ( - 5 => NULL, - ), ), 'SELECT adaid FROM ada WHERE adaid IN (:ids)' => array ( @@ -1231,10 +1202,6 @@ 'message' => 'You have an error in your SQL syntax; check the manual that corresponds to your MySQL/MariaDB server version for the right syntax to use near \':ids) LIMIT 0\' at line 1', 'code' => 1064, )), - 'result' => - array ( - 5 => NULL, - ), ), 'SELECT adaid FROM ada WHERE adaid IN (:ids) AND email LIKE :time' => array ( @@ -1243,14 +1210,9 @@ 'message' => 'You have an error in your SQL syntax; check the manual that corresponds to your MySQL/MariaDB server version for the right syntax to use near \':ids) AND email LIKE :time LIMIT 0\' at line 1', 'code' => 1064, )), - 'result' => - array ( - 5 => NULL, - ), ), 'SELECT adaid FROM ada WHERE adaid IN (NULL) AND email LIKE \'1970-01-01\'' => array ( - 'error' => NULL, 'result' => array ( 5 => @@ -1310,7 +1272,6 @@ ), 'SELECT adaid FROM ada WHERE email LIKE ":gesperrt%"' => array ( - 'error' => NULL, 'result' => array ( 5 => @@ -1404,7 +1365,6 @@ ), 'SELECT adaid FROM ada WHERE email LIKE "hello?%"' => array ( - 'error' => NULL, 'result' => array ( 5 => @@ -1498,7 +1458,6 @@ ), 'SELECT adaid FROM ada WHERE email LIKE \'%questions ?%\'' => array ( - 'error' => NULL, 'result' => array ( 5 => @@ -1592,7 +1551,6 @@ ), 'SELECT adaid FROM ada WHERE email LIKE \':gesperrt%\'' => array ( - 'error' => NULL, 'result' => array ( 5 => @@ -1686,7 +1644,6 @@ ), 'SELECT adaid FROM ada WHERE email=\'1970-01-01\'' => array ( - 'error' => NULL, 'result' => array ( 5 => @@ -1751,14 +1708,9 @@ 'message' => 'You have an error in your SQL syntax; check the manual that corresponds to your MySQL/MariaDB server version for the right syntax to use near \':email LIMIT 0\' at line 1', 'code' => 1064, )), - 'result' => - array ( - 5 => NULL, - ), ), 'SELECT akid FROM ak WHERE eadavk>1.0' => array ( - 'error' => NULL, 'result' => array ( 3 => @@ -1799,7 +1751,6 @@ ), 'SELECT akid FROM ak WHERE eadavk>1.1' => array ( - 'error' => NULL, 'result' => array ( 3 => @@ -1840,7 +1791,6 @@ ), 'SELECT count(*) FROM typemix WHERE c_date = \'1970-01-01\'' => array ( - 'error' => NULL, 'result' => array ( 5 => @@ -1894,7 +1844,6 @@ ), 'SELECT count(*) FROM typemix WHERE c_datetime = \'1970-01-01\'' => array ( - 'error' => NULL, 'result' => array ( 5 => @@ -1953,14 +1902,9 @@ 'message' => 'Unknown column \'doesNotExist\' in \'field list\'', 'code' => 1054, )), - 'result' => - array ( - 3 => NULL, - ), ), 'SELECT eladaid FROM ak' => array ( - 'error' => NULL, 'result' => array ( 3 => @@ -2024,14 +1968,9 @@ 'message' => 'You have an error in your SQL syntax; check the manual that corresponds to your MySQL/MariaDB server version for the right syntax to use near \':gesperrt LIMIT 0\' at line 1', 'code' => 1064, )), - 'result' => - array ( - 5 => NULL, - ), ), 'SELECT email FROM ada WHERE gesperrt=NULL' => array ( - 'error' => NULL, 'result' => array ( 5 => @@ -2090,12 +2029,6 @@ 'message' => 'You have an error in your SQL syntax; check the manual that corresponds to your MySQL/MariaDB server version for the right syntax to use near \'freigabe1u1 FROM ada LIMIT 0\' at line 1', 'code' => 1064, )), - 'result' => - array ( - 3 => NULL, - 5 => NULL, - 4 => NULL, - ), ), 'SELECT email adaid gesperrt freigabe1u1 FROM ada' => array ( @@ -2104,14 +2037,9 @@ 'message' => 'You have an error in your SQL syntax; check the manual that corresponds to your MySQL/MariaDB server version for the right syntax to use near \'gesperrt freigabe1u1 FROM ada LIMIT 0\' at line 1', 'code' => 1064, )), - 'result' => - array ( - 5 => NULL, - ), ), 'SELECT email, adaid FROM ada' => array ( - 'error' => NULL, 'result' => array ( 5 => @@ -2329,14 +2257,9 @@ 'message' => 'Unknown column \'xy\' in \'group statement\'', 'code' => 1054, )), - 'result' => - array ( - 3 => NULL, - ), ), 'SELECT email, adaid FROM ada WHERE adaid = \'1\'' => array ( - 'error' => NULL, 'result' => array ( 5 => @@ -2429,7 +2352,6 @@ ), 'SELECT email, adaid FROM ada WHERE adaid = \'1\' and email = \'email@example.org\'' => array ( - 'error' => NULL, 'result' => array ( 5 => @@ -2527,10 +2449,6 @@ 'message' => 'You have an error in your SQL syntax; check the manual that corresponds to your MySQL/MariaDB server version for the right syntax to use near \':email LIMIT 0\' at line 1', 'code' => 1064, )), - 'result' => - array ( - 5 => NULL, - ), ), 'SELECT email, adaid FROM ada WHERE adaid = \'1\' and email = ?' => array ( @@ -2539,10 +2457,6 @@ 'message' => 'You have an error in your SQL syntax; check the manual that corresponds to your MySQL/MariaDB server version for the right syntax to use near \'? LIMIT 0\' at line 1', 'code' => 1064, )), - 'result' => - array ( - 5 => NULL, - ), ), 'SELECT email, adaid FROM ada WHERE adaid = :adaid' => array ( @@ -2551,10 +2465,6 @@ 'message' => 'You have an error in your SQL syntax; check the manual that corresponds to your MySQL/MariaDB server version for the right syntax to use near \':adaid LIMIT 0\' at line 1', 'code' => 1064, )), - 'result' => - array ( - 5 => NULL, - ), ), 'SELECT email, adaid FROM ada WHERE adaid = :adaid and email = \'email@example.org\'' => array ( @@ -2563,10 +2473,6 @@ 'message' => 'You have an error in your SQL syntax; check the manual that corresponds to your MySQL/MariaDB server version for the right syntax to use near \':adaid and email = \'email@example.org\' LIMIT 0\' at line 1', 'code' => 1064, )), - 'result' => - array ( - 5 => NULL, - ), ), 'SELECT email, adaid FROM ada WHERE adaid = :adaid and email = :email' => array ( @@ -2575,10 +2481,6 @@ 'message' => 'You have an error in your SQL syntax; check the manual that corresponds to your MySQL/MariaDB server version for the right syntax to use near \':adaid and email = :email LIMIT 0\' at line 1', 'code' => 1064, )), - 'result' => - array ( - 5 => NULL, - ), ), 'SELECT email, adaid FROM ada WHERE adaid = ?' => array ( @@ -2587,10 +2489,6 @@ 'message' => 'You have an error in your SQL syntax; check the manual that corresponds to your MySQL/MariaDB server version for the right syntax to use near \'? LIMIT 0\' at line 1', 'code' => 1064, )), - 'result' => - array ( - 5 => NULL, - ), ), 'SELECT email, adaid FROM ada WHERE adaid = ? and email = ?' => array ( @@ -2599,14 +2497,9 @@ 'message' => 'You have an error in your SQL syntax; check the manual that corresponds to your MySQL/MariaDB server version for the right syntax to use near \'? and email = ? LIMIT 0\' at line 1', 'code' => 1064, )), - 'result' => - array ( - 5 => NULL, - ), ), 'SELECT email, adaid FROM ada WHERE adaid=1' => array ( - 'error' => NULL, 'result' => array ( 3 => @@ -2761,7 +2654,6 @@ ), 'SELECT email, adaid FROM ada WHERE email <=> \'\'' => array ( - 'error' => NULL, 'result' => array ( 5 => @@ -2859,14 +2751,9 @@ 'message' => 'You have an error in your SQL syntax; check the manual that corresponds to your MySQL/MariaDB server version for the right syntax to use near \':email LIMIT 0\' at line 1', 'code' => 1064, )), - 'result' => - array ( - 5 => NULL, - ), ), 'SELECT email, adaid FROM ada WHERE email = \'email@example.org\'' => array ( - 'error' => NULL, 'result' => array ( 5 => @@ -2959,7 +2846,6 @@ ), 'SELECT email, adaid FROM ada WHERE email = \'test@example.org\'' => array ( - 'error' => NULL, 'result' => array ( 5 => @@ -3057,10 +2943,6 @@ 'message' => 'You have an error in your SQL syntax; check the manual that corresponds to your MySQL/MariaDB server version for the right syntax to use near \':email LIMIT 0\' at line 1', 'code' => 1064, )), - 'result' => - array ( - 5 => NULL, - ), ), 'SELECT email, adaid FROM ada WHERE email = ?' => array ( @@ -3069,10 +2951,6 @@ 'message' => 'You have an error in your SQL syntax; check the manual that corresponds to your MySQL/MariaDB server version for the right syntax to use near \'? LIMIT 0\' at line 1', 'code' => 1064, )), - 'result' => - array ( - 5 => NULL, - ), ), 'SELECT email, adaid GROUP BY xy FROM ada LIMIT 1' => array ( @@ -3081,14 +2959,9 @@ 'message' => 'You have an error in your SQL syntax; check the manual that corresponds to your MySQL/MariaDB server version for the right syntax to use near \'FROM ada LIMIT 0\' at line 1', 'code' => 1064, )), - 'result' => - array ( - 3 => NULL, - ), ), 'SELECT email, adaid, gesperrt, freigabe1u1 FROM ada' => array ( - 'error' => NULL, 'result' => array ( 5 => @@ -3413,7 +3286,6 @@ ), 'SELECT email, adaid, gesperrt, freigabe1u1 FROM ada LIMIT 1' => array ( - 'error' => NULL, 'result' => array ( 3 => @@ -3512,7 +3384,6 @@ ), 'SELECT email, adaid, gesperrt, freigabe1u1 FROM ada LIMIT 1' => array ( - 'error' => NULL, 'result' => array ( 3 => @@ -3611,7 +3482,6 @@ ), 'SELECT email, adaid, gesperrt, freigabe1u1 FROM ada LIMIT 1, 10' => array ( - 'error' => NULL, 'result' => array ( 3 => @@ -3710,7 +3580,6 @@ ), 'SELECT email, adaid, gesperrt, freigabe1u1 FROM ada WHERE adaid = \'1\'' => array ( - 'error' => NULL, 'result' => array ( 5 => @@ -3859,7 +3728,6 @@ ), 'SELECT email, adaid, gesperrt, freigabe1u1 FROM ada WHERE adaid = 1' => array ( - 'error' => NULL, 'result' => array ( 3 => @@ -3963,14 +3831,9 @@ 'message' => 'You have an error in your SQL syntax; check the manual that corresponds to your MySQL/MariaDB server version for the right syntax to use near \'? LIMIT 0\' at line 1', 'code' => 1064, )), - 'result' => - array ( - 5 => NULL, - ), ), 'SELECT email, adaid, gesperrt, freigabe1u1 FROM ada WHERE adaid IN(1,3)' => array ( - 'error' => NULL, 'result' => array ( 3 => @@ -4069,7 +3932,6 @@ ), 'SELECT email, adaid, gesperrt, freigabe1u1 FROM ada WHERE adaid=1' => array ( - 'error' => NULL, 'result' => array ( 3 => @@ -4173,14 +4035,9 @@ 'message' => 'You have an error in your SQL syntax; check the manual that corresponds to your MySQL/MariaDB server version for the right syntax to use near \'? LIMIT 0\' at line 1', 'code' => 1064, )), - 'result' => - array ( - 5 => NULL, - ), ), 'SELECT email, adaid, gesperrt, freigabe1u1 FROM ada WHERE email = \'1970-01-01\'' => array ( - 'error' => NULL, 'result' => array ( 5 => @@ -4329,7 +4186,6 @@ ), 'SELECT email, adaid, gesperrt, freigabe1u1 FROM ada WHERE email = \'test@example.org\'' => array ( - 'error' => NULL, 'result' => array ( 3 => @@ -4428,7 +4284,6 @@ ), 'SELECT email, adaid, gesperrt, freigabe1u1 FROM ada WHERE email=\'foo\'' => array ( - 'error' => NULL, 'result' => array ( 3 => @@ -4527,7 +4382,6 @@ ), 'SELECT email, adaid, gesperrt, freigabe1u1 FROM ada WHERE gesperrt = \'1\'' => array ( - 'error' => NULL, 'result' => array ( 3 => diff --git a/tests/default/config/.phpunit-phpstan-dba.cache b/tests/default/config/.phpunit-phpstan-dba.cache index 15923f811..ec14eeedc 100644 --- a/tests/default/config/.phpunit-phpstan-dba.cache +++ b/tests/default/config/.phpunit-phpstan-dba.cache @@ -266,7 +266,6 @@ ), 'SELECT * FROM typemix' => array ( - 'error' => NULL, 'result' => array ( 3 => @@ -903,7 +902,6 @@ ), 'SELECT MAX(adaid), MIN(adaid), COUNT(adaid), AVG(adaid) FROM ada WHERE adaid = 1' => array ( - 'error' => NULL, 'result' => array ( 3 => @@ -1028,7 +1026,6 @@ ), 'SELECT a.email, b.adaid, b.gesperrt FROM ada a LEFT JOIN ada b ON a.adaid=b.adaid' => array ( - 'error' => NULL, 'result' => array ( 3 => @@ -1133,7 +1130,6 @@ ), 'SELECT adaid FROM ada LIMIT 1 FOR SHARE' => array ( - 'error' => NULL, 'result' => array ( 3 => @@ -1174,7 +1170,6 @@ ), 'SELECT adaid FROM ada LIMIT 1 OFFSET 1' => array ( - 'error' => NULL, 'result' => array ( 3 => @@ -1215,7 +1210,6 @@ ), 'SELECT adaid FROM ada LIMIT 1 OFFSET 1 FOR UPDATE' => array ( - 'error' => NULL, 'result' => array ( 3 => @@ -1256,7 +1250,6 @@ ), 'SELECT adaid FROM ada WHERE adaid IN (\'1\')' => array ( - 'error' => NULL, 'result' => array ( 5 => @@ -1375,6 +1368,7 @@ ), 'SELECT adaid FROM ada WHERE adaid IN (\'1\') AND email LIKE \'1970-01-01\'' => array ( + 'error' => NULL, 'result' => array ( 5 => @@ -1494,7 +1488,6 @@ ), 'SELECT adaid FROM ada WHERE adaid IN (\'1.0\')' => array ( - 'error' => NULL, 'result' => array ( 5 => @@ -1559,10 +1552,6 @@ 'message' => 'You have an error in your SQL syntax; check the manual that corresponds to your MySQL/MariaDB server version for the right syntax to use near \':adaids) LIMIT 0\' at line 1', 'code' => 1064, )), - 'result' => - array ( - 5 => NULL, - ), ), 'SELECT adaid FROM ada WHERE adaid IN (:ids)' => array ( @@ -1571,10 +1560,6 @@ 'message' => 'You have an error in your SQL syntax; check the manual that corresponds to your MySQL/MariaDB server version for the right syntax to use near \':ids) LIMIT 0\' at line 1', 'code' => 1064, )), - 'result' => - array ( - 5 => NULL, - ), ), 'SELECT adaid FROM ada WHERE adaid IN (:ids) AND email LIKE :time' => array ( @@ -1583,10 +1568,6 @@ 'message' => 'You have an error in your SQL syntax; check the manual that corresponds to your MySQL/MariaDB server version for the right syntax to use near \':ids) AND email LIKE :time LIMIT 0\' at line 1', 'code' => 1064, )), - 'result' => - array ( - 5 => NULL, - ), ), 'SELECT adaid FROM ada WHERE adaid IN (NULL) AND email LIKE \'1\'' => array ( @@ -1649,6 +1630,7 @@ ), 'SELECT adaid FROM ada WHERE adaid IN (NULL) AND email LIKE \'1970-01-01\'' => array ( + 'error' => NULL, 'result' => array ( 5 => @@ -1792,7 +1774,6 @@ ), 'SELECT adaid FROM ada WHERE email LIKE ":gesperrt%"' => array ( - 'error' => NULL, 'result' => array ( 3 => @@ -1886,7 +1867,6 @@ ), 'SELECT adaid FROM ada WHERE email LIKE "hello?%"' => array ( - 'error' => NULL, 'result' => array ( 3 => @@ -1980,7 +1960,6 @@ ), 'SELECT adaid FROM ada WHERE email LIKE \'%questions ?%\'' => array ( - 'error' => NULL, 'result' => array ( 3 => @@ -2074,7 +2053,6 @@ ), 'SELECT adaid FROM ada WHERE email LIKE \':gesperrt%\'' => array ( - 'error' => NULL, 'result' => array ( 3 => @@ -2172,7 +2150,6 @@ ), 'SELECT akid FROM ak WHERE eadavk>1.0' => array ( - 'error' => NULL, 'result' => array ( 3 => @@ -2213,7 +2190,6 @@ ), 'SELECT akid FROM ak WHERE eadavk>1.1' => array ( - 'error' => NULL, 'result' => array ( 3 => @@ -2262,6 +2238,7 @@ ), 'SELECT count(*) FROM typemix WHERE c_date = \'1970-01-01\'' => array ( + 'error' => NULL, 'result' => array ( 5 => @@ -2377,6 +2354,7 @@ ), 'SELECT count(*) FROM typemix WHERE c_datetime = \'1970-01-01\'' => array ( + 'error' => NULL, 'result' => array ( 5 => @@ -2492,7 +2470,6 @@ ), 'SELECT eladaid FROM ak' => array ( - 'error' => NULL, 'result' => array ( 3 => @@ -2560,10 +2537,6 @@ 'message' => 'You have an error in your SQL syntax; check the manual that corresponds to your MySQL/MariaDB server version for the right syntax to use near \'freigabe1u1 FROM ada LIMIT 0\' at line 1', 'code' => 1064, )), - 'result' => - array ( - 3 => NULL, - ), ), 'SELECT email adaid gesperrt freigabe1u1 FROM ada' => array ( @@ -2575,7 +2548,6 @@ ), 'SELECT email, adaid FROM ada' => array ( - 'error' => NULL, 'result' => array ( 4 => @@ -2796,7 +2768,6 @@ ), 'SELECT email, adaid FROM ada WHERE adaid = \'1\'' => array ( - 'error' => NULL, 'result' => array ( 5 => @@ -2889,7 +2860,6 @@ ), 'SELECT email, adaid FROM ada WHERE adaid = \'1\' and email = \'email@example.org\'' => array ( - 'error' => NULL, 'result' => array ( 5 => @@ -2987,10 +2957,6 @@ 'message' => 'You have an error in your SQL syntax; check the manual that corresponds to your MySQL/MariaDB server version for the right syntax to use near \':adaid LIMIT 0\' at line 1', 'code' => 1064, )), - 'result' => - array ( - 5 => NULL, - ), ), 'SELECT email, adaid FROM ada WHERE adaid = ?' => array ( @@ -2999,10 +2965,6 @@ 'message' => 'You have an error in your SQL syntax; check the manual that corresponds to your MySQL/MariaDB server version for the right syntax to use near \'? LIMIT 0\' at line 1', 'code' => 1064, )), - 'result' => - array ( - 5 => NULL, - ), ), 'SELECT email, adaid FROM ada WHERE adaid = ? and email = ?' => array ( @@ -3011,14 +2973,9 @@ 'message' => 'You have an error in your SQL syntax; check the manual that corresponds to your MySQL/MariaDB server version for the right syntax to use near \'? and email = ? LIMIT 0\' at line 1', 'code' => 1064, )), - 'result' => - array ( - 5 => NULL, - ), ), 'SELECT email, adaid FROM ada WHERE adaid=1' => array ( - 'error' => NULL, 'result' => array ( 3 => @@ -3173,7 +3130,6 @@ ), 'SELECT email, adaid FROM ada WHERE email <=> \'\'' => array ( - 'error' => NULL, 'result' => array ( 5 => @@ -3271,14 +3227,9 @@ 'message' => 'You have an error in your SQL syntax; check the manual that corresponds to your MySQL/MariaDB server version for the right syntax to use near \':email LIMIT 0\' at line 1', 'code' => 1064, )), - 'result' => - array ( - 5 => NULL, - ), ), 'SELECT email, adaid FROM ada WHERE email = \'email@example.org\'' => array ( - 'error' => NULL, 'result' => array ( 5 => @@ -3371,7 +3322,6 @@ ), 'SELECT email, adaid FROM ada WHERE email = \'test@example.org\'' => array ( - 'error' => NULL, 'result' => array ( 5 => @@ -3469,10 +3419,6 @@ 'message' => 'You have an error in your SQL syntax; check the manual that corresponds to your MySQL/MariaDB server version for the right syntax to use near \':email LIMIT 0\' at line 1', 'code' => 1064, )), - 'result' => - array ( - 5 => NULL, - ), ), 'SELECT email, adaid FROM ada WHERE email = ?' => array ( @@ -3481,10 +3427,6 @@ 'message' => 'You have an error in your SQL syntax; check the manual that corresponds to your MySQL/MariaDB server version for the right syntax to use near \'? LIMIT 0\' at line 1', 'code' => 1064, )), - 'result' => - array ( - 5 => NULL, - ), ), 'SELECT email, adaid FROM ada WHERE gesperrt = \'1\'' => array ( @@ -3500,7 +3442,6 @@ ), 'SELECT email, adaid, gesperrt, freigabe1u1 FROM ada' => array ( - 'error' => NULL, 'result' => array ( 5 => @@ -3755,7 +3696,6 @@ ), 'SELECT email, adaid, gesperrt, freigabe1u1 FROM ada LIMIT 1' => array ( - 'error' => NULL, 'result' => array ( 3 => @@ -3854,7 +3794,6 @@ ), 'SELECT email, adaid, gesperrt, freigabe1u1 FROM ada LIMIT 1, 10' => array ( - 'error' => NULL, 'result' => array ( 3 => @@ -3953,7 +3892,6 @@ ), 'SELECT email, adaid, gesperrt, freigabe1u1 FROM ada WHERE adaid = \'1\'' => array ( - 'error' => NULL, 'result' => array ( 5 => @@ -4102,7 +4040,6 @@ ), 'SELECT email, adaid, gesperrt, freigabe1u1 FROM ada WHERE adaid = 1' => array ( - 'error' => NULL, 'result' => array ( 3 => @@ -4206,13 +4143,10 @@ 'message' => 'You have an error in your SQL syntax; check the manual that corresponds to your MySQL/MariaDB server version for the right syntax to use near \'? LIMIT 0\' at line 1', 'code' => 1064, )), - 'result' => - array ( - 5 => NULL, - ), ), 'SELECT email, adaid, gesperrt, freigabe1u1 FROM ada WHERE adaid IN(1,3)' => array ( + 'error' => NULL, 'result' => array ( 3 => @@ -4311,7 +4245,6 @@ ), 'SELECT email, adaid, gesperrt, freigabe1u1 FROM ada WHERE adaid=1' => array ( - 'error' => NULL, 'result' => array ( 3 => @@ -4574,6 +4507,7 @@ ), 'SELECT email, adaid, gesperrt, freigabe1u1 FROM ada WHERE email = \'1970-01-01\'' => array ( + 'error' => NULL, 'result' => array ( 5 => @@ -4871,7 +4805,6 @@ ), 'SELECT email, adaid, gesperrt, freigabe1u1 FROM ada WHERE email = \'test@example.org\'' => array ( - 'error' => NULL, 'result' => array ( 3 => @@ -4970,7 +4903,6 @@ ), 'SELECT email, adaid, gesperrt, freigabe1u1 FROM ada WHERE email=\'foo\'' => array ( - 'error' => NULL, 'result' => array ( 3 => @@ -5069,7 +5001,6 @@ ), 'SELECT email, adaid, gesperrt, freigabe1u1 FROM ada WHERE gesperrt = \'1\'' => array ( - 'error' => NULL, 'result' => array ( 3 => diff --git a/tests/stringify/config/.phpstan-dba.cache b/tests/stringify/config/.phpstan-dba.cache index 2c3c111b7..4c39b5c8b 100644 --- a/tests/stringify/config/.phpstan-dba.cache +++ b/tests/stringify/config/.phpstan-dba.cache @@ -4,6 +4,7 @@ array ( 'SELECT email, adaid, gesperrt, freigabe1u1 FROM ada' => array ( + 'error' => NULL, 'result' => array ( 3 => diff --git a/tests/stringify/config/.phpunit-phpstan-dba.cache b/tests/stringify/config/.phpunit-phpstan-dba.cache index 2c3c111b7..4c39b5c8b 100644 --- a/tests/stringify/config/.phpunit-phpstan-dba.cache +++ b/tests/stringify/config/.phpunit-phpstan-dba.cache @@ -4,6 +4,7 @@ array ( 'SELECT email, adaid, gesperrt, freigabe1u1 FROM ada' => array ( + 'error' => NULL, 'result' => array ( 3 => From 28bb2d07e84f213cc9a1b730991a63868d8dda25 Mon Sep 17 00:00:00 2001 From: Markus Staab Date: Sun, 6 Feb 2022 22:00:19 +0100 Subject: [PATCH 2/2] fix --- tests/default/config/.phpstan-dba.cache | 146 ++++++++++++++++++ .../default/config/.phpunit-phpstan-dba.cache | 81 +++++++++- tests/stringify/config/.phpstan-dba.cache | 1 - .../config/.phpunit-phpstan-dba.cache | 1 - 4 files changed, 221 insertions(+), 8 deletions(-) diff --git a/tests/default/config/.phpstan-dba.cache b/tests/default/config/.phpstan-dba.cache index 76346ee12..934855636 100644 --- a/tests/default/config/.phpstan-dba.cache +++ b/tests/default/config/.phpstan-dba.cache @@ -9,6 +9,10 @@ 'message' => 'Unknown column \'doesNotExist\' in \'group statement\'', 'code' => 1054, )), + 'result' => + array ( + 3 => NULL, + ), ), 'SELECT * FROM ada ORDER BY doesNotExist' => array ( @@ -17,6 +21,10 @@ 'message' => 'Unknown column \'doesNotExist\' in \'order clause\'', 'code' => 1054, )), + 'result' => + array ( + 3 => NULL, + ), ), 'SELECT * FROM ada WHERE doesNotExist=1' => array ( @@ -25,9 +33,14 @@ 'message' => 'Unknown column \'doesNotExist\' in \'where clause\'', 'code' => 1054, )), + 'result' => + array ( + 3 => NULL, + ), ), 'SELECT * FROM typemix' => array ( + 'error' => NULL, 'result' => array ( 3 => @@ -661,9 +674,14 @@ 'message' => 'Table \'phpstan_dba.unknownTable\' doesn\'t exist', 'code' => 1146, )), + 'result' => + array ( + 3 => NULL, + ), ), 'SELECT MAX(adaid), MIN(adaid), COUNT(adaid), AVG(adaid) FROM ada WHERE adaid = 1' => array ( + 'error' => NULL, 'result' => array ( 3 => @@ -788,6 +806,7 @@ ), 'SELECT a.email, b.adaid, b.gesperrt FROM ada a LEFT JOIN ada b ON a.adaid=b.adaid' => array ( + 'error' => NULL, 'result' => array ( 3 => @@ -892,6 +911,7 @@ ), 'SELECT adaid FROM ada LIMIT 1 FOR SHARE' => array ( + 'error' => NULL, 'result' => array ( 3 => @@ -932,6 +952,7 @@ ), 'SELECT adaid FROM ada LIMIT 1 OFFSET 1' => array ( + 'error' => NULL, 'result' => array ( 3 => @@ -972,6 +993,7 @@ ), 'SELECT adaid FROM ada LIMIT 1 OFFSET 1 FOR UPDATE' => array ( + 'error' => NULL, 'result' => array ( 3 => @@ -1012,6 +1034,7 @@ ), 'SELECT adaid FROM ada WHERE adaid IN (\'1\')' => array ( + 'error' => NULL, 'result' => array ( 5 => @@ -1071,6 +1094,7 @@ ), 'SELECT adaid FROM ada WHERE adaid IN (\'1\') AND email LIKE \'1970-01-01\'' => array ( + 'error' => NULL, 'result' => array ( 5 => @@ -1130,6 +1154,7 @@ ), 'SELECT adaid FROM ada WHERE adaid IN (\'1.0\')' => array ( + 'error' => NULL, 'result' => array ( 5 => @@ -1194,6 +1219,10 @@ 'message' => 'You have an error in your SQL syntax; check the manual that corresponds to your MySQL/MariaDB server version for the right syntax to use near \':adaids) LIMIT 0\' at line 1', 'code' => 1064, )), + 'result' => + array ( + 5 => NULL, + ), ), 'SELECT adaid FROM ada WHERE adaid IN (:ids)' => array ( @@ -1202,6 +1231,10 @@ 'message' => 'You have an error in your SQL syntax; check the manual that corresponds to your MySQL/MariaDB server version for the right syntax to use near \':ids) LIMIT 0\' at line 1', 'code' => 1064, )), + 'result' => + array ( + 5 => NULL, + ), ), 'SELECT adaid FROM ada WHERE adaid IN (:ids) AND email LIKE :time' => array ( @@ -1210,9 +1243,14 @@ 'message' => 'You have an error in your SQL syntax; check the manual that corresponds to your MySQL/MariaDB server version for the right syntax to use near \':ids) AND email LIKE :time LIMIT 0\' at line 1', 'code' => 1064, )), + 'result' => + array ( + 5 => NULL, + ), ), 'SELECT adaid FROM ada WHERE adaid IN (NULL) AND email LIKE \'1970-01-01\'' => array ( + 'error' => NULL, 'result' => array ( 5 => @@ -1272,6 +1310,7 @@ ), 'SELECT adaid FROM ada WHERE email LIKE ":gesperrt%"' => array ( + 'error' => NULL, 'result' => array ( 5 => @@ -1365,6 +1404,7 @@ ), 'SELECT adaid FROM ada WHERE email LIKE "hello?%"' => array ( + 'error' => NULL, 'result' => array ( 5 => @@ -1458,6 +1498,7 @@ ), 'SELECT adaid FROM ada WHERE email LIKE \'%questions ?%\'' => array ( + 'error' => NULL, 'result' => array ( 5 => @@ -1551,6 +1592,7 @@ ), 'SELECT adaid FROM ada WHERE email LIKE \':gesperrt%\'' => array ( + 'error' => NULL, 'result' => array ( 5 => @@ -1644,6 +1686,7 @@ ), 'SELECT adaid FROM ada WHERE email=\'1970-01-01\'' => array ( + 'error' => NULL, 'result' => array ( 5 => @@ -1708,9 +1751,14 @@ 'message' => 'You have an error in your SQL syntax; check the manual that corresponds to your MySQL/MariaDB server version for the right syntax to use near \':email LIMIT 0\' at line 1', 'code' => 1064, )), + 'result' => + array ( + 5 => NULL, + ), ), 'SELECT akid FROM ak WHERE eadavk>1.0' => array ( + 'error' => NULL, 'result' => array ( 3 => @@ -1751,6 +1799,7 @@ ), 'SELECT akid FROM ak WHERE eadavk>1.1' => array ( + 'error' => NULL, 'result' => array ( 3 => @@ -1791,6 +1840,7 @@ ), 'SELECT count(*) FROM typemix WHERE c_date = \'1970-01-01\'' => array ( + 'error' => NULL, 'result' => array ( 5 => @@ -1844,6 +1894,7 @@ ), 'SELECT count(*) FROM typemix WHERE c_datetime = \'1970-01-01\'' => array ( + 'error' => NULL, 'result' => array ( 5 => @@ -1902,9 +1953,14 @@ 'message' => 'Unknown column \'doesNotExist\' in \'field list\'', 'code' => 1054, )), + 'result' => + array ( + 3 => NULL, + ), ), 'SELECT eladaid FROM ak' => array ( + 'error' => NULL, 'result' => array ( 3 => @@ -1968,9 +2024,14 @@ 'message' => 'You have an error in your SQL syntax; check the manual that corresponds to your MySQL/MariaDB server version for the right syntax to use near \':gesperrt LIMIT 0\' at line 1', 'code' => 1064, )), + 'result' => + array ( + 5 => NULL, + ), ), 'SELECT email FROM ada WHERE gesperrt=NULL' => array ( + 'error' => NULL, 'result' => array ( 5 => @@ -2029,6 +2090,12 @@ 'message' => 'You have an error in your SQL syntax; check the manual that corresponds to your MySQL/MariaDB server version for the right syntax to use near \'freigabe1u1 FROM ada LIMIT 0\' at line 1', 'code' => 1064, )), + 'result' => + array ( + 3 => NULL, + 5 => NULL, + 4 => NULL, + ), ), 'SELECT email adaid gesperrt freigabe1u1 FROM ada' => array ( @@ -2037,9 +2104,14 @@ 'message' => 'You have an error in your SQL syntax; check the manual that corresponds to your MySQL/MariaDB server version for the right syntax to use near \'gesperrt freigabe1u1 FROM ada LIMIT 0\' at line 1', 'code' => 1064, )), + 'result' => + array ( + 5 => NULL, + ), ), 'SELECT email, adaid FROM ada' => array ( + 'error' => NULL, 'result' => array ( 5 => @@ -2257,9 +2329,14 @@ 'message' => 'Unknown column \'xy\' in \'group statement\'', 'code' => 1054, )), + 'result' => + array ( + 3 => NULL, + ), ), 'SELECT email, adaid FROM ada WHERE adaid = \'1\'' => array ( + 'error' => NULL, 'result' => array ( 5 => @@ -2352,6 +2429,7 @@ ), 'SELECT email, adaid FROM ada WHERE adaid = \'1\' and email = \'email@example.org\'' => array ( + 'error' => NULL, 'result' => array ( 5 => @@ -2449,6 +2527,10 @@ 'message' => 'You have an error in your SQL syntax; check the manual that corresponds to your MySQL/MariaDB server version for the right syntax to use near \':email LIMIT 0\' at line 1', 'code' => 1064, )), + 'result' => + array ( + 5 => NULL, + ), ), 'SELECT email, adaid FROM ada WHERE adaid = \'1\' and email = ?' => array ( @@ -2457,6 +2539,10 @@ 'message' => 'You have an error in your SQL syntax; check the manual that corresponds to your MySQL/MariaDB server version for the right syntax to use near \'? LIMIT 0\' at line 1', 'code' => 1064, )), + 'result' => + array ( + 5 => NULL, + ), ), 'SELECT email, adaid FROM ada WHERE adaid = :adaid' => array ( @@ -2465,6 +2551,10 @@ 'message' => 'You have an error in your SQL syntax; check the manual that corresponds to your MySQL/MariaDB server version for the right syntax to use near \':adaid LIMIT 0\' at line 1', 'code' => 1064, )), + 'result' => + array ( + 5 => NULL, + ), ), 'SELECT email, adaid FROM ada WHERE adaid = :adaid and email = \'email@example.org\'' => array ( @@ -2473,6 +2563,10 @@ 'message' => 'You have an error in your SQL syntax; check the manual that corresponds to your MySQL/MariaDB server version for the right syntax to use near \':adaid and email = \'email@example.org\' LIMIT 0\' at line 1', 'code' => 1064, )), + 'result' => + array ( + 5 => NULL, + ), ), 'SELECT email, adaid FROM ada WHERE adaid = :adaid and email = :email' => array ( @@ -2481,6 +2575,10 @@ 'message' => 'You have an error in your SQL syntax; check the manual that corresponds to your MySQL/MariaDB server version for the right syntax to use near \':adaid and email = :email LIMIT 0\' at line 1', 'code' => 1064, )), + 'result' => + array ( + 5 => NULL, + ), ), 'SELECT email, adaid FROM ada WHERE adaid = ?' => array ( @@ -2489,6 +2587,10 @@ 'message' => 'You have an error in your SQL syntax; check the manual that corresponds to your MySQL/MariaDB server version for the right syntax to use near \'? LIMIT 0\' at line 1', 'code' => 1064, )), + 'result' => + array ( + 5 => NULL, + ), ), 'SELECT email, adaid FROM ada WHERE adaid = ? and email = ?' => array ( @@ -2497,9 +2599,14 @@ 'message' => 'You have an error in your SQL syntax; check the manual that corresponds to your MySQL/MariaDB server version for the right syntax to use near \'? and email = ? LIMIT 0\' at line 1', 'code' => 1064, )), + 'result' => + array ( + 5 => NULL, + ), ), 'SELECT email, adaid FROM ada WHERE adaid=1' => array ( + 'error' => NULL, 'result' => array ( 3 => @@ -2654,6 +2761,7 @@ ), 'SELECT email, adaid FROM ada WHERE email <=> \'\'' => array ( + 'error' => NULL, 'result' => array ( 5 => @@ -2751,9 +2859,14 @@ 'message' => 'You have an error in your SQL syntax; check the manual that corresponds to your MySQL/MariaDB server version for the right syntax to use near \':email LIMIT 0\' at line 1', 'code' => 1064, )), + 'result' => + array ( + 5 => NULL, + ), ), 'SELECT email, adaid FROM ada WHERE email = \'email@example.org\'' => array ( + 'error' => NULL, 'result' => array ( 5 => @@ -2846,6 +2959,7 @@ ), 'SELECT email, adaid FROM ada WHERE email = \'test@example.org\'' => array ( + 'error' => NULL, 'result' => array ( 5 => @@ -2943,6 +3057,10 @@ 'message' => 'You have an error in your SQL syntax; check the manual that corresponds to your MySQL/MariaDB server version for the right syntax to use near \':email LIMIT 0\' at line 1', 'code' => 1064, )), + 'result' => + array ( + 5 => NULL, + ), ), 'SELECT email, adaid FROM ada WHERE email = ?' => array ( @@ -2951,6 +3069,10 @@ 'message' => 'You have an error in your SQL syntax; check the manual that corresponds to your MySQL/MariaDB server version for the right syntax to use near \'? LIMIT 0\' at line 1', 'code' => 1064, )), + 'result' => + array ( + 5 => NULL, + ), ), 'SELECT email, adaid GROUP BY xy FROM ada LIMIT 1' => array ( @@ -2959,9 +3081,14 @@ 'message' => 'You have an error in your SQL syntax; check the manual that corresponds to your MySQL/MariaDB server version for the right syntax to use near \'FROM ada LIMIT 0\' at line 1', 'code' => 1064, )), + 'result' => + array ( + 3 => NULL, + ), ), 'SELECT email, adaid, gesperrt, freigabe1u1 FROM ada' => array ( + 'error' => NULL, 'result' => array ( 5 => @@ -3286,6 +3413,7 @@ ), 'SELECT email, adaid, gesperrt, freigabe1u1 FROM ada LIMIT 1' => array ( + 'error' => NULL, 'result' => array ( 3 => @@ -3384,6 +3512,7 @@ ), 'SELECT email, adaid, gesperrt, freigabe1u1 FROM ada LIMIT 1' => array ( + 'error' => NULL, 'result' => array ( 3 => @@ -3482,6 +3611,7 @@ ), 'SELECT email, adaid, gesperrt, freigabe1u1 FROM ada LIMIT 1, 10' => array ( + 'error' => NULL, 'result' => array ( 3 => @@ -3580,6 +3710,7 @@ ), 'SELECT email, adaid, gesperrt, freigabe1u1 FROM ada WHERE adaid = \'1\'' => array ( + 'error' => NULL, 'result' => array ( 5 => @@ -3728,6 +3859,7 @@ ), 'SELECT email, adaid, gesperrt, freigabe1u1 FROM ada WHERE adaid = 1' => array ( + 'error' => NULL, 'result' => array ( 3 => @@ -3831,9 +3963,14 @@ 'message' => 'You have an error in your SQL syntax; check the manual that corresponds to your MySQL/MariaDB server version for the right syntax to use near \'? LIMIT 0\' at line 1', 'code' => 1064, )), + 'result' => + array ( + 5 => NULL, + ), ), 'SELECT email, adaid, gesperrt, freigabe1u1 FROM ada WHERE adaid IN(1,3)' => array ( + 'error' => NULL, 'result' => array ( 3 => @@ -3932,6 +4069,7 @@ ), 'SELECT email, adaid, gesperrt, freigabe1u1 FROM ada WHERE adaid=1' => array ( + 'error' => NULL, 'result' => array ( 3 => @@ -4035,9 +4173,14 @@ 'message' => 'You have an error in your SQL syntax; check the manual that corresponds to your MySQL/MariaDB server version for the right syntax to use near \'? LIMIT 0\' at line 1', 'code' => 1064, )), + 'result' => + array ( + 5 => NULL, + ), ), 'SELECT email, adaid, gesperrt, freigabe1u1 FROM ada WHERE email = \'1970-01-01\'' => array ( + 'error' => NULL, 'result' => array ( 5 => @@ -4186,6 +4329,7 @@ ), 'SELECT email, adaid, gesperrt, freigabe1u1 FROM ada WHERE email = \'test@example.org\'' => array ( + 'error' => NULL, 'result' => array ( 3 => @@ -4284,6 +4428,7 @@ ), 'SELECT email, adaid, gesperrt, freigabe1u1 FROM ada WHERE email=\'foo\'' => array ( + 'error' => NULL, 'result' => array ( 3 => @@ -4382,6 +4527,7 @@ ), 'SELECT email, adaid, gesperrt, freigabe1u1 FROM ada WHERE gesperrt = \'1\'' => array ( + 'error' => NULL, 'result' => array ( 3 => diff --git a/tests/default/config/.phpunit-phpstan-dba.cache b/tests/default/config/.phpunit-phpstan-dba.cache index ec14eeedc..15923f811 100644 --- a/tests/default/config/.phpunit-phpstan-dba.cache +++ b/tests/default/config/.phpunit-phpstan-dba.cache @@ -266,6 +266,7 @@ ), 'SELECT * FROM typemix' => array ( + 'error' => NULL, 'result' => array ( 3 => @@ -902,6 +903,7 @@ ), 'SELECT MAX(adaid), MIN(adaid), COUNT(adaid), AVG(adaid) FROM ada WHERE adaid = 1' => array ( + 'error' => NULL, 'result' => array ( 3 => @@ -1026,6 +1028,7 @@ ), 'SELECT a.email, b.adaid, b.gesperrt FROM ada a LEFT JOIN ada b ON a.adaid=b.adaid' => array ( + 'error' => NULL, 'result' => array ( 3 => @@ -1130,6 +1133,7 @@ ), 'SELECT adaid FROM ada LIMIT 1 FOR SHARE' => array ( + 'error' => NULL, 'result' => array ( 3 => @@ -1170,6 +1174,7 @@ ), 'SELECT adaid FROM ada LIMIT 1 OFFSET 1' => array ( + 'error' => NULL, 'result' => array ( 3 => @@ -1210,6 +1215,7 @@ ), 'SELECT adaid FROM ada LIMIT 1 OFFSET 1 FOR UPDATE' => array ( + 'error' => NULL, 'result' => array ( 3 => @@ -1250,6 +1256,7 @@ ), 'SELECT adaid FROM ada WHERE adaid IN (\'1\')' => array ( + 'error' => NULL, 'result' => array ( 5 => @@ -1368,7 +1375,6 @@ ), 'SELECT adaid FROM ada WHERE adaid IN (\'1\') AND email LIKE \'1970-01-01\'' => array ( - 'error' => NULL, 'result' => array ( 5 => @@ -1488,6 +1494,7 @@ ), 'SELECT adaid FROM ada WHERE adaid IN (\'1.0\')' => array ( + 'error' => NULL, 'result' => array ( 5 => @@ -1552,6 +1559,10 @@ 'message' => 'You have an error in your SQL syntax; check the manual that corresponds to your MySQL/MariaDB server version for the right syntax to use near \':adaids) LIMIT 0\' at line 1', 'code' => 1064, )), + 'result' => + array ( + 5 => NULL, + ), ), 'SELECT adaid FROM ada WHERE adaid IN (:ids)' => array ( @@ -1560,6 +1571,10 @@ 'message' => 'You have an error in your SQL syntax; check the manual that corresponds to your MySQL/MariaDB server version for the right syntax to use near \':ids) LIMIT 0\' at line 1', 'code' => 1064, )), + 'result' => + array ( + 5 => NULL, + ), ), 'SELECT adaid FROM ada WHERE adaid IN (:ids) AND email LIKE :time' => array ( @@ -1568,6 +1583,10 @@ 'message' => 'You have an error in your SQL syntax; check the manual that corresponds to your MySQL/MariaDB server version for the right syntax to use near \':ids) AND email LIKE :time LIMIT 0\' at line 1', 'code' => 1064, )), + 'result' => + array ( + 5 => NULL, + ), ), 'SELECT adaid FROM ada WHERE adaid IN (NULL) AND email LIKE \'1\'' => array ( @@ -1630,7 +1649,6 @@ ), 'SELECT adaid FROM ada WHERE adaid IN (NULL) AND email LIKE \'1970-01-01\'' => array ( - 'error' => NULL, 'result' => array ( 5 => @@ -1774,6 +1792,7 @@ ), 'SELECT adaid FROM ada WHERE email LIKE ":gesperrt%"' => array ( + 'error' => NULL, 'result' => array ( 3 => @@ -1867,6 +1886,7 @@ ), 'SELECT adaid FROM ada WHERE email LIKE "hello?%"' => array ( + 'error' => NULL, 'result' => array ( 3 => @@ -1960,6 +1980,7 @@ ), 'SELECT adaid FROM ada WHERE email LIKE \'%questions ?%\'' => array ( + 'error' => NULL, 'result' => array ( 3 => @@ -2053,6 +2074,7 @@ ), 'SELECT adaid FROM ada WHERE email LIKE \':gesperrt%\'' => array ( + 'error' => NULL, 'result' => array ( 3 => @@ -2150,6 +2172,7 @@ ), 'SELECT akid FROM ak WHERE eadavk>1.0' => array ( + 'error' => NULL, 'result' => array ( 3 => @@ -2190,6 +2213,7 @@ ), 'SELECT akid FROM ak WHERE eadavk>1.1' => array ( + 'error' => NULL, 'result' => array ( 3 => @@ -2238,7 +2262,6 @@ ), 'SELECT count(*) FROM typemix WHERE c_date = \'1970-01-01\'' => array ( - 'error' => NULL, 'result' => array ( 5 => @@ -2354,7 +2377,6 @@ ), 'SELECT count(*) FROM typemix WHERE c_datetime = \'1970-01-01\'' => array ( - 'error' => NULL, 'result' => array ( 5 => @@ -2470,6 +2492,7 @@ ), 'SELECT eladaid FROM ak' => array ( + 'error' => NULL, 'result' => array ( 3 => @@ -2537,6 +2560,10 @@ 'message' => 'You have an error in your SQL syntax; check the manual that corresponds to your MySQL/MariaDB server version for the right syntax to use near \'freigabe1u1 FROM ada LIMIT 0\' at line 1', 'code' => 1064, )), + 'result' => + array ( + 3 => NULL, + ), ), 'SELECT email adaid gesperrt freigabe1u1 FROM ada' => array ( @@ -2548,6 +2575,7 @@ ), 'SELECT email, adaid FROM ada' => array ( + 'error' => NULL, 'result' => array ( 4 => @@ -2768,6 +2796,7 @@ ), 'SELECT email, adaid FROM ada WHERE adaid = \'1\'' => array ( + 'error' => NULL, 'result' => array ( 5 => @@ -2860,6 +2889,7 @@ ), 'SELECT email, adaid FROM ada WHERE adaid = \'1\' and email = \'email@example.org\'' => array ( + 'error' => NULL, 'result' => array ( 5 => @@ -2957,6 +2987,10 @@ 'message' => 'You have an error in your SQL syntax; check the manual that corresponds to your MySQL/MariaDB server version for the right syntax to use near \':adaid LIMIT 0\' at line 1', 'code' => 1064, )), + 'result' => + array ( + 5 => NULL, + ), ), 'SELECT email, adaid FROM ada WHERE adaid = ?' => array ( @@ -2965,6 +2999,10 @@ 'message' => 'You have an error in your SQL syntax; check the manual that corresponds to your MySQL/MariaDB server version for the right syntax to use near \'? LIMIT 0\' at line 1', 'code' => 1064, )), + 'result' => + array ( + 5 => NULL, + ), ), 'SELECT email, adaid FROM ada WHERE adaid = ? and email = ?' => array ( @@ -2973,9 +3011,14 @@ 'message' => 'You have an error in your SQL syntax; check the manual that corresponds to your MySQL/MariaDB server version for the right syntax to use near \'? and email = ? LIMIT 0\' at line 1', 'code' => 1064, )), + 'result' => + array ( + 5 => NULL, + ), ), 'SELECT email, adaid FROM ada WHERE adaid=1' => array ( + 'error' => NULL, 'result' => array ( 3 => @@ -3130,6 +3173,7 @@ ), 'SELECT email, adaid FROM ada WHERE email <=> \'\'' => array ( + 'error' => NULL, 'result' => array ( 5 => @@ -3227,9 +3271,14 @@ 'message' => 'You have an error in your SQL syntax; check the manual that corresponds to your MySQL/MariaDB server version for the right syntax to use near \':email LIMIT 0\' at line 1', 'code' => 1064, )), + 'result' => + array ( + 5 => NULL, + ), ), 'SELECT email, adaid FROM ada WHERE email = \'email@example.org\'' => array ( + 'error' => NULL, 'result' => array ( 5 => @@ -3322,6 +3371,7 @@ ), 'SELECT email, adaid FROM ada WHERE email = \'test@example.org\'' => array ( + 'error' => NULL, 'result' => array ( 5 => @@ -3419,6 +3469,10 @@ 'message' => 'You have an error in your SQL syntax; check the manual that corresponds to your MySQL/MariaDB server version for the right syntax to use near \':email LIMIT 0\' at line 1', 'code' => 1064, )), + 'result' => + array ( + 5 => NULL, + ), ), 'SELECT email, adaid FROM ada WHERE email = ?' => array ( @@ -3427,6 +3481,10 @@ 'message' => 'You have an error in your SQL syntax; check the manual that corresponds to your MySQL/MariaDB server version for the right syntax to use near \'? LIMIT 0\' at line 1', 'code' => 1064, )), + 'result' => + array ( + 5 => NULL, + ), ), 'SELECT email, adaid FROM ada WHERE gesperrt = \'1\'' => array ( @@ -3442,6 +3500,7 @@ ), 'SELECT email, adaid, gesperrt, freigabe1u1 FROM ada' => array ( + 'error' => NULL, 'result' => array ( 5 => @@ -3696,6 +3755,7 @@ ), 'SELECT email, adaid, gesperrt, freigabe1u1 FROM ada LIMIT 1' => array ( + 'error' => NULL, 'result' => array ( 3 => @@ -3794,6 +3854,7 @@ ), 'SELECT email, adaid, gesperrt, freigabe1u1 FROM ada LIMIT 1, 10' => array ( + 'error' => NULL, 'result' => array ( 3 => @@ -3892,6 +3953,7 @@ ), 'SELECT email, adaid, gesperrt, freigabe1u1 FROM ada WHERE adaid = \'1\'' => array ( + 'error' => NULL, 'result' => array ( 5 => @@ -4040,6 +4102,7 @@ ), 'SELECT email, adaid, gesperrt, freigabe1u1 FROM ada WHERE adaid = 1' => array ( + 'error' => NULL, 'result' => array ( 3 => @@ -4143,10 +4206,13 @@ 'message' => 'You have an error in your SQL syntax; check the manual that corresponds to your MySQL/MariaDB server version for the right syntax to use near \'? LIMIT 0\' at line 1', 'code' => 1064, )), + 'result' => + array ( + 5 => NULL, + ), ), 'SELECT email, adaid, gesperrt, freigabe1u1 FROM ada WHERE adaid IN(1,3)' => array ( - 'error' => NULL, 'result' => array ( 3 => @@ -4245,6 +4311,7 @@ ), 'SELECT email, adaid, gesperrt, freigabe1u1 FROM ada WHERE adaid=1' => array ( + 'error' => NULL, 'result' => array ( 3 => @@ -4507,7 +4574,6 @@ ), 'SELECT email, adaid, gesperrt, freigabe1u1 FROM ada WHERE email = \'1970-01-01\'' => array ( - 'error' => NULL, 'result' => array ( 5 => @@ -4805,6 +4871,7 @@ ), 'SELECT email, adaid, gesperrt, freigabe1u1 FROM ada WHERE email = \'test@example.org\'' => array ( + 'error' => NULL, 'result' => array ( 3 => @@ -4903,6 +4970,7 @@ ), 'SELECT email, adaid, gesperrt, freigabe1u1 FROM ada WHERE email=\'foo\'' => array ( + 'error' => NULL, 'result' => array ( 3 => @@ -5001,6 +5069,7 @@ ), 'SELECT email, adaid, gesperrt, freigabe1u1 FROM ada WHERE gesperrt = \'1\'' => array ( + 'error' => NULL, 'result' => array ( 3 => diff --git a/tests/stringify/config/.phpstan-dba.cache b/tests/stringify/config/.phpstan-dba.cache index 4c39b5c8b..2c3c111b7 100644 --- a/tests/stringify/config/.phpstan-dba.cache +++ b/tests/stringify/config/.phpstan-dba.cache @@ -4,7 +4,6 @@ array ( 'SELECT email, adaid, gesperrt, freigabe1u1 FROM ada' => array ( - 'error' => NULL, 'result' => array ( 3 => diff --git a/tests/stringify/config/.phpunit-phpstan-dba.cache b/tests/stringify/config/.phpunit-phpstan-dba.cache index 4c39b5c8b..2c3c111b7 100644 --- a/tests/stringify/config/.phpunit-phpstan-dba.cache +++ b/tests/stringify/config/.phpunit-phpstan-dba.cache @@ -4,7 +4,6 @@ array ( 'SELECT email, adaid, gesperrt, freigabe1u1 FROM ada' => array ( - 'error' => NULL, 'result' => array ( 3 =>