From 6611265f301c34d07bc81e3fed8b37e11dfc1776 Mon Sep 17 00:00:00 2001
From: Taylor Otwell <taylor@laravel.com>
Date: Tue, 27 Oct 2020 14:50:31 -0500
Subject: [PATCH] [6.x] Adjust is_callable usage where needed for PHP 8
 (#34999)

* adjust is_callable usage where needed for php8

* Apply fixes from StyleCI (#35000)
---
 src/Illuminate/Console/Scheduling/CallbackEvent.php | 5 +++--
 src/Illuminate/Console/Scheduling/Event.php         | 5 +++--
 src/Illuminate/Foundation/Exceptions/Handler.php    | 3 ++-
 src/Illuminate/Routing/RouteSignatureParameters.php | 2 +-
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/Illuminate/Console/Scheduling/CallbackEvent.php b/src/Illuminate/Console/Scheduling/CallbackEvent.php
index 96b1c1e1bfbd..6af680d990c0 100644
--- a/src/Illuminate/Console/Scheduling/CallbackEvent.php
+++ b/src/Illuminate/Console/Scheduling/CallbackEvent.php
@@ -3,6 +3,7 @@
 namespace Illuminate\Console\Scheduling;
 
 use Illuminate\Contracts\Container\Container;
+use Illuminate\Support\Reflector;
 use InvalidArgumentException;
 use LogicException;
 
@@ -35,7 +36,7 @@ class CallbackEvent extends Event
      */
     public function __construct(EventMutex $mutex, $callback, array $parameters = [], $timezone = null)
     {
-        if (! is_string($callback) && ! is_callable($callback)) {
+        if (! is_string($callback) && ! Reflector::isCallable($callback)) {
             throw new InvalidArgumentException(
                 'Invalid scheduled callback event. Must be a string or callable.'
             );
@@ -163,6 +164,6 @@ public function getSummaryForDisplay()
             return $this->description;
         }
 
-        return is_string($this->callback) ? $this->callback : 'Closure';
+        return is_string($this->callback) ? $this->callback : 'Callback';
     }
 }
diff --git a/src/Illuminate/Console/Scheduling/Event.php b/src/Illuminate/Console/Scheduling/Event.php
index be8b6065c116..49ce518bc337 100644
--- a/src/Illuminate/Console/Scheduling/Event.php
+++ b/src/Illuminate/Console/Scheduling/Event.php
@@ -12,6 +12,7 @@
 use Illuminate\Support\Arr;
 use Illuminate\Support\Carbon;
 use Illuminate\Support\Facades\Date;
+use Illuminate\Support\Reflector;
 use Illuminate\Support\Traits\Macroable;
 use Psr\Http\Client\ClientExceptionInterface;
 use Symfony\Component\Process\Process;
@@ -672,7 +673,7 @@ public function onOneServer()
      */
     public function when($callback)
     {
-        $this->filters[] = is_callable($callback) ? $callback : function () use ($callback) {
+        $this->filters[] = Reflector::isCallable($callback) ? $callback : function () use ($callback) {
             return $callback;
         };
 
@@ -687,7 +688,7 @@ public function when($callback)
      */
     public function skip($callback)
     {
-        $this->rejects[] = is_callable($callback) ? $callback : function () use ($callback) {
+        $this->rejects[] = Reflector::isCallable($callback) ? $callback : function () use ($callback) {
             return $callback;
         };
 
diff --git a/src/Illuminate/Foundation/Exceptions/Handler.php b/src/Illuminate/Foundation/Exceptions/Handler.php
index 1102d752679b..903c201d709f 100644
--- a/src/Illuminate/Foundation/Exceptions/Handler.php
+++ b/src/Illuminate/Foundation/Exceptions/Handler.php
@@ -19,6 +19,7 @@
 use Illuminate\Support\Arr;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\View;
+use Illuminate\Support\Reflector;
 use Illuminate\Support\ViewErrorBag;
 use Illuminate\Validation\ValidationException;
 use Psr\Log\LoggerInterface;
@@ -103,7 +104,7 @@ public function report(Exception $e)
             return;
         }
 
-        if (is_callable($reportCallable = [$e, 'report'])) {
+        if (Reflector::isCallable($reportCallable = [$e, 'report'])) {
             return $this->container->call($reportCallable);
         }
 
diff --git a/src/Illuminate/Routing/RouteSignatureParameters.php b/src/Illuminate/Routing/RouteSignatureParameters.php
index 535d5edcbf32..bd7e932fb316 100644
--- a/src/Illuminate/Routing/RouteSignatureParameters.php
+++ b/src/Illuminate/Routing/RouteSignatureParameters.php
@@ -37,7 +37,7 @@ protected static function fromClassMethodString($uses)
     {
         [$class, $method] = Str::parseCallback($uses);
 
-        if (! method_exists($class, $method) && is_callable($class, $method)) {
+        if (! method_exists($class, $method) && Reflector::isCallable($class, $method)) {
             return [];
         }