Fix types on `walkLiteral()` and `walkLikeExpression()` #9566

derrabus · 2022-03-06T23:02:05Z

No description provided.

derrabus · 2022-03-06T23:04:50Z

lib/Doctrine/ORM/Query/AST/LikeExpression.php

    public $stringExpression;

-    /** @var InputParameter */
+    /** @var InputParameter|FunctionNode|PathExpression|Literal */


Those are the types we expect here, see:

orm/lib/Doctrine/ORM/Query/SqlWalker.php

Lines 2165 to 2173 in bc6c6c9

if ($likeExpr->stringPattern instanceof AST\InputParameter) {

$sql .= $this->walkInputParameter($likeExpr->stringPattern);

} elseif ($likeExpr->stringPattern instanceof AST\Functions\FunctionNode) {

$sql .= $this->walkFunction($likeExpr->stringPattern);

} elseif ($likeExpr->stringPattern instanceof AST\PathExpression) {

$sql .= $this->walkPathExpression($likeExpr->stringPattern);

} else {

$sql .= $this->walkLiteral($likeExpr->stringPattern);

}

lib/Doctrine/ORM/Query/SqlWalker.php

derrabus · 2022-03-06T23:09:27Z

lib/Doctrine/ORM/Query/TreeWalker.php

@@ -335,7 +335,7 @@ public function walkInstanceOfExpression($instanceOfExpr);
    /**
     * Walks down a literal that represents an AST node, thereby generating the appropriate SQL.
     *
-     * @param mixed $literal
+     * @param AST\Literal $literal


Passing anything else to the implementation in SqlWalker would cause an error because we access properties on $literal.

SenseException

A second reviewer should be consulted. Despite that no one mentioned an error before and "smaller" BC breaks were applied in the past in 2.11, this PR can probably be merged after a second review.

* 2.12.x: Deprecate custom ObjectRepository implementations (doctrine#9533) Fix types on walkLiteral() and walkLikeExpression() (doctrine#9566)

derrabus added the Static Analysis label Mar 6, 2022

derrabus commented Mar 6, 2022

View reviewed changes

lib/Doctrine/ORM/Query/SqlWalker.php Outdated Show resolved Hide resolved

derrabus commented Mar 6, 2022

View reviewed changes

derrabus added this to the 2.12.0 milestone Mar 10, 2022

derrabus force-pushed the types/walk-literal branch from 7b3e58d to c4180ca Compare March 20, 2022 11:48

Fix types on walkLiteral() and walkLikeExpression()

04b7f74

derrabus force-pushed the types/walk-literal branch from c4180ca to 04b7f74 Compare March 28, 2022 16:16

SenseException approved these changes Mar 28, 2022

View reviewed changes

derrabus requested a review from greg0ire April 4, 2022 23:26

greg0ire approved these changes Apr 5, 2022

View reviewed changes

derrabus merged commit e8472c8 into doctrine:2.12.x Apr 6, 2022

derrabus deleted the types/walk-literal branch April 6, 2022 08:49

derrabus added a commit to derrabus/orm that referenced this pull request Apr 6, 2022

Merge branch '2.12.x' into 3.0.x

953c633

* 2.12.x: Deprecate custom ObjectRepository implementations (doctrine#9533) Fix types on walkLiteral() and walkLikeExpression() (doctrine#9566)

github-actions bot mentioned this pull request Apr 19, 2022

Merge release 2.12.0 into 3.0.x #9667

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix types on `walkLiteral()` and `walkLikeExpression()` #9566

Fix types on `walkLiteral()` and `walkLikeExpression()` #9566

derrabus commented Mar 6, 2022

derrabus Mar 6, 2022 •

edited

Loading

derrabus Mar 6, 2022 •

edited

Loading

SenseException left a comment

	if ($likeExpr->stringPattern instanceof AST\InputParameter) {
	$sql .= $this->walkInputParameter($likeExpr->stringPattern);
	} elseif ($likeExpr->stringPattern instanceof AST\Functions\FunctionNode) {
	$sql .= $this->walkFunction($likeExpr->stringPattern);
	} elseif ($likeExpr->stringPattern instanceof AST\PathExpression) {
	$sql .= $this->walkPathExpression($likeExpr->stringPattern);
	} else {
	$sql .= $this->walkLiteral($likeExpr->stringPattern);
	}

Fix types on walkLiteral() and walkLikeExpression() #9566

Fix types on walkLiteral() and walkLikeExpression() #9566

Conversation

derrabus commented Mar 6, 2022

derrabus Mar 6, 2022 • edited Loading

Choose a reason for hiding this comment

derrabus Mar 6, 2022 • edited Loading

Choose a reason for hiding this comment

SenseException left a comment

Choose a reason for hiding this comment

Fix types on `walkLiteral()` and `walkLikeExpression()` #9566

Fix types on `walkLiteral()` and `walkLikeExpression()` #9566

derrabus Mar 6, 2022 •

edited

Loading

derrabus Mar 6, 2022 •

edited

Loading