fix UndefinedClass on new $secondaryCriteriaClass()

michbeck · Jun 23, 2021 · 646931a · 646931a
1 parent 8fcceb4
commit 646931a
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 9 deletions.
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -577,9 +577,6 @@
     </InvalidReturnType>
   </file>
   <file src="src/Propel/Runtime/ActiveQuery/ModelCriteria.php">
-    <UndefinedClass occurrences="1">
-      <code>new $secondaryCriteriaClass()</code>
-    </UndefinedClass>
     <UndefinedMethod occurrences="10">
       <code>addSelectColumns</code>
       <code>addSelfSelectColumns</code>

diff --git a/src/Propel/Runtime/ActiveQuery/ModelCriteria.php b/src/Propel/Runtime/ActiveQuery/ModelCriteria.php
@@ -829,6 +829,7 @@ public function withColumn($clause, $name = null)
      *
      * @param string $relationName Relation name or alias
      * @param string|null $secondaryCriteriaClass ClassName for the ModelCriteria to be used
+     * @psalm-param class-string<self>|null $secondaryCriteriaClass
      *
      * @throws \Propel\Runtime\Exception\PropelException
      *
@@ -843,7 +844,6 @@ public function useQuery($relationName, $secondaryCriteriaClass = null)
         /** @var \Propel\Runtime\ActiveQuery\ModelJoin $modelJoin */
         $modelJoin = $this->joins[$relationName];
         $className = $modelJoin->getTableMap()->getClassName();
-        /** @var self $secondaryCriteriaClass */
         if ($secondaryCriteriaClass === null) {
             $secondaryCriteria = PropelQuery::from($className);
         } else {