Merge branch '8.x' of github.com:laravel/framework into 8.x

Author: taylorotwell

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.
  *

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.
  *

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);
  }

src/Illuminate/Queue/Console/RetryCommand.php

@@ -2,6 +2,7 @@
 
 namespace Illuminate\Queue\Console;
 
+use DateTimeInterface;
 use Illuminate\Console\Command;
 use Illuminate\Support\Arr;
 
@@ -133,7 +134,11 @@ protected function refreshRetryUntil($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);

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()

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.
  *

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.
  *

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;

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
  */

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