diff --git a/src/Illuminate/Database/Connection.php b/src/Illuminate/Database/Connection.php index 1876015140e5..5840c7a2421c 100755 --- a/src/Illuminate/Database/Connection.php +++ b/src/Illuminate/Database/Connection.php @@ -3,6 +3,7 @@ use PDO; use Closure; use DateTime; +use Illuminate\Events\Dispatcher; use Illuminate\Database\Query\Processors\Processor; use Doctrine\DBAL\Connection as DoctrineConnection; @@ -947,7 +948,7 @@ public function getEventDispatcher() * @param \Illuminate\Events\Dispatcher * @return void */ - public function setEventDispatcher(\Illuminate\Events\Dispatcher $events) + public function setEventDispatcher(Dispatcher $events) { $this->events = $events; } diff --git a/src/Illuminate/Database/Eloquent/Relations/BelongsToMany.php b/src/Illuminate/Database/Eloquent/Relations/BelongsToMany.php index beeb4a37c9e1..7dd72a5199ee 100755 --- a/src/Illuminate/Database/Eloquent/Relations/BelongsToMany.php +++ b/src/Illuminate/Database/Eloquent/Relations/BelongsToMany.php @@ -2,6 +2,7 @@ use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Builder; +use Illuminate\Database\Query\Expression; use Illuminate\Database\Eloquent\Collection; use Illuminate\Database\Eloquent\ModelNotFoundException; @@ -266,7 +267,7 @@ public function getRelationCountQuery(Builder $query, Builder $parent) */ public function getRelationCountQueryForSelfJoin(Builder $query, Builder $parent) { - $query->select(new \Illuminate\Database\Query\Expression('count(*)')); + $query->select(new Expression('count(*)')); $tablePrefix = $this->query->getQuery()->getConnection()->getTablePrefix(); @@ -274,7 +275,7 @@ public function getRelationCountQueryForSelfJoin(Builder $query, Builder $parent $key = $this->wrap($this->getQualifiedParentKeyName()); - return $query->where($hash.'.'.$this->foreignKey, '=', new \Illuminate\Database\Query\Expression($key)); + return $query->where($hash.'.'.$this->foreignKey, '=', new Expression($key)); } /** diff --git a/src/Illuminate/Foundation/Application.php b/src/Illuminate/Foundation/Application.php index cb9cd84de478..c650123442bd 100755 --- a/src/Illuminate/Foundation/Application.php +++ b/src/Illuminate/Foundation/Application.php @@ -1,6 +1,7 @@ bound('session.reject') ? $this['session.reject'] : null; - $client = (new \Stack\Builder) + $client = (new Builder) ->push('Illuminate\Cookie\Guard', $this['encrypter']) ->push('Illuminate\Cookie\Queue', $this['cookie']) ->push('Illuminate\Session\Middleware', $this['session'], $sessionReject); @@ -671,7 +672,7 @@ protected function getStackedClient() * @param \Stack\Builder * @return void */ - protected function mergeCustomMiddlewares(\Stack\Builder $stack) + protected function mergeCustomMiddlewares(Builder $stack) { foreach ($this->middlewares as $middleware) { diff --git a/src/Illuminate/Foundation/Console/TinkerCommand.php b/src/Illuminate/Foundation/Console/TinkerCommand.php index fe3fcdcb795e..58d40143ce5d 100755 --- a/src/Illuminate/Foundation/Console/TinkerCommand.php +++ b/src/Illuminate/Foundation/Console/TinkerCommand.php @@ -1,5 +1,6 @@ setupBorisErrorHandling(); - (new \Boris\Boris('> '))->start(); + (new Boris('> '))->start(); } /** diff --git a/src/Illuminate/Support/Str.php b/src/Illuminate/Support/Str.php index c19ba5fefece..48cab1bed05e 100755 --- a/src/Illuminate/Support/Str.php +++ b/src/Illuminate/Support/Str.php @@ -1,5 +1,6 @@