Merge pull request #223 from moufmouf/phpstan_fix

Fixing a PHPStan regex that was too wide

Author: moufmouf

phpstan.neon

@@ -12,8 +12,8 @@ parameters:
      - "#should return array<TheCodingMachine\\\\TDBM\\\\AbstractTDBMObject> but returns array<int, object>#"
      #- "#expects array<string>, array<int, int|string> given.#"
      - "/Parameter #. \\$types of method Doctrine\\\\DBAL\\\\Connection::.*() expects array<int|string>, array<int, Doctrine\\\\DBAL\\\\Types\\\\Type> given./"
-     - "#Method TheCodingMachine\\\\TDBM\\\\Schema\\\\ForeignKey::.*() should return .* but returns array<string>|string.#"
      - '#Method TheCodingMachine\\TDBM\\NativeWeakrefObjectStorage::get\(\) should return TheCodingMachine\\TDBM\\DbRow\|null but returns object\|null.#'
+     - '#Method TheCodingMachine\\TDBM\\QueryFactory\\AbstractQueryFactory::.* should return string but returns string\|null.#'
      -
         message: '#WeakRef#'
         path: src/WeakrefObjectStorage.php
@@ -26,6 +26,12 @@ parameters:
      -
         message: '#is "array". Please provide a more specific .* annotation#'
         path: src/Test/Dao/Bean/Generated/PlayerBaseBean.php
+     -
+        message: '#Parameter \#1 \$str of method Doctrine\\DBAL\\Platforms\\AbstractPlatform::quoteIdentifier\(\) expects string, string\|null given#'
+        path: src/ResultIterator.php
+     -
+        message: '#Strict comparison using === between int\\|string and null will always evaluate to false#'
+        path: src/Utils/ScalarBeanPropertyDescriptor.php
     #reportUnmatchedIgnoredErrors: false
 includes:
     - vendor/thecodingmachine/phpstan-strict-rules/phpstan-strict-rules.neon

src/QueryFactory/AbstractQueryFactory.php

@@ -173,7 +173,7 @@ protected function getColumnsList(string $mainTable, array $additionalTablesFetc
 
         // Let's remove any duplicate
         $allFetchedTables = array_unique($allFetchedTables);
-        
+
         // We quote in MySQL because MagicJoin requires MySQL style quotes
         $mysqlPlatform = new MySqlPlatform();
 
@@ -263,7 +263,7 @@ public function getColumnDescriptors() : array
     }
 
     /**
-     * @return string[][] An array of column descriptors. Value is an array with those keys: table, column
+     * @return array<int, array{table: string, column: string}> An array of column descriptors.
      */
     public function getSubQueryColumnDescriptors() : array
     {

src/QueryFactory/FindObjectsFromRawSqlQueryFactory.php

@@ -425,7 +425,7 @@ public function getMagicSqlSubQuery(): string
     }
 
     /**
-     * @return string[][] An array of column descriptors. Value is an array with those keys: table, column
+     * @return array<int, array{table: string, column: string}> An array of column descriptors.
      */
     public function getSubQueryColumnDescriptors(): array
     {

src/QueryFactory/FindObjectsFromSqlQueryFactory.php

@@ -161,7 +161,7 @@ private function getChildrenRelationshipForeignKeysWithoutCache(string $tableNam
                 return $this->getChildrenRelationshipForeignKeys($fk->getLocalTableName());
             }, $children);
 
-            $fks = array_merge($children, call_user_func_array('array_merge', $fksTables));
+            $fks = array_merge($children, ...$fksTables);
 
             return $fks;
         } else {

src/QueryFactory/QueryFactory.php

@@ -44,7 +44,7 @@ public function getMagicSqlSubQuery() : string;
     public function getColumnDescriptors() : array;
 
     /**
-     * @return string[][] An array of column descriptors. Value is an array with those keys: table, column
+     * @return array<int, array{table: string, column: string}> An array of column descriptors.
      */
     public function getSubQueryColumnDescriptors() : array;
 }

src/SafeFunctions.php

@@ -20,7 +20,8 @@ public static function arrayCombine(array $keys, array $values): array
     {
         $array = array_combine($keys, $values);
         if ($array === false) {
-            throw new RuntimeException(error_get_last()['message']);
+            $error = error_get_last();
+            throw new RuntimeException($error['message'] ?? '');
         }
         return $array;
     }

src/Schema/ForeignKey.php

@@ -20,7 +20,7 @@ class ForeignKey
 
 
     /**
-     * @param array<string, string|array<string>> $foreignKey
+     * @param array{foreignTable: string, localColumns: string[], foreignColumns: string[]} $foreignKey
      */
     public function __construct(array $foreignKey)
     {

src/Schema/ForeignKeys.php

@@ -6,7 +6,7 @@
 class ForeignKeys
 {
     /**
-     * @var array
+     * @var array<string, array{foreignTable: string, localColumns: string[], foreignColumns: string[]}>
      */
     private $foreignKeys;
 
@@ -16,7 +16,7 @@ class ForeignKeys
     private $foreignKey;
 
     /**
-     * @param array<string, array<string, string|array<string>>> $foreignKeys
+     * @param array<string, array{foreignTable: string, localColumns: string[], foreignColumns: string[]}> $foreignKeys
      */
     public function __construct(array $foreignKeys)
     {

src/Utils/Logs/LevelFilter.php

@@ -41,7 +41,7 @@ class LevelFilter extends AbstractLogger
      * @param LoggerInterface $logger
      * @param string $level \Psr\Log\LogLevel string
      */
-    public function __construct(LoggerInterface $logger, $level)
+    public function __construct(LoggerInterface $logger, string $level)
     {
         $this->logger = $logger;
 

src/Utils/RootProjectLocator.php

@@ -8,6 +8,8 @@ class RootProjectLocator
     public static function getRootLocationPath(): string
     {
         $reflection = new \ReflectionClass(\Composer\Autoload\ClassLoader::class);
-        return dirname($reflection->getFileName(), 3).'/';
+        $file = $reflection->getFileName();
+        assert($file !== false);
+        return dirname($file, 3).'/';
     }
 }