Merge remote-tracking branch 'laravel/5.3' into fix-queue-failed-job-…

…event
laravel · Nov 2, 2016 · ea81fcf · ea81fcf
2 parents 1191786 + 6cf8c62
commit ea81fcf
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/Illuminate/Foundation/Testing/Concerns/MakesHttpRequests.php b/src/Illuminate/Foundation/Testing/Concerns/MakesHttpRequests.php
@@ -2,6 +2,7 @@
 
 namespace Illuminate\Foundation\Testing\Concerns;
 
+use Closure;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Str;
 use Illuminate\Http\Request;
@@ -766,7 +767,7 @@ public function assertViewHas($key, $value = null)
 
         if (is_null($value)) {
             PHPUnit::assertArrayHasKey($key, $this->response->original->getData());
-        } elseif ($value instanceof \Closure) {
+        } elseif ($value instanceof Closure) {
             PHPUnit::assertTrue($value($this->response->original->$key));
         } else {
             PHPUnit::assertEquals($value, $this->response->original->$key);

diff --git a/src/Illuminate/Translation/Translator.php b/src/Illuminate/Translation/Translator.php
@@ -2,6 +2,7 @@
 
 namespace Illuminate\Translation;
 
+use Countable;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Str;
 use Illuminate\Support\Collection;
@@ -213,7 +214,7 @@ public function choice($key, $number, array $replace = [], $locale = null)
     {
         $line = $this->get($key, $replace, $locale = $locale ?: $this->locale ?: $this->fallback);
 
-        if (is_array($number) || $number instanceof \Countable) {
+        if (is_array($number) || $number instanceof Countable) {
             $number = count($number);
         }