Commit ⋅ doctrine/orm

Showing 4 of 9 files from the diff.

100.00% 100.00% ø

...b/Doctrine/ORM/Query/AST/InSubselectExpression.php changed.

100.00% ø +20.00%

...ib/Doctrine/ORM/Query/AST/InstanceOfExpression.php changed.

95.85% ø +0.55%

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

100.00% 100.00% ø

lib/Doctrine/ORM/Query/AST/InListExpression.php changed.

Other files ignored by Codecov

psalm.xml has changed.

lib/Doctrine/ORM/Query/AST/InExpression.php was deleted.

.../Doctrine/Tests/ORM/Query/AST/InExpressionTest.php was deleted.

UPGRADE.md has changed.

phpstan-params.neon has changed.

@@ -4,16 +4,19 @@


namespace Doctrine\ORM\Query\AST;

class InSubselectExpression extends InExpression
use Doctrine\ORM\Query\SqlWalker;

class InSubselectExpression extends Node
{
    /** @var Subselect */
    public $subselect;
    public function __construct(
        public ArithmeticExpression $expression,
        public Subselect $subselect,
        public bool $not = false,
    ) {
    }

    public function __construct(ArithmeticExpression $expression, Subselect $subselect, bool $not = false)
    public function dispatch(SqlWalker $walker): string
    {
        $this->subselect = $subselect;
        $this->not       = $not;

        parent::__construct($expression);
        return $walker->walkInSubselectExpression($this);
    }
}

@@ -4,11 +4,8 @@


namespace Doctrine\ORM\Query\AST;

use Doctrine\Deprecations\Deprecation;
use Doctrine\ORM\Query\SqlWalker;

use function func_num_args;

/**
 * InstanceOfExpression ::= IdentificationVariable ["NOT"] "INSTANCE" ["OF"] (InstanceOfParameter | "(" InstanceOfParameter {"," InstanceOfParameter}* ")")
 * InstanceOfParameter  ::= AbstractSchemaName | InputParameter

@@ -23,17 +20,9 @@

     */
    public function __construct(
        public $identificationVariable,
        public array $value = [],
        public array $value,
        public bool $not = false,
    ) {
        if (func_num_args() < 2) {
            Deprecation::trigger(
                'doctrine/orm',
                'https://github.com/doctrine/orm/pull/10267',
                'Not passing a value for $value to %s() is deprecated.',
                __METHOD__,
            );
        }
    }

    public function dispatch(SqlWalker $walker): string

@@ -9,7 +9,6 @@

use Doctrine\DBAL\LockMode;
use Doctrine\DBAL\Platforms\AbstractPlatform;
use Doctrine\DBAL\Types\Type;
use Doctrine\Deprecations\Deprecation;
use Doctrine\ORM\EntityManagerInterface;
use Doctrine\ORM\Mapping\ClassMetadata;
use Doctrine\ORM\Mapping\QuoteStrategy;

@@ -1944,38 +1943,6 @@

        return $expression->dispatch($this) . $comparison;
    }

    /**
     * Walks down an InExpression AST node, thereby generating the appropriate SQL.
     *
     * @deprecated Use {@see walkInListExpression()} or {@see walkInSubselectExpression()} instead.
     */
    public function walkInExpression(AST\InExpression $inExpr): string
    {
        Deprecation::triggerIfCalledFromOutside(
            'doctrine/orm',
            '%s() is deprecated, call walkInListExpression() or walkInSubselectExpression() instead.',
            __METHOD__,
        );

        if ($inExpr instanceof AST\InListExpression) {
            return $this->walkInListExpression($inExpr);
        }

        if ($inExpr instanceof AST\InSubselectExpression) {
            return $this->walkInSubselectExpression($inExpr);
        }

        $sql = $this->walkArithmeticExpression($inExpr->expression) . ($inExpr->not ? ' NOT' : '') . ' IN (';

        $sql .= $inExpr->subselect
            ? $this->walkSubselect($inExpr->subselect)
            : implode(', ', array_map([$this, 'walkInParameter'], $inExpr->literals));

        $sql .= ')';

        return $sql;
    }

    /**
     * Walks down an InExpression AST node, thereby generating the appropriate SQL.
     */

@@ -4,13 +4,20 @@


namespace Doctrine\ORM\Query\AST;

class InListExpression extends InExpression
use Doctrine\ORM\Query\SqlWalker;

