diff --git a/CHANGELOG-6.x.md b/CHANGELOG-6.x.md
index d92867e61bf9..3ab00165cccc 100644
--- a/CHANGELOG-6.x.md
+++ b/CHANGELOG-6.x.md
@@ -1,6 +1,15 @@
# Release Notes for 6.x
-## [Unreleased](https://github.com/laravel/framework/compare/v6.20.9...6.x)
+## [Unreleased](https://github.com/laravel/framework/compare/v6.20.10...6.x)
+
+
+## [v6.20.10 (2021-01-12)](https://github.com/laravel/framework/compare/v6.20.9...v6.20.10)
+
+### Added
+- Added new line to `DetectsLostConnections` ([#35790](https://github.com/laravel/framework/pull/35790))
+
+### Fixed
+- Fixed error from missing null check on PHP 8 in `Illuminate\Validation\Concerns\ValidatesAttributes::validateJson()` ([#35797](https://github.com/laravel/framework/pull/35797))
## [v6.20.9 (2021-01-05)](https://github.com/laravel/framework/compare/v6.20.8...v6.20.9)
diff --git a/CHANGELOG-8.x.md b/CHANGELOG-8.x.md
index 1f35a3bc3813..6879551e0a1e 100644
--- a/CHANGELOG-8.x.md
+++ b/CHANGELOG-8.x.md
@@ -1,6 +1,25 @@
# Release Notes for 8.x
-## [Unreleased](https://github.com/laravel/framework/compare/v8.21.0...8.x)
+## [Unreleased](https://github.com/laravel/framework/compare/v8.22.0...8.x)
+
+
+## [v8.22.0 (2021-01-12)](https://github.com/laravel/framework/compare/v8.21.0...v8.22.0)
+
+### Added
+- Added new lines to `DetectsLostConnections` ([#35752](https://github.com/laravel/framework/pull/35752), [#35790](https://github.com/laravel/framework/pull/35790))
+- Added `Illuminate\Support\Testing\Fakes\EventFake::assertNothingDispatched()` ([#35835](https://github.com/laravel/framework/pull/35835))
+- Added reduce with keys to collections and lazy collections ([#35839](https://github.com/laravel/framework/pull/35839))
+
+### Fixed
+- Fixed error from missing null check on PHP 8 in `Illuminate\Validation\Concerns\ValidatesAttributes::validateJson()` ([#35797](https://github.com/laravel/framework/pull/35797))
+- Fix bug with RetryCommand ([4415b94](https://github.com/laravel/framework/commit/4415b94623358bfd1dc2e8f20e4deab0025d2d03), [#35828](https://github.com/laravel/framework/pull/35828))
+- Fixed `Illuminate\Testing\PendingCommand::expectsTable()` ([#35820](https://github.com/laravel/framework/pull/35820))
+- Fixed `morphTo()` attempting to map an empty string morph type to an instance ([#35824](https://github.com/laravel/framework/pull/35824))
+
+### Changes
+- Update `Illuminate\Http\Resources\CollectsResources::collects()` ([1fa20dd](https://github.com/laravel/framework/commit/1fa20dd356af21af6e38d95e9ff2b1d444344fbe))
+- "null" constraint prevents aliasing SQLite ROWID ([#35792](https://github.com/laravel/framework/pull/35792))
+- Allow strings to be passed to the `report` function ([#35803](https://github.com/laravel/framework/pull/35803))
## [v8.21.0 (2021-01-05)](https://github.com/laravel/framework/compare/v8.20.1...v8.21.0)
diff --git a/src/Illuminate/Database/Query/Builder.php b/src/Illuminate/Database/Query/Builder.php
index bdb09f71f892..b39618d51ff3 100755
--- a/src/Illuminate/Database/Query/Builder.php
+++ b/src/Illuminate/Database/Query/Builder.php
@@ -752,7 +752,7 @@ public function where($column, $operator = null, $value = null, $boolean = 'and'
);
if (! $value instanceof Expression) {
- $this->addBinding($value, 'where');
+ $this->addBinding(is_array($value) ? head($value) : $value, 'where');
}
return $this;
@@ -1121,7 +1121,7 @@ public function whereBetween($column, array $values, $boolean = 'and', $not = fa
$this->wheres[] = compact('type', 'column', 'values', 'boolean', 'not');
- $this->addBinding($this->cleanBindings($values), 'where');
+ $this->addBinding(array_slice($this->cleanBindings($values), 0, 2), 'where');
return $this;
}
@@ -1244,6 +1244,8 @@ public function whereDate($column, $operator, $value = null, $boolean = 'and')
$value, $operator, func_num_args() === 2
);
+ $value = is_array($value) ? head($value) : $value;
+
if ($value instanceof DateTimeInterface) {
$value = $value->format('Y-m-d');
}
@@ -1283,6 +1285,8 @@ public function whereTime($column, $operator, $value = null, $boolean = 'and')
$value, $operator, func_num_args() === 2
);
+ $value = is_array($value) ? head($value) : $value;
+
if ($value instanceof DateTimeInterface) {
$value = $value->format('H:i:s');
}
@@ -1322,6 +1326,8 @@ public function whereDay($column, $operator, $value = null, $boolean = 'and')
$value, $operator, func_num_args() === 2
);
+ $value = is_array($value) ? head($value) : $value;
+
if ($value instanceof DateTimeInterface) {
$value = $value->format('d');
}
@@ -1365,6 +1371,8 @@ public function whereMonth($column, $operator, $value = null, $boolean = 'and')
$value, $operator, func_num_args() === 2
);
+ $value = is_array($value) ? head($value) : $value;
+
if ($value instanceof DateTimeInterface) {
$value = $value->format('m');
}
@@ -1408,6 +1416,8 @@ public function whereYear($column, $operator, $value = null, $boolean = 'and')
$value, $operator, func_num_args() === 2
);
+ $value = is_array($value) ? head($value) : $value;
+
if ($value instanceof DateTimeInterface) {
$value = $value->format('Y');
}
@@ -1716,7 +1726,7 @@ public function whereJsonLength($column, $operator, $value = null, $boolean = 'a
$this->wheres[] = compact('type', 'column', 'operator', 'value', 'boolean');
if (! $value instanceof Expression) {
- $this->addBinding($value);
+ $this->addBinding((int) $value);
}
return $this;
@@ -1865,7 +1875,7 @@ public function having($column, $operator = null, $value = null, $boolean = 'and
$this->havings[] = compact('type', 'column', 'operator', 'value', 'boolean');
if (! $value instanceof Expression) {
- $this->addBinding($value, 'having');
+ $this->addBinding(is_array($value) ? head($value) : $value, 'having');
}
return $this;
diff --git a/src/Illuminate/Foundation/Application.php b/src/Illuminate/Foundation/Application.php
index 388c8980da59..ec1deae44b68 100755
--- a/src/Illuminate/Foundation/Application.php
+++ b/src/Illuminate/Foundation/Application.php
@@ -33,7 +33,7 @@ class Application extends Container implements ApplicationContract, CachesConfig
*
* @var string
*/
- const VERSION = '8.22.0';
+ const VERSION = '8.22.1';
/**
* The base path for the Laravel installation.
diff --git a/tests/Database/DatabaseQueryBuilderTest.php b/tests/Database/DatabaseQueryBuilderTest.php
index ff013202564d..76d86e07293d 100755
--- a/tests/Database/DatabaseQueryBuilderTest.php
+++ b/tests/Database/DatabaseQueryBuilderTest.php
@@ -301,24 +301,24 @@ public function testBasicWheres()
public function testWheresWithArrayValue()
{
$builder = $this->getBuilder();
- $builder->select('*')->from('users')->where('id', [12, 30]);
+ $builder->select('*')->from('users')->where('id', [12]);
$this->assertSame('select * from "users" where "id" = ?', $builder->toSql());
- $this->assertEquals([0 => 12, 1 => 30], $builder->getBindings());
-
- $builder = $this->getBuilder();
- $builder->select('*')->from('users')->where('id', '=', [12, 30]);
- $this->assertSame('select * from "users" where "id" = ?', $builder->toSql());
- $this->assertEquals([0 => 12, 1 => 30], $builder->getBindings());
-
- $builder = $this->getBuilder();
- $builder->select('*')->from('users')->where('id', '!=', [12, 30]);
- $this->assertSame('select * from "users" where "id" != ?', $builder->toSql());
- $this->assertEquals([0 => 12, 1 => 30], $builder->getBindings());
-
- $builder = $this->getBuilder();
- $builder->select('*')->from('users')->where('id', '<>', [12, 30]);
- $this->assertSame('select * from "users" where "id" <> ?', $builder->toSql());
- $this->assertEquals([0 => 12, 1 => 30], $builder->getBindings());
+ $this->assertEquals([0 => 12], $builder->getBindings());
+
+ // $builder = $this->getBuilder();
+ // $builder->select('*')->from('users')->where('id', '=', [12, 30]);
+ // $this->assertSame('select * from "users" where "id" = ?', $builder->toSql());
+ // $this->assertEquals([0 => 12, 1 => 30], $builder->getBindings());
+
+ // $builder = $this->getBuilder();
+ // $builder->select('*')->from('users')->where('id', '!=', [12, 30]);
+ // $this->assertSame('select * from "users" where "id" != ?', $builder->toSql());
+ // $this->assertEquals([0 => 12, 1 => 30], $builder->getBindings());
+
+ // $builder = $this->getBuilder();
+ // $builder->select('*')->from('users')->where('id', '<>', [12, 30]);
+ // $this->assertSame('select * from "users" where "id" <> ?', $builder->toSql());
+ // $this->assertEquals([0 => 12, 1 => 30], $builder->getBindings());
}
public function testMySqlWrappingProtectsQuotationMarks()
pFad - Phonifier reborn
Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.
Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.
Alternative Proxies:
Alternative Proxy
pFad Proxy
pFad v3 Proxy
pFad v4 Proxy