Commit 0fb83af

GromNaNalcaeus

authored and

committed

PHPORM-67 Accept operators prefixed by $ in Query\Builder::orWhere (#20)

1 parent 4514964 commit 0fb83afCopy full SHA for 0fb83af

File tree

+16

-2

lines changed

+16

-2

lines changed

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,7 @@ All notable changes to this project will be documented in this file.`
`12`	`12`	- Throw an exception when `Query\Builder::push()` is used incorrectly [#5](https://github.com/GromNaN/laravel-mongodb-private/pull/5) by [@GromNaN](https://github.com/GromNaN).
`13`	`13`	- Remove public property `Query\Builder::$paginating` [#15](https://github.com/GromNaN/laravel-mongodb-private/pull/15) by [@GromNaN](https://github.com/GromNaN).
`14`	`14`	- Remove call to deprecated `Collection::count` for `countDocuments` [#18](https://github.com/GromNaN/laravel-mongodb-private/pull/18) by [@GromNaN](https://github.com/GromNaN).
	`15`	+- Accept operators prefixed by `$` in `Query\Builder::orWhere` [#20](https://github.com/GromNaN/laravel-mongodb-private/pull/20) by [@GromNaN](https://github.com/GromNaN).
`15`	`16`
`16`	`17`	`## [3.9.2] - 2022年09月01日`
`17`	`18`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -917,10 +917,10 @@ public function where($column, $operator = null, $value = null, $boolean = 'and'`
`917`	`917`	`$params = func_get_args();`
`918`	`918`
`919`	`919`	`// Remove the leading $ from operators.`
`920`		`- if (func_num_args() == 3) {`
	`920`	`+ if (func_num_args() >= 3) {`
`921`	`921`	`$operator = &$params[1];`
`922`	`922`
`923`		`- if (Str::startsWith($operator, '$')) {`
	`923`	`+ if (is_string($operator) && str_starts_with($operator, '$')) {`
`924`	`924`	`$operator = substr($operator, 1);`
`925`	`925`	`}`
`926`	`926`	`}`

Lines changed: 13 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -76,6 +76,19 @@ public static function provideQueryBuilderToMql(): iterable`
`76`	`76`	`fn (Builder $builder) => $builder->limit(10)->offset(5)->select('foo', 'bar'),`
`77`	`77`	`];`
`78`	`78`
	`79`	`+ yield 'where accepts $ in operators' => [`
	`80`	`+ ['find' => [`
	`81`	`+ ['$or' => [`
	`82`	`+ ['foo' => ['$type' => 2]],`
	`83`	`+ ['foo' => ['$type' => 4]],`
	`84`	`+ ]],`
	`85`	`+ [], // options`
	`86`	`+ ]],`
	`87`	`+ fn (Builder $builder) => $builder`
	`88`	`+ ->where('foo', '$type', 2)`
	`89`	`+ ->orWhere('foo', '$type', 4),`
	`90`	`+ ];`
	`91`	`+`
`79`	`92`	`/** @see DatabaseQueryBuilderTest::testBasicWhereNot() */`
`80`	`93`	`yield 'whereNot (multiple)' => [`
`81`	`94`	`['find' => [`

Comments

(0)