fix expectations

Author: staabm

tests/default/data/dibi.php

@@ -19,7 +19,7 @@ public function fetch(\Dibi\Connection $connection)
     public function fetchAll(\Dibi\Connection $connection)
     {
         $row = $connection->fetchAll('SELECT email, adaid FROM ada');
-        assertType('array<int, array{email: string, adaid: int<-32768, 32767>}>', $row);
+        assertType('list<array{email: string, adaid: int<-32768, 32767>}>', $row);
     }
 
     public function fetchPairs(\Dibi\Connection $connection)

tests/default/data/runMysqlQuery.php

@@ -25,8 +25,8 @@ class Foo
     public function run(string $prodHostname, DbCredentials $dbCredentials)
     {
         $prodDomains = runMysqlQuery('SELECT cmsdomainid FROM cmsdomain WHERE url ="'.$prodHostname.'" and standard=1', $dbCredentials);
-        assertType('array<int, array<int, string>>|null', $prodDomains);
+        assertType('list<list<string>>|null', $prodDomains);
         // XXX should be more precise, when we would be smarter in query parsing
-        // assertType('array<int, array{string}>|null', $prodDomains);
+        // assertType('list<array{string}>|null', $prodDomains);
     }
 }

tests/rules/DoctrineKeyValueStyleRuleTest.php

@@ -27,6 +27,12 @@ public static function getAdditionalConfigFiles(): array
 
     public function testRule(): void
     {
+        $err56 = 'Query error: Column "ada.adaid" expects value type int, got type mixed';
+        if (PHP_VERSION_ID < 80000) {
+            // PHP 7.x does not support native mixed type
+            $err56 = 'Query error: Column "ada.adaid" expects value type int, got type DoctrineKeyValueStyleRuleTest\mixed';
+        }
+
         $expectedErrors = [
             [
                 'Argument #0 expects a constant string, got string',
@@ -65,7 +71,7 @@ public function testRule(): void
                 51,
             ],
             [
-                'Query error: Column "ada.adaid" expects value type int, got type mixed',
+                $err56,
                 56,
             ],
             [