diff --git a/CHANGELOG-6.x.md b/CHANGELOG-6.x.md
index 078fe3776c23..d92867e61bf9 100644
--- a/CHANGELOG-6.x.md
+++ b/CHANGELOG-6.x.md
@@ -1,6 +1,12 @@
# Release Notes for 6.x
-## [Unreleased](https://github.com/laravel/framework/compare/v6.20.8...6.x)
+## [Unreleased](https://github.com/laravel/framework/compare/v6.20.9...6.x)
+
+
+## [v6.20.9 (2021-01-05)](https://github.com/laravel/framework/compare/v6.20.8...v6.20.9)
+
+### Added
+- [Updated Illuminate\Database\DetectsLostConnections with new strings](https://github.com/laravel/framework/compare/v6.20.8...v6.20.9)
## [v6.20.8 (2020-12-22)](https://github.com/laravel/framework/compare/v6.20.7...v6.20.8)
diff --git a/CHANGELOG-8.x.md b/CHANGELOG-8.x.md
index c0499d7f01e5..1f35a3bc3813 100644
--- a/CHANGELOG-8.x.md
+++ b/CHANGELOG-8.x.md
@@ -1,6 +1,26 @@
# Release Notes for 8.x
-## [Unreleased](https://github.com/laravel/framework/compare/v8.20.1...8.x)
+## [Unreleased](https://github.com/laravel/framework/compare/v8.21.0...8.x)
+
+
+## [v8.21.0 (2021-01-05)](https://github.com/laravel/framework/compare/v8.20.1...v8.21.0)
+
+### Added
+- Added command to clean batches table ([#35694](https://github.com/laravel/framework/pull/35694), [33f5ac6](https://github.com/laravel/framework/commit/33f5ac695a55d6cdbadcfe1b46e3409e4a66df16))
+- Added item to list of causedByLostConnection errors ([#35744](https://github.com/laravel/framework/pull/35744))
+- Make it possible to set Postmark Message Stream ID ([#35755](https://github.com/laravel/framework/pull/35755))
+
+### Fixed
+- Fixed `php artisan db` command for the Postgres CLI ([#35725](https://github.com/laravel/framework/pull/35725))
+- Fixed OPTIONS method bug with use same path and diff domain when cache route ([#35714](https://github.com/laravel/framework/pull/35714))
+
+### Changed
+- Ensure DBAL custom type doesn't exists in `Illuminate\Database\DatabaseServiceProvider::registerDoctrineTypes()` ([#35704](https://github.com/laravel/framework/pull/35704))
+- Added missing `dispatchAfterCommit` to `DatabaseQueue` ([#35715](https://github.com/laravel/framework/pull/35715))
+- Set chain queue when inside a batch ([#35746](https://github.com/laravel/framework/pull/35746))
+- Give a more meaningul message when route parameters are missing ([#35706](https://github.com/laravel/framework/pull/35706))
+- Added table prefix to `Illuminate\Database\Console\DumpCommand::schemaState()` ([4ffe40f](https://github.com/laravel/framework/commit/4ffe40fb169c6bcce9193ff56958eca41e64294f))
+- Refresh the retryUntil time on job retry ([#35780](https://github.com/laravel/framework/pull/35780), [45eb7a7](https://github.com/laravel/framework/commit/45eb7a7b1706ae175268731a673f369c0e556805))
## [v8.20.1 (2020-12-22)](https://github.com/laravel/framework/compare/v8.20.0...v8.20.1)
diff --git a/src/Illuminate/Collections/Collection.php b/src/Illuminate/Collections/Collection.php
index f4c7b4007a91..6a8ab88818aa 100644
--- a/src/Illuminate/Collections/Collection.php
+++ b/src/Illuminate/Collections/Collection.php
@@ -884,6 +884,24 @@ public function reduce(callable $callback, $initial = null)
return array_reduce($this->items, $callback, $initial);
}
+ /**
+ * Reduce an associative collection to a single value.
+ *
+ * @param callable $callback
+ * @param mixed $initial
+ * @return mixed
+ */
+ public function reduceWithKeys(callable $callback, $initial = null)
+ {
+ $result = $initial;
+
+ foreach ($this->items as $key => $value) {
+ $result = $callback($result, $value, $key);
+ }
+
+ return $result;
+ }
+
/**
* Replace the collection items with the given items.
*
diff --git a/src/Illuminate/Collections/LazyCollection.php b/src/Illuminate/Collections/LazyCollection.php
index 2384948f951a..ca51626b071e 100644
--- a/src/Illuminate/Collections/LazyCollection.php
+++ b/src/Illuminate/Collections/LazyCollection.php
@@ -845,6 +845,24 @@ public function reduce(callable $callback, $initial = null)
return $result;
}
+ /**
+ * Reduce an associative collection to a single value.
+ *
+ * @param callable $callback
+ * @param mixed $initial
+ * @return mixed
+ */
+ public function reduceWithKeys(callable $callback, $initial = null)
+ {
+ $result = $initial;
+
+ foreach ($this as $key => $value) {
+ $result = $callback($result, $value, $key);
+ }
+
+ return $result;
+ }
+
/**
* Replace the collection items with the given items.
*
diff --git a/src/Illuminate/Database/DetectsLostConnections.php b/src/Illuminate/Database/DetectsLostConnections.php
index 6ba3c4939faa..07630c590d5c 100644
--- a/src/Illuminate/Database/DetectsLostConnections.php
+++ b/src/Illuminate/Database/DetectsLostConnections.php
@@ -44,6 +44,7 @@ protected function causedByLostConnection(Throwable $e)
'running with the --read-only option so it cannot execute this statement',
'The connection is broken and recovery is not possible. The connection is marked by the client driver as unrecoverable. No attempt was made to restore the connection.',
'SQLSTATE[HY000] [2002] php_network_getaddresses: getaddrinfo failed: Try again',
+ 'SQLSTATE[HY000] [2002] php_network_getaddresses: getaddrinfo failed: Name or service not known',
'SQLSTATE[HY000]: General error: 7 SSL SYSCALL error: EOF detected',
'SQLSTATE[HY000] [2002] Connection timed out',
'SSL: Connection timed out',
diff --git a/src/Illuminate/Database/Eloquent/Concerns/HasRelationships.php b/src/Illuminate/Database/Eloquent/Concerns/HasRelationships.php
index 9ee9e3d124e3..5262d4305273 100644
--- a/src/Illuminate/Database/Eloquent/Concerns/HasRelationships.php
+++ b/src/Illuminate/Database/Eloquent/Concerns/HasRelationships.php
@@ -256,7 +256,7 @@ public function morphTo($name = null, $type = null, $id = null, $ownerKey = null
// If the type value is null it is probably safe to assume we're eager loading
// the relationship. In this case we'll just pass in a dummy query where we
// need to remove any eager loads that may already be defined on a model.
- return is_null($class = $this->getAttributeFromArray($type))
+ return is_null($class = $this->getAttributeFromArray($type)) || $class === ''
? $this->morphEagerTo($name, $type, $id, $ownerKey)
: $this->morphInstanceTo($class, $name, $type, $id, $ownerKey);
}
diff --git a/src/Illuminate/Database/Schema/Grammars/SQLiteGrammar.php b/src/Illuminate/Database/Schema/Grammars/SQLiteGrammar.php
index 5075c0504204..556d749e23b2 100755
--- a/src/Illuminate/Database/Schema/Grammars/SQLiteGrammar.php
+++ b/src/Illuminate/Database/Schema/Grammars/SQLiteGrammar.php
@@ -875,7 +875,7 @@ protected function modifyStoredAs(Blueprint $blueprint, Fluent $column)
protected function modifyNullable(Blueprint $blueprint, Fluent $column)
{
if (is_null($column->virtualAs) && is_null($column->storedAs)) {
- return $column->nullable ? ' null' : ' not null';
+ return $column->nullable ? '' : ' not null';
}
if ($column->nullable === false) {
diff --git a/src/Illuminate/Foundation/Application.php b/src/Illuminate/Foundation/Application.php
index 3dfa37ef701c..388c8980da59 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.21.0';
+ const VERSION = '8.22.0';
/**
* The base path for the Laravel installation.
diff --git a/src/Illuminate/Foundation/helpers.php b/src/Illuminate/Foundation/helpers.php
index d6af860d8915..3842915bf721 100644
--- a/src/Illuminate/Foundation/helpers.php
+++ b/src/Illuminate/Foundation/helpers.php
@@ -586,11 +586,15 @@ function redirect($to = null, $status = 302, $headers = [], $secure = null)
/**
* Report an exception.
*
- * @param \Throwable $exception
+ * @param \Throwable|string $exception
* @return void
*/
- function report(Throwable $exception)
+ function report($exception)
{
+ if (is_string($exception)) {
+ $exception = new Exception($exception);
+ }
+
app(ExceptionHandler::class)->report($exception);
}
}
@@ -601,7 +605,7 @@ function report(Throwable $exception)
*
* @param array|string|null $key
* @param mixed $default
- * @return \Illuminate\Http\Request|string|array
+ * @return \Illuminate\Http\Request|string|array|null
*/
function request($key = null, $default = null)
{
diff --git a/src/Illuminate/Http/Resources/CollectsResources.php b/src/Illuminate/Http/Resources/CollectsResources.php
index a5531f7a02ce..5c42da4225f5 100644
--- a/src/Illuminate/Http/Resources/CollectsResources.php
+++ b/src/Illuminate/Http/Resources/CollectsResources.php
@@ -47,7 +47,8 @@ protected function collects()
}
if (Str::endsWith(class_basename($this), 'Collection') &&
- class_exists($class = Str::replaceLast('Collection', '', get_class($this)))) {
+ (class_exists($class = Str::replaceLast('Collection', '', get_class($this))) ||
+ class_exists($class = Str::replaceLast('Collection', 'Resource', get_class($this))))) {
return $class;
}
}
diff --git a/src/Illuminate/Queue/Console/RetryCommand.php b/src/Illuminate/Queue/Console/RetryCommand.php
index fe6248800c99..ad090f6fa5d0 100644
--- a/src/Illuminate/Queue/Console/RetryCommand.php
+++ b/src/Illuminate/Queue/Console/RetryCommand.php
@@ -2,6 +2,7 @@
namespace Illuminate\Queue\Console;
+use DateTimeInterface;
use Illuminate\Console\Command;
use Illuminate\Support\Arr;
@@ -126,10 +127,18 @@ protected function refreshRetryUntil($payload)
{
$payload = json_decode($payload, true);
+ if (! isset($payload['data']['command'])) {
+ return json_encode($payload);
+ }
+
$instance = unserialize($payload['data']['command']);
if (is_object($instance) && method_exists($instance, 'retryUntil')) {
- $payload['retryUntil'] = $instance->retryUntil()->timestamp;
+ $retryUntil = $instance->retryUntil();
+
+ $payload['retryUntil'] = $retryUntil instanceof DateTimeInterface
+ ? $retryUntil->getTimestamp()
+ : $retryUntil;
}
return json_encode($payload);
diff --git a/src/Illuminate/Support/Facades/Session.php b/src/Illuminate/Support/Facades/Session.php
index 70e42e20ef16..12a4547a1fbb 100755
--- a/src/Illuminate/Support/Facades/Session.php
+++ b/src/Illuminate/Support/Facades/Session.php
@@ -13,6 +13,7 @@
* @method static bool save()
* @method static bool start()
* @method static mixed get(string $key, $default = null)
+ * @method static mixed flash(string $class, string $message)
* @method static mixed pull(string $key, $default = null)
* @method static mixed remove(string $key)
* @method static string getId()
diff --git a/src/Illuminate/Support/Facades/URL.php b/src/Illuminate/Support/Facades/URL.php
index 9e11006d8697..05866345fea5 100755
--- a/src/Illuminate/Support/Facades/URL.php
+++ b/src/Illuminate/Support/Facades/URL.php
@@ -5,7 +5,7 @@
/**
* @method static \Illuminate\Contracts\Routing\UrlGenerator setRootControllerNamespace(string $rootNamespace)
* @method static bool hasValidSignature(\Illuminate\Http\Request $request, bool $absolute = true)
- * @method static string action(string $action, $parameters = [], bool $absolute = true)
+ * @method static string action(string|array $action, $parameters = [], bool $absolute = true)
* @method static string asset(string $path, bool $secure = null)
* @method static string secureAsset(string $path)
* @method static string current()
diff --git a/src/Illuminate/Support/Testing/Fakes/EventFake.php b/src/Illuminate/Support/Testing/Fakes/EventFake.php
index 84f67482ebe3..90f30212ef7b 100644
--- a/src/Illuminate/Support/Testing/Fakes/EventFake.php
+++ b/src/Illuminate/Support/Testing/Fakes/EventFake.php
@@ -106,6 +106,21 @@ public function assertNotDispatched($event, $callback = null)
);
}
+ /**
+ * Assert that no events were dispatched.
+ *
+ * @return void
+ */
+ public function assertNothingDispatched()
+ {
+ $count = count(Arr::flatten($this->events));
+
+ PHPUnit::assertSame(
+ 0, $count,
+ "{$count} unexpected events were dispatched."
+ );
+ }
+
/**
* Get all of the events matching a truth-test callback.
*
diff --git a/src/Illuminate/Testing/PendingCommand.php b/src/Illuminate/Testing/PendingCommand.php
index 55ea307c82f3..3e08c53ccee7 100644
--- a/src/Illuminate/Testing/PendingCommand.php
+++ b/src/Illuminate/Testing/PendingCommand.php
@@ -157,12 +157,24 @@ public function doesntExpectOutput($output)
*/
public function expectsTable($headers, $rows, $tableStyle = 'default', array $columnStyles = [])
{
- $this->test->expectedTables[] = [
- 'headers' => (array) $headers,
- 'rows' => $rows instanceof Arrayable ? $rows->toArray() : $rows,
- 'tableStyle' => $tableStyle,
- 'columnStyles' => $columnStyles,
- ];
+ $table = (new Table($output = new BufferedOutput))
+ ->setHeaders((array) $headers)
+ ->setRows($rows instanceof Arrayable ? $rows->toArray() : $rows)
+ ->setStyle($tableStyle);
+
+ foreach ($columnStyles as $columnIndex => $columnStyle) {
+ $table->setColumnStyle($columnIndex, $columnStyle);
+ }
+
+ $table->render();
+
+ $lines = array_filter(
+ explode(PHP_EOL, $output->fetch())
+ );
+
+ foreach ($lines as $line) {
+ $this->expectsOutput($line);
+ }
return $this;
}
@@ -305,8 +317,6 @@ private function createABufferedOutputMock()
->shouldAllowMockingProtectedMethods()
->shouldIgnoreMissing();
- $this->applyTableOutputExpectations($mock);
-
foreach ($this->test->expectedOutput as $i => $output) {
$mock->shouldReceive('doWrite')
->once()
@@ -330,38 +340,6 @@ private function createABufferedOutputMock()
return $mock;
}
- /**
- * Apply the output table expectations to the mock.
- *
- * @param \Mockery\MockInterface $mock
- * @return void
- */
- private function applyTableOutputExpectations($mock)
- {
- foreach ($this->test->expectedTables as $i => $consoleTable) {
- $table = (new Table($output = new BufferedOutput))
- ->setHeaders($consoleTable['headers'])
- ->setRows($consoleTable['rows'])
- ->setStyle($consoleTable['tableStyle']);
-
- foreach ($consoleTable['columnStyles'] as $columnIndex => $columnStyle) {
- $table->setColumnStyle($columnIndex, $columnStyle);
- }
-
- $table->render();
-
- $lines = array_filter(
- explode(PHP_EOL, $output->fetch())
- );
-
- foreach ($lines as $line) {
- $this->expectsOutput($line);
- }
-
- unset($this->test->expectedTables[$i]);
- }
- }
-
/**
* Flush the expectations from the test case.
*
diff --git a/src/Illuminate/Validation/Concerns/ValidatesAttributes.php b/src/Illuminate/Validation/Concerns/ValidatesAttributes.php
index 6bd27d55b07e..c0c5411c1391 100644
--- a/src/Illuminate/Validation/Concerns/ValidatesAttributes.php
+++ b/src/Illuminate/Validation/Concerns/ValidatesAttributes.php
@@ -1146,7 +1146,7 @@ public function validateJson($attribute, $value)
return false;
}
- if (! is_scalar($value) && ! method_exists($value, '__toString')) {
+ if (! is_scalar($value) && ! is_null($value) && ! method_exists($value, '__toString')) {
return false;
}
diff --git a/tests/Database/DatabaseEloquentMorphToTest.php b/tests/Database/DatabaseEloquentMorphToTest.php
index 172a2aa84d1d..a6bd248ff563 100644
--- a/tests/Database/DatabaseEloquentMorphToTest.php
+++ b/tests/Database/DatabaseEloquentMorphToTest.php
@@ -100,6 +100,16 @@ public function testMorphToWithZeroMorphType()
$parent->relation();
}
+ public function testMorphToWithEmptyStringMorphType()
+ {
+ $parent = $this->getMockBuilder(EloquentMorphToModelStub::class)->onlyMethods(['getAttributeFromArray', 'morphEagerTo', 'morphInstanceTo'])->getMock();
+ $parent->method('getAttributeFromArray')->with('relation_type')->willReturn('');
+ $parent->expects($this->once())->method('morphEagerTo');
+ $parent->expects($this->never())->method('morphInstanceTo');
+
+ $parent->relation();
+ }
+
public function testMorphToWithSpecifiedClassDefault()
{
$parent = new EloquentMorphToModelStub;
diff --git a/tests/Database/DatabaseSQLiteSchemaGrammarTest.php b/tests/Database/DatabaseSQLiteSchemaGrammarTest.php
index 41e53cc725e7..226c58bf2b34 100755
--- a/tests/Database/DatabaseSQLiteSchemaGrammarTest.php
+++ b/tests/Database/DatabaseSQLiteSchemaGrammarTest.php
@@ -361,7 +361,7 @@ public function testAddingString()
$statements = $blueprint->toSql($this->getConnection(), $this->getGrammar());
$this->assertCount(1, $statements);
- $this->assertSame('alter table "users" add column "foo" varchar null default \'bar\'', $statements[0]);
+ $this->assertSame('alter table "users" add column "foo" varchar default \'bar\'', $statements[0]);
}
public function testAddingText()
@@ -663,8 +663,8 @@ public function testAddingTimestamps()
$statements = $blueprint->toSql($this->getConnection(), $this->getGrammar());
$this->assertCount(2, $statements);
$this->assertEquals([
- 'alter table "users" add column "created_at" datetime null',
- 'alter table "users" add column "updated_at" datetime null',
+ 'alter table "users" add column "created_at" datetime',
+ 'alter table "users" add column "updated_at" datetime',
], $statements);
}
@@ -675,8 +675,8 @@ public function testAddingTimestampsTz()
$statements = $blueprint->toSql($this->getConnection(), $this->getGrammar());
$this->assertCount(2, $statements);
$this->assertEquals([
- 'alter table "users" add column "created_at" datetime null',
- 'alter table "users" add column "updated_at" datetime null',
+ 'alter table "users" add column "created_at" datetime',
+ 'alter table "users" add column "updated_at" datetime',
], $statements);
}
@@ -687,7 +687,7 @@ public function testAddingRememberToken()
$statements = $blueprint->toSql($this->getConnection(), $this->getGrammar());
$this->assertCount(1, $statements);
- $this->assertSame('alter table "users" add column "remember_token" varchar null', $statements[0]);
+ $this->assertSame('alter table "users" add column "remember_token" varchar', $statements[0]);
}
public function testAddingBinary()
diff --git a/tests/Support/SupportCollectionTest.php b/tests/Support/SupportCollectionTest.php
index 6faf65a1a3c2..b622884fe6c1 100755
--- a/tests/Support/SupportCollectionTest.php
+++ b/tests/Support/SupportCollectionTest.php
@@ -3592,6 +3592,20 @@ public function testReduce($collection)
}));
}
+ /**
+ * @dataProvider collectionClassProvider
+ */
+ public function testReduceWithKeys($collection)
+ {
+ $data = new $collection([
+ 'foo' => 'bar',
+ 'baz' => 'qux',
+ ]);
+ $this->assertEquals('foobarbazqux', $data->reduceWithKeys(function ($carry, $element, $key) {
+ return $carry .= $key.$element;
+ }));
+ }
+
/**
* @dataProvider collectionClassProvider
*/
diff --git a/tests/Support/SupportTestingEventFakeTest.php b/tests/Support/SupportTestingEventFakeTest.php
index 3a9ccc6cdd3b..d51562d10c58 100644
--- a/tests/Support/SupportTestingEventFakeTest.php
+++ b/tests/Support/SupportTestingEventFakeTest.php
@@ -118,6 +118,21 @@ function ($event, $payload) {
$fake->assertDispatched('Bar');
$fake->assertNotDispatched('Baz');
}
+
+ public function testAssertNothingDispatched()
+ {
+ $this->fake->assertNothingDispatched();
+
+ $this->fake->dispatch(EventStub::class);
+ $this->fake->dispatch(EventStub::class);
+
+ try {
+ $this->fake->assertNothingDispatched();
+ $this->fail();
+ } catch (ExpectationFailedException $e) {
+ $this->assertThat($e, new ExceptionMessage('2 unexpected events were dispatched.'));
+ }
+ }
}
class EventStub
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