diff --git a/src/Illuminate/Database/Eloquent/Concerns/HasAttributes.php b/src/Illuminate/Database/Eloquent/Concerns/HasAttributes.php index 325481bebe5b..585071a35d39 100644 --- a/src/Illuminate/Database/Eloquent/Concerns/HasAttributes.php +++ b/src/Illuminate/Database/Eloquent/Concerns/HasAttributes.php @@ -1592,9 +1592,7 @@ protected function isEnumCastable($key) return false; } - if (function_exists('enum_exists') && enum_exists($castType)) { - return true; - } + return enum_exists($castType); } /** diff --git a/src/Illuminate/Database/Eloquent/Relations/Concerns/InteractsWithDictionary.php b/src/Illuminate/Database/Eloquent/Relations/Concerns/InteractsWithDictionary.php index 91b3bf5bd4e4..d9775cc5a493 100644 --- a/src/Illuminate/Database/Eloquent/Relations/Concerns/InteractsWithDictionary.php +++ b/src/Illuminate/Database/Eloquent/Relations/Concerns/InteractsWithDictionary.php @@ -23,8 +23,7 @@ protected function getDictionaryKey($attribute) return $attribute->__toString(); } - if (function_exists('enum_exists') && - $attribute instanceof UnitEnum) { + if ($attribute instanceof UnitEnum) { return $attribute instanceof BackedEnum ? $attribute->value : $attribute->name; } diff --git a/src/Illuminate/Database/Query/Builder.php b/src/Illuminate/Database/Query/Builder.php index 91cd0a43d682..d1965d6881c3 100755 --- a/src/Illuminate/Database/Query/Builder.php +++ b/src/Illuminate/Database/Query/Builder.php @@ -3703,11 +3703,7 @@ public function addBinding($value, $type = 'where') */ public function castBinding($value) { - if (function_exists('enum_exists') && $value instanceof BackedEnum) { - return $value->value; - } - - return $value; + return $value instanceof BackedEnum ? $value->value : $value; } /** diff --git a/src/Illuminate/Http/Concerns/InteractsWithInput.php b/src/Illuminate/Http/Concerns/InteractsWithInput.php index 45d8b6443b5d..36dcec2fef4f 100644 --- a/src/Illuminate/Http/Concerns/InteractsWithInput.php +++ b/src/Illuminate/Http/Concerns/InteractsWithInput.php @@ -402,7 +402,6 @@ public function date($key, $format = null, $tz = null) public function enum($key, $enumClass) { if ($this->isNotFilled($key) || - ! function_exists('enum_exists') || ! enum_exists($enumClass) || ! method_exists($enumClass, 'tryFrom')) { return null; diff --git a/src/Illuminate/Routing/UrlGenerator.php b/src/Illuminate/Routing/UrlGenerator.php index e50e8f42c3df..105d17b658c3 100755 --- a/src/Illuminate/Routing/UrlGenerator.php +++ b/src/Illuminate/Routing/UrlGenerator.php @@ -484,9 +484,7 @@ public function toRoute($route, $parameters, $absolute) ? $value->{$route->bindingFieldFor($key)} : $value; - return function_exists('enum_exists') && $value instanceof BackedEnum - ? $value->value - : $value; + return $value instanceof BackedEnum ? $value->value : $value; })->all(); return $this->routeUrl()->to( diff --git a/src/Illuminate/Support/Reflector.php b/src/Illuminate/Support/Reflector.php index 1390c9dac965..0282378631d7 100644 --- a/src/Illuminate/Support/Reflector.php +++ b/src/Illuminate/Support/Reflector.php @@ -150,7 +150,7 @@ public static function isParameterBackedEnumWithStringBackingType($parameter) { $backedEnumClass = (string) $parameter->getType(); - if (function_exists('enum_exists') && enum_exists($backedEnumClass)) { + if (enum_exists($backedEnumClass)) { $reflectionBackedEnum = new ReflectionEnum($backedEnumClass); return $reflectionBackedEnum->isBacked() diff --git a/src/Illuminate/Validation/Rules/Enum.php b/src/Illuminate/Validation/Rules/Enum.php index 32008b2548bc..37c7d3faae1e 100644 --- a/src/Illuminate/Validation/Rules/Enum.php +++ b/src/Illuminate/Validation/Rules/Enum.php @@ -38,7 +38,7 @@ public function passes($attribute, $value) return true; } - if (is_null($value) || ! function_exists('enum_exists') || ! enum_exists($this->type) || ! method_exists($this->type, 'tryFrom')) { + if (is_null($value) || ! enum_exists($this->type) || ! method_exists($this->type, 'tryFrom')) { return false; }