Merge remote-tracking branch 'origin/5.3' into 5.3

laravel · Nov 15, 2016 · ef11bd7 · ef11bd7
2 parents 6545fdf + cae2043
commit ef11bd7
Show file tree

Hide file tree

Showing 8 changed files with 2 additions and 8 deletions.
diff --git a/src/Illuminate/Console/Scheduling/Schedule.php b/src/Illuminate/Console/Scheduling/Schedule.php
@@ -18,7 +18,7 @@ class Schedule
     /**
      * Add a new callback event to the schedule.
      *
-     * @param  string  $callback
+     * @param  string|callable  $callback
      * @param  array   $parameters
      * @return \Illuminate\Console\Scheduling\Event
      */

diff --git a/src/Illuminate/Database/Connection.php b/src/Illuminate/Database/Connection.php
@@ -829,7 +829,7 @@ public function reconnect()
      */
     protected function reconnectIfMissingConnection()
     {
-        if (is_null($this->getPdo()) || is_null($this->getReadPdo())) {
+        if (is_null($this->pdo)) {
             $this->reconnect();
         }
     }

diff --git a/src/Illuminate/Database/Connectors/ConnectionFactory.php b/src/Illuminate/Database/Connectors/ConnectionFactory.php
@@ -2,7 +2,6 @@
 
 namespace Illuminate\Database\Connectors;
 
-use PDO;
 use PDOException;
 use Illuminate\Support\Arr;
 use InvalidArgumentException;

diff --git a/src/Illuminate/Database/Eloquent/Model.php b/src/Illuminate/Database/Eloquent/Model.php
@@ -3,7 +3,6 @@
 namespace Illuminate\Database\Eloquent;
 
 use Closure;
-use DateTime;
 use Exception;
 use ArrayAccess;
 use Carbon\Carbon;

diff --git a/src/Illuminate/Database/Eloquent/Relations/HasOne.php b/src/Illuminate/Database/Eloquent/Relations/HasOne.php
@@ -2,7 +2,6 @@
 
 namespace Illuminate\Database\Eloquent\Relations;
 
-use Closure;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Collection;
 

diff --git a/src/Illuminate/Mail/Jobs/HandleQueuedMessage.php b/src/Illuminate/Mail/Jobs/HandleQueuedMessage.php
@@ -5,7 +5,6 @@
 use Closure;
 use Illuminate\Support\Str;
 use SuperClosure\Serializer;
-use Illuminate\Contracts\Queue\Job;
 use Illuminate\Contracts\Mail\Mailer;
 use Illuminate\Queue\SerializesAndRestoresModelIdentifiers;
 

diff --git a/src/Illuminate/Notifications/Events/BroadcastNotificationCreated.php b/src/Illuminate/Notifications/Events/BroadcastNotificationCreated.php
@@ -3,7 +3,6 @@
 namespace Illuminate\Notifications\Events;
 
 use Illuminate\Queue\SerializesModels;
-use Illuminate\Notifications\Notification;
 use Illuminate\Broadcasting\PrivateChannel;
 use Illuminate\Contracts\Broadcasting\ShouldBroadcast;
 

diff --git a/src/Illuminate/Queue/Worker.php b/src/Illuminate/Queue/Worker.php
@@ -4,7 +4,6 @@
 
 use Exception;
 use Throwable;
-use Illuminate\Contracts\Queue\Job;
 use Illuminate\Contracts\Events\Dispatcher;
 use Illuminate\Contracts\Debug\ExceptionHandler;
 use Symfony\Component\Debug\Exception\FatalThrowableError;