Follow recommendation about multiline type

greg0ire · greg0ire · commit c9c5157fda04 · 2023-06-28T07:46:35.000+02:00
Apparently, there is consensus about multiline types between: - PHPStan - Psalm - Slevomat Coding Standard See slevomat/coding-standard#1586 (comment) Using parenthesis is less ambiguous, it makes it clear to the parser where the type begins and where it ends. The change has a positive impact on the Psalm baseline, showing that psalm-return annotation was not really understood previously.
diff --git a/lib/Doctrine/ORM/Query/Parser.php b/lib/Doctrine/ORM/Query/Parser.php
@@ -2566,16 +2566,15 @@ public function ConditionalPrimary()
      *      EmptyCollectionComparisonExpression | CollectionMemberExpression |
      *      InstanceOfExpression
      *
-     * @return AST\Node
-     * @psalm-return AST\BetweenExpression|
+     * @return (AST\BetweenExpression|
      *         AST\CollectionMemberExpression|
      *         AST\ComparisonExpression|
      *         AST\EmptyCollectionComparisonExpression|
      *         AST\ExistsExpression|
      *         AST\InExpression|
      *         AST\InstanceOfExpression|
      *         AST\LikeExpression|
-     *         AST\NullComparisonExpression
+     *         AST\NullComparisonExpression)
      */
     public function SimpleConditionalExpression()
     {
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -2008,19 +2008,10 @@
       <code>$factors[0]</code>
       <code>$primary</code>
       <code>$terms[0]</code>
-      <code><![CDATA[$this->CollectionMemberExpression()]]></code>
-      <code><![CDATA[$this->ComparisonExpression()]]></code>
-      <code><![CDATA[$this->EmptyCollectionComparisonExpression()]]></code>
-      <code><![CDATA[$this->ExistsExpression()]]></code>
-      <code><![CDATA[$this->InExpression()]]></code>
-      <code><![CDATA[$this->InstanceOfExpression()]]></code>
-      <code><![CDATA[$this->LikeExpression()]]></code>
-      <code><![CDATA[$this->NullComparisonExpression()]]></code>
     </InvalidReturnStatement>
     <InvalidReturnType>
       <code>AST\ArithmeticFactor</code>
       <code>AST\ArithmeticTerm</code>
-      <code>AST\BetweenExpression|</code>
       <code>AST\SimpleArithmeticExpression|AST\ArithmeticTerm</code>
     </InvalidReturnType>
     <InvalidStringClass>
