Merge pull request #4 from laravel/5.2

Fix scope nesting (laravel#13413)

src/Illuminate/Console/Scheduling/Event.php

@@ -209,7 +209,7 @@ public function buildCommand()
             $command = $this->command.$redirect.$output.' 2>&1 &';
         }
 
-        return $this->user ? 'sudo -u '.$this->user.' '.$command : $command;
+        return $this->user && ! windows_os() ? 'sudo -u '.$this->user.' -- sh -c \''.$command.'\'' : $command;
     }
 
     /**

src/Illuminate/Database/Eloquent/Builder.php

@@ -1149,7 +1149,7 @@ protected function applyScope($scope, $builder)
      */
     protected function shouldNestWheresForScope(QueryBuilder $query, $originalWhereCount)
     {
-        return $originalWhereCount && count($query->wheres) > $originalWhereCount;
+        return count($query->wheres) > $originalWhereCount;
     }
 
     /**

src/Illuminate/Mail/Transport/SparkPostTransport.php

@@ -54,6 +54,7 @@ public function send(Swift_Mime_Message $message, &$failedRecipients = null)
                 'content' => [
                     'html' => $message->getBody(),
                     'from' => $this->getFrom($message),
+                    'reply_to' => $this->getReplyTo($message),
                     'subject' => $message->getSubject(),
                 ],
             ],
@@ -106,6 +107,19 @@ protected function getFrom(Swift_Mime_Message $message)
         }, array_keys($message->getFrom()), $message->getFrom())[0];
     }
 
+    /**
+     * Get the 'reply_to' headers and format as required by SparkPost.
+     *
+     * @param  Swift_Mime_Message  $message
+     * @return string
+     */
+    protected function getReplyTo(Swift_Mime_Message $message)
+    {
+        if (is_array($message->getReplyTo())) {
+            return current($message->getReplyTo()).' <'.key($message->getReplyTo()).'>';
+        }
+    }
+
     /**
      * Get the API key being used by the transport.
      *

tests/Auth/AuthGuardTest.php

@@ -272,6 +272,18 @@ public function testLoginUsingIdFailure()
         $this->assertFalse($guard->loginUsingId(11));
     }
 
+    public function testOnceUsingIdSetsUser()
+    {
+        list($session, $provider, $request, $cookie) = $this->getMocks();
+        $guard = m::mock('Illuminate\Auth\SessionGuard', ['default', $provider, $session])->makePartial();
+
+        $user = m::mock('Illuminate\Contracts\Auth\Authenticatable');
+        $guard->getProvider()->shouldReceive('retrieveById')->once()->with(10)->andReturn($user);
+        $guard->shouldReceive('setUser')->once()->with($user);
+
+        $this->assertTrue($guard->onceUsingId(10));
+    }
+
     public function testOnceUsingIdFailure()
     {
         list($session, $provider, $request, $cookie) = $this->getMocks();

tests/Database/DatabaseEloquentGlobalScopesTest.php

@@ -69,6 +69,10 @@ public function testGlobalScopesWithOrWhereConditionsAreNested()
     {
         $model = new EloquentClosureGlobalScopesWithOrTestModel();
 
+        $query = $model->newQuery();
+        $this->assertEquals('select "email", "password" from "table" where ("email" = ? or "email" = ?) and "active" = ? order by "name" asc', $query->toSql());
+        $this->assertEquals(['taylor@gmail.com', 'someone@else.com', 1], $query->getBindings());
+
         $query = $model->newQuery()->where('col1', 'val1')->orWhere('col2', 'val2');
         $this->assertEquals('select "email", "password" from "table" where ("col1" = ? or "col2" = ?) and ("email" = ? or "email" = ?) and "active" = ? order by "name" asc', $query->toSql());
         $this->assertEquals(['val1', 'val2', 'taylor@gmail.com', 'someone@else.com', 1], $query->getBindings());