[9.x] Simplify some conditions with is_countable() (#41168)

* Simplify come conditions with is_countable(). * Remove useless import.
laravel · Feb 22, 2022 · bb4d381 · bb4d381
1 parent ed8d75b
commit bb4d381
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/src/Illuminate/Translation/Translator.php b/src/Illuminate/Translation/Translator.php
@@ -153,7 +153,7 @@ public function choice($key, $number, array $replace = [], $locale = null)
         // If the given "number" is actually an array or countable we will simply count the
         // number of elements in an instance. This allows developers to pass an array of
         // items without having to count it on their end first which gives bad syntax.
-        if (is_array($number) || $number instanceof Countable) {
+        if (is_countable($number)) {
             $number = count($number);
         }
 

diff --git a/src/Illuminate/Validation/Concerns/ValidatesAttributes.php b/src/Illuminate/Validation/Concerns/ValidatesAttributes.php
@@ -2,7 +2,6 @@
 
 namespace Illuminate\Validation\Concerns;
 
-use Countable;
 use DateTime;
 use DateTimeInterface;
 use Egulias\EmailValidator\EmailValidator;
@@ -1518,7 +1517,7 @@ public function validateRequired($attribute, $value)
             return false;
         } elseif (is_string($value) && trim($value) === '') {
             return false;
-        } elseif ((is_array($value) || $value instanceof Countable) && count($value) < 1) {
+        } elseif (is_countable($value) && count($value) < 1) {
             return false;
         } elseif ($value instanceof File) {
             return (string) $value->getPath() !== '';