Make `AndX`/`OrX` constructor parameter variadic (#1035)

Make `AndX`/`OrX` constructor parameter variadic (#1035) · yiisoft/db@75c1ad1

File tree

lines changed

lines changed

Original file line number	Diff line number	Diff line change
`@@ -465,7 +465,7 @@ public function createConditionFromArray(array $condition): ConditionInterface`
`465`	`465`	`$conditions[] = new Condition\Equals($column, $value);`
`466`	`466`	`}`
`467`	`467`
`468`		`-return count($conditions) === 1 ? $conditions[0] : new Condition\AndX($conditions);`
	`468`	`+return count($conditions) === 1 ? $conditions[0] : new Condition\AndX(...$conditions);`
`469`	`469`	`}`
`470`	`470`
`471`	`471`	`public function getExpressionBuilder(ExpressionInterface $expression): object`

Original file line number	Diff line number	Diff line change
`@@ -12,18 +12,22 @@`
`12`	`12`	`final class AndX implements ConditionInterface`
`13`	`13`	`{`
`14`	`14`	`/**`
`15`		`- * @param array $expressions The expressions that are connected by this condition.`
`16`		`- *`
`17`		`- * @psalm-param array<array\|ExpressionInterface\|scalar> $expressions`
	`15`	`+ * @psalm-var array<array\|ExpressionInterface\|scalar>`
	`16`	`+ */`
	`17`	`+public readonly array $expressions;`
	`18`	`+`
	`19`	`+/**`
	`20`	`+ * @param array\|bool\|ExpressionInterface\|float\|int\|string ...$expressions The expressions that are connected by this condition.`
`18`	`21`	`*/`
`19`	`22`	`public function __construct(`
`20`		`-public readonly array $expressions,`
	`23`	`+array\|ExpressionInterface\|int\|float\|bool\|string ...$expressions,`
`21`	`24`	`) {`
	`25`	`+$this->expressions = $expressions;`
`22`	`26`	`}`
`23`	`27`
`24`	`28`	`public static function fromArrayDefinition(string $operator, array $operands): self`
`25`	`29`	`{`
`26`	`30`	`/** @psalm-var array<array\|ExpressionInterface\|scalar> $operands */`
`27`		`-return new self($operands);`
	`31`	`+return new self(...$operands);`
`28`	`32`	`}`
`29`	`33`	`}`

Original file line number	Diff line number	Diff line change
`@@ -12,18 +12,22 @@`
`12`	`12`	`final class OrX implements ConditionInterface`
`13`	`13`	`{`
`14`	`14`	`/**`
`15`		`- * @param array $expressions The expressions that are connected by this condition.`
`16`		`- *`
`17`		`- * @psalm-param array<array\|ExpressionInterface\|scalar> $expressions`
	`15`	`+ * @psalm-var array<array\|ExpressionInterface\|scalar>`
	`16`	`+ */`
	`17`	`+public readonly array $expressions;`
	`18`	`+`
	`19`	`+/**`
	`20`	`+ * @param array\|bool\|ExpressionInterface\|float\|int\|string ...$expressions The expressions that are connected by this condition.`
`18`	`21`	`*/`
`19`	`22`	`public function __construct(`
`20`		`-public readonly array $expressions,`
	`23`	`+array\|ExpressionInterface\|int\|float\|bool\|string ...$expressions,`
`21`	`24`	`) {`
	`25`	`+$this->expressions = $expressions;`
`22`	`26`	`}`
`23`	`27`
`24`	`28`	`public static function fromArrayDefinition(string $operator, array $operands): self`
`25`	`29`	`{`
`26`	`30`	`/** @psalm-var array<array\|ExpressionInterface\|scalar> $operands */`
`27`		`-return new self($operands);`
	`31`	`+return new self(...$operands);`
`28`	`32`	`}`
`29`	`33`	`}`

Original file line number	Diff line number	Diff line change
`@@ -14,8 +14,8 @@ final class AndXTest extends TestCase`
`14`	`14`	`{`
`15`	`15`	`public function testConstructor(): void`
`16`	`16`	`{`
`17`		`-$andCondition = new AndX(['a' => 1, 'b' => 2]);`
	`17`	`+$andCondition = new AndX(['a' => 1], ['b' => 2]);`
`18`	`18`
`19`		`-$this->assertSame(['a' => 1, 'b' => 2], $andCondition->expressions);`
	`19`	`+$this->assertSame([['a' => 1], ['b' => 2]], $andCondition->expressions);`
`20`	`20`	`}`
`21`	`21`	`}`