From 1ad9a66b93f82ce2a21f651620818f4557682d68 Mon Sep 17 00:00:00 2001 From: Marek Skiba Date: Mon, 14 Nov 2016 17:36:44 +0100 Subject: [PATCH 1/3] Remove unused imports --- src/Illuminate/Database/Connectors/ConnectionFactory.php | 1 - src/Illuminate/Database/Eloquent/Model.php | 1 - src/Illuminate/Database/Eloquent/Relations/HasOne.php | 1 - src/Illuminate/Mail/Jobs/HandleQueuedMessage.php | 1 - .../Notifications/Events/BroadcastNotificationCreated.php | 1 - src/Illuminate/Queue/Worker.php | 1 - 6 files changed, 6 deletions(-) diff --git a/src/Illuminate/Database/Connectors/ConnectionFactory.php b/src/Illuminate/Database/Connectors/ConnectionFactory.php index 75b7665ca0a0..be4bc68b955e 100755 --- 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 index 846eb9490f24..0b6681cc6564 100644 --- 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 index ca83020e87b2..8a05883e33d5 100755 --- 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 index 848c59ae6a81..86e5ba7ab628 100644 --- 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 index de66f9503727..644a46cc83b4 100644 --- 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 index 7fa28f9b27aa..20bff5abf912 100644 --- 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; From fdbf38e8ae2ead678d060e1954ebaa093d7ddc52 Mon Sep 17 00:00:00 2001 From: Seldar Date: Mon, 14 Nov 2016 21:53:23 +0300 Subject: [PATCH 2/3] Fix for #16400 callable for $callback parameter added for Schedule::call --- src/Illuminate/Console/Scheduling/Schedule.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Illuminate/Console/Scheduling/Schedule.php b/src/Illuminate/Console/Scheduling/Schedule.php index e36b78ef8068..e8d09bf9ef75 100644 --- 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 */ From 0fcac2a3d31ab68005cc385c5d02540727b2db97 Mon Sep 17 00:00:00 2001 From: Daniel Lashua Date: Tue, 15 Nov 2016 07:46:43 -0600 Subject: [PATCH 3/3] Update Connection.php reconnectIfMissingConnection() calls getPdo(). This executes the callback which is not desired for read/write connections where the read is being used. Checking is_null($this->pdo) instead allows for the callback to not be called until it is needed. --- src/Illuminate/Database/Connection.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Illuminate/Database/Connection.php b/src/Illuminate/Database/Connection.php index 3a28da7bb2c9..b975ed7d0ecf 100755 --- 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(); } }