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

laravel · Feb 26, 2018 · a241b6a · a241b6a
2 parents fb47b40 + 894492d
commit a241b6a
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 4 deletions.
diff --git a/CHANGELOG-5.5.md b/CHANGELOG-5.5.md
@@ -1,5 +1,12 @@
 # Release Notes for 5.5.x
 
+## v5.5.35 (2018-02-22)
+
+### Fixed
+- Fixed an issue with `orWhere*()` arguments ([3368494](https://github.com/laravel/framework/commit/3368494889130585bc6bbf22d8842881f8f4399c))
+- Fixed `tightenco/collect` version ([#23152](https://github.com/laravel/framework/pull/23152), [#23159](https://github.com/laravel/framework/pull/23159))
+
+
 ## v5.5.34 (2018-02-06)
 
 ### Changed

diff --git a/src/Illuminate/Foundation/Auth/AuthenticatesUsers.php b/src/Illuminate/Foundation/Auth/AuthenticatesUsers.php
@@ -123,7 +123,7 @@ protected function authenticated(Request $request, $user)
      * Get the failed login response instance.
      *
      * @param  \Illuminate\Http\Request  $request
-     * @return void
+     * @return \Symfony\Component\HttpFoundation\Response
      *
      * @throws \Illuminate\Validation\ValidationException
      */

diff --git a/src/Illuminate/Queue/SerializesAndRestoresModelIdentifiers.php b/src/Illuminate/Queue/SerializesAndRestoresModelIdentifiers.php
@@ -82,7 +82,7 @@ public function restoreModel($value)
     {
         return $this->getQueryForModelRestoration(
             (new $value->class)->setConnection($value->connection), $value->id
-        )->useWritePdo()->firstOrFail()->load($value->relations);
+        )->useWritePdo()->firstOrFail()->load($value->relations ?? []);
     }
 
     /**

diff --git a/src/Illuminate/Support/Testing/Fakes/QueueFake.php b/src/Illuminate/Support/Testing/Fakes/QueueFake.php
@@ -239,8 +239,8 @@ public function pop($queue = null)
      */
     public function bulk($jobs, $data = '', $queue = null)
     {
-        foreach ($this->jobs as $job) {
-            $this->push($job);
+        foreach ($jobs as $job) {
+            $this->push($job, $data, $queue);
         }
     }
 

diff --git a/tests/Support/SupportTestingQueueFakeTest.php b/tests/Support/SupportTestingQueueFakeTest.php
@@ -87,6 +87,20 @@ public function testAssertNothingPushed()
             $this->assertThat($e, new ExceptionMessage('Jobs were pushed unexpectedly.'));
         }
     }
+
+    public function testAssertPushedUsingBulk()
+    {
+        $this->fake->assertNothingPushed();
+
+        $queue = 'my-test-queue';
+        $this->fake->bulk([
+            $this->job,
+            new JobStub(),
+        ], null, $queue);
+
+        $this->fake->assertPushedOn($queue, JobStub::class);
+        $this->fake->assertPushed(JobStub::class, 2);
+    }
 }
 
 class JobStub