Fixes

laravel · May 31, 2020 · bdbcc2c · bdbcc2c
1 parent 915a292
commit bdbcc2c
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/src/Illuminate/Broadcasting/Broadcasters/Broadcaster.php b/src/Illuminate/Broadcasting/Broadcasters/Broadcaster.php
@@ -205,9 +205,9 @@ protected function resolveImplicitBindingIfPossible($key, $value, $callbackParam
                 continue;
             }
 
-            $instance = new Reflector::getParameterClassName($parameter);
+            $className = Reflector::getParameterClassName($parameter);
 
-            if (! $model = $instance->resolveRouteBinding($value)) {
+            if (is_null($model = (new $className)->resolveRouteBinding($value))) {
                 throw new AccessDeniedHttpException;
             }
 

diff --git a/src/Illuminate/Container/Util.php b/src/Illuminate/Container/Util.php
@@ -44,10 +44,10 @@ public static function unwrapIfClosure($value)
      * @param  \ReflectionParameter  $parameter
      * @return string|null
      */
-    public function getParameterClassName($parameter)
+    public static function getParameterClassName($parameter)
     {
         $type = $parameter->getType();
 
-        return ($type && !$type->isBuiltin()) ? $type->getName() : null;
+        return ($type && ! $type->isBuiltin()) ? $type->getName() : null;
     }
 }
diff --git a/src/Illuminate/Support/Reflector.php b/src/Illuminate/Support/Reflector.php
@@ -12,11 +12,11 @@ class Reflector
      * @param  \ReflectionParameter  $parameter
      * @return string|null
      */
-    public function getParameterClassName($parameter)
+    public static function getParameterClassName($parameter)
     {
         $type = $parameter->getType();
 
-        return ($type && !$type->isBuiltin()) ? $type->getName() : null;
+        return ($type && ! $type->isBuiltin()) ? $type->getName() : null;
     }
 
     /**
@@ -26,12 +26,12 @@ public function getParameterClassName($parameter)
      * @param  string  $className
      * @return bool
      */
-    public function isParameterSubclassOf($parameter, $className)
+    public static function isParameterSubclassOf($parameter, $className)
     {
         $paramClassName = static::getParameterClassName($parameter);
 
         return ($paramClassName && class_exists($paramClassName))
-            ? new ReflectionClass($paramClassName)->isSubclassOf($className) 
+            ? (new ReflectionClass($paramClassName))->isSubclassOf($className)
             : false;
     }
 }