class InListExpression extends Node
{
    /** @param non-empty-list<mixed> $literals */
    public function __construct(ArithmeticExpression $expression, public array $literals, bool $not = false)
    {
        $this->not = $not;
    public function __construct(
        public ArithmeticExpression $expression,
        public array $literals,
        public bool $not = false,
    ) {
    }

        parent::__construct($expression);
    public function dispatch(SqlWalker $walker): string
    {
        return $walker->walkInListExpression($this);
    }
}

Files		•	•	•	Coverage
lib/Doctrine/ORM	14,582	13,070	0	1,512	89.63%
Project Totals (331 files)	14,582	13,070	0	1,512	89.63%

View CI Build Download

No yaml found.

Create your codecov.yml to customize your Codecov experience

Read the docs

Interact now

The inner-most circle is the entire project, moving away from the center are folders then, finally, a single file. The size and color of each slice is representing the number of statements and the coverage, respectively.

SVG

The top section represents the entire project. Proceeding with folders and finally individual files. The size and color of each slice is representing the number of statements and the coverage, respectively.

SVG

Each block represents a single file in the project. The size and color of each block is represented by the number of statements and the coverage, respectively.

SVG

Learn more about the coverage sunburst graph

1944	1943		return $expression->dispatch($this) . $comparison;
1945	1944		}
1946	1945
1947		-	/**
1948		-	* Walks down an InExpression AST node, thereby generating the appropriate SQL.
1949		-	*
1950		-	* @deprecated Use {@see walkInListExpression()} or {@see walkInSubselectExpression()} instead.
1951		-	*/
1952		-	public function walkInExpression(AST\InExpression $inExpr): string
1953		-	{
1954		-	Deprecation::triggerIfCalledFromOutside(
1955		-	'doctrine/orm',
1956		-	'%s() is deprecated, call walkInListExpression() or walkInSubselectExpression() instead.',
1957		-	__METHOD__,
1958		-	);
1959		-
1960		-	if ($inExpr instanceof AST\InListExpression) {
1961		-	return $this->walkInListExpression($inExpr);
1962		-	}
1963		-
1964		-	if ($inExpr instanceof AST\InSubselectExpression) {
1965		-	return $this->walkInSubselectExpression($inExpr);
1966		-	}
1967		-
1968		-	$sql = $this->walkArithmeticExpression($inExpr->expression) . ($inExpr->not ? ' NOT' : '') . ' IN (';
1969		-
1970		-	$sql .= $inExpr->subselect
1971		-	? $this->walkSubselect($inExpr->subselect)
1972		-	: implode(', ', array_map([$this, 'walkInParameter'], $inExpr->literals));
1973		-
1974		-	$sql .= ')';
1975		-
1976		-	return $sql;
1977		-	}
1978		-
1979	1946		/**
1980	1947		* Walks down an InExpression AST node, thereby generating the appropriate SQL.
1981	1948		*/

Navigation	Overlay
`t` Navigate files	`h` Toggle hits
`y` Change url to tip of branch	`m` Toggle misses
`b / v` Jump to prev/next hit line	`p` Toggle partial
`z / x` Jump to prev/next missed or partial line	`1..9` Toggle flags
`shift + o` Open current page in GitHub	`a` Toggle all on
`/ or ?` Show keyboard shortcuts dialog	`c` Toggle context lines or commits

4	4
5	5		namespace Doctrine\ORM\Query\AST;
6	6
7		-	class InSubselectExpression extends InExpression
	7	+	use Doctrine\ORM\Query\SqlWalker;
	8	+
	9	+	class InSubselectExpression extends Node
8	10		{
9		-	/** @var Subselect */
10		-	public $subselect;
	11	+	public function __construct(
	12	+	public ArithmeticExpression $expression,
	13	+	public Subselect $subselect,
	14	+	public bool $not = false,
	15	+	) {
	16	+	}
11	17
12		-	public function __construct(ArithmeticExpression $expression, Subselect $subselect, bool $not = false)
	18	+	public function dispatch(SqlWalker $walker): string
13	19		{
14		-	$this->subselect = $subselect;
15		-	$this->not = $not;
16		-
17		-	parent::__construct($expression);
	20	+	return $walker->walkInSubselectExpression($this);
18	21		}
19	22		}

4	4
5	5		namespace Doctrine\ORM\Query\AST;
6	6
7		-	use Doctrine\Deprecations\Deprecation;
8	7		use Doctrine\ORM\Query\SqlWalker;
9	8
10		-	use function func_num_args;
11		-
12	9		/**
13	10		* InstanceOfExpression ::= IdentificationVariable ["NOT"] "INSTANCE" ["OF"] (InstanceOfParameter \| "(" InstanceOfParameter {"," InstanceOfParameter}* ")")
14	11		* InstanceOfParameter ::= AbstractSchemaName \| InputParameter

23	20		*/
24	21		public function __construct(
25	22		public $identificationVariable,
26		-	public array $value = [],
	23	+	public array $value,
27	24		public bool $not = false,
28	25		) {
29		-	if (func_num_args() < 2) {
30		-	Deprecation::trigger(
31		-	'doctrine/orm',
32		-	'https://github.com/doctrine/orm/pull/10267',
33		-	'Not passing a value for $value to %s() is deprecated.',
34		-	__METHOD__,
35		-	);
36		-	}
37	26		}
38	27
39	28		public function dispatch(SqlWalker $walker): string

9	9		use Doctrine\DBAL\LockMode;
10	10		use Doctrine\DBAL\Platforms\AbstractPlatform;
11	11		use Doctrine\DBAL\Types\Type;
12		-	use Doctrine\Deprecations\Deprecation;
13	12		use Doctrine\ORM\EntityManagerInterface;
14	13		use Doctrine\ORM\Mapping\ClassMetadata;
15	14		use Doctrine\ORM\Mapping\QuoteStrategy;

4	4
5	5		namespace Doctrine\ORM\Query\AST;
6	6
7		-	class InListExpression extends InExpression
	7	+	use Doctrine\ORM\Query\SqlWalker;
	8	+
	9	+	class InListExpression extends Node
8	10		{
9	11		/** @param non-empty-list<mixed> $literals */
10		-	public function __construct(ArithmeticExpression $expression, public array $literals, bool $not = false)
11		-	{
12		-	$this->not = $not;
	12	+	public function __construct(
	13	+	public ArithmeticExpression $expression,
	14	+	public array $literals,
	15	+	public bool $not = false,
	16	+	) {
	17	+	}
13	18
14		-	parent::__construct($expression);
	19	+	public function dispatch(SqlWalker $walker): string
	20	+	{
	21	+	return $walker->walkInListExpression($this);
15	22		}
16	23		}

Updating our web app

No yaml found.