Fix up CI - PHPStan, CS, Psalm (propelorm#1882)

* Fix up PHPStan * Fix up CS * Fix up Psalm
michbeck · May 9, 2022 · 2f479f5 · 2f479f5
1 parent 0fd64ee
commit 2f479f5
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 11 deletions.
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
diff --git a/phpstan.neon b/phpstan.neon
@@ -4,6 +4,7 @@ parameters:
     level: 6
     checkMissingIterableValueType: false
     reportUnmatchedIgnoredErrors: false
+    treatPhpDocTypesAsCertain: false
     paths:
         - '%rootDir%/../../../src/'
     ignoreErrors:

diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -83,12 +83,17 @@
     </InvalidReturnType>
   </file>
   <file src="src/Propel/Runtime/ActiveQuery/ModelCriteria.php">
-    <UndefinedMethod occurrences="12">
+    <TooManyTemplateParams occurrences="4">
+      <code>\Propel\Runtime\Collection\Collection&lt;\Propel\Runtime\ActiveRecord\ActiveRecordInterface&gt;|mixed</code>
+      <code>\Propel\Runtime\Collection\Collection&lt;\Propel\Runtime\ActiveRecord\ActiveRecordInterface&gt;|mixed</code>
+      <code>\Propel\Runtime\Collection\Collection&lt;\Propel\Runtime\ActiveRecord\ActiveRecordInterface&gt;|mixed</code>
+      <code>\Propel\Runtime\Collection\Collection&lt;\Propel\Runtime\ActiveRecord\ActiveRecordInterface&gt;|mixed</code>
+    </TooManyTemplateParams>
+    <UndefinedMethod occurrences="11">
       <code>$modelTableMapName::clearInstancePool()</code>
       <code>$modelTableMapName::clearRelatedInstancePool()</code>
       <code>addSelectColumns</code>
       <code>addSelfSelectColumns</code>
-      <code>getRelationMap</code>
       <code>getTableMap</code>
       <code>getTableMap</code>
       <code>getTableMap</code>

diff --git a/src/Propel/Runtime/ActiveQuery/ModelCriteria.php b/src/Propel/Runtime/ActiveQuery/ModelCriteria.php
@@ -1288,7 +1288,7 @@ protected function preSelect(ConnectionInterface $con): void
      *
      * @param \Propel\Runtime\Connection\ConnectionInterface|null $con an optional connection object
      *
-     * @return \Propel\Runtime\Collection\Collection|\Propel\Runtime\ActiveRecord\ActiveRecordInterface[]|mixed the list of results, formatted by the current formatter
+     * @return \Propel\Runtime\Collection\Collection<\Propel\Runtime\ActiveRecord\ActiveRecordInterface>|mixed the list of results, formatted by the current formatter
      */
     public function find(?ConnectionInterface $con = null)
     {
@@ -1553,7 +1553,7 @@ public function findPk($key, ?ConnectionInterface $con = null)
      *
      * @throws \Propel\Runtime\Exception\PropelException
      *
-     * @return \Propel\Runtime\Collection\Collection|\Propel\Runtime\ActiveRecord\ActiveRecordInterface[]|mixed the list of results, formatted by the current formatter
+     * @return \Propel\Runtime\Collection\Collection<\Propel\Runtime\ActiveRecord\ActiveRecordInterface>|mixed the list of results, formatted by the current formatter
      */
     public function findPks(array $keys, ?ConnectionInterface $con = null)
     {
@@ -1587,7 +1587,7 @@ public function findPks(array $keys, ?ConnectionInterface $con = null)
      * @param mixed $value A value for the condition
      * @param \Propel\Runtime\Connection\ConnectionInterface|null $con An optional connection object
      *
-     * @return \Propel\Runtime\Collection\Collection|\Propel\Runtime\ActiveRecord\ActiveRecordInterface[]|mixed the list of results, formatted by the current formatter
+     * @return \Propel\Runtime\Collection\Collection<\Propel\Runtime\ActiveRecord\ActiveRecordInterface>|mixed the list of results, formatted by the current formatter
      */
     public function findBy(string $column, $value, ?ConnectionInterface $con = null)
     {
@@ -1612,7 +1612,7 @@ public function findBy(string $column, $value, ?ConnectionInterface $con = null)
      * @param mixed $conditions An array of conditions, using column phpNames as key
      * @param \Propel\Runtime\Connection\ConnectionInterface|null $con an optional connection object
      *
-     * @return \Propel\Runtime\Collection\Collection|\Propel\Runtime\ActiveRecord\ActiveRecordInterface[]|mixed the list of results, formatted by the current formatter
+     * @return \Propel\Runtime\Collection\Collection<\Propel\Runtime\ActiveRecord\ActiveRecordInterface>|mixed the list of results, formatted by the current formatter
      */
     public function findByArray($conditions, ?ConnectionInterface $con = null)
     {