X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs-website;a=blobdiff_plain;f=vendor%2Fsymfony%2Fhttp-kernel%2FController%2FControllerResolver.php;fp=vendor%2Fsymfony%2Fhttp-kernel%2FController%2FControllerResolver.php;h=6d898e783144bc5447ce29ae869a8a6c328eb822;hp=b9d9f9fa254d94e8c8b5a28f2840e453691500db;hb=0bf8d09d2542548982e81a441b1f16e75873a04f;hpb=74df008bdbb3a11eeea356744f39b802369bda3c

diff --git a/vendor/symfony/http-kernel/Controller/ControllerResolver.php b/vendor/symfony/http-kernel/Controller/ControllerResolver.php
index b9d9f9fa2..6d898e783 100644
--- a/vendor/symfony/http-kernel/Controller/ControllerResolver.php
+++ b/vendor/symfony/http-kernel/Controller/ControllerResolver.php
@@ -65,29 +65,29 @@ class ControllerResolver implements ArgumentResolverInterface, ControllerResolve
             return false;
         }
 
-        if (is_array($controller)) {
+        if (\is_array($controller)) {
             return $controller;
         }
 
-        if (is_object($controller)) {
+        if (\is_object($controller)) {
             if (method_exists($controller, '__invoke')) {
                 return $controller;
             }
 
-            throw new \InvalidArgumentException(sprintf('Controller "%s" for URI "%s" is not callable.', get_class($controller), $request->getPathInfo()));
+            throw new \InvalidArgumentException(sprintf('Controller "%s" for URI "%s" is not callable.', \get_class($controller), $request->getPathInfo()));
         }
 
         if (false === strpos($controller, ':')) {
             if (method_exists($controller, '__invoke')) {
                 return $this->instantiateController($controller);
-            } elseif (function_exists($controller)) {
+            } elseif (\function_exists($controller)) {
                 return $controller;
             }
         }
 
         $callable = $this->createController($controller);
 
-        if (!is_callable($callable)) {
+        if (!\is_callable($callable)) {
             throw new \InvalidArgumentException(sprintf('The controller for URI "%s" is not callable. %s', $request->getPathInfo(), $this->getControllerError($callable)));
         }
 
@@ -101,11 +101,11 @@ class ControllerResolver implements ArgumentResolverInterface, ControllerResolve
      */
     public function getArguments(Request $request, $controller)
     {
-        @trigger_error(sprintf('%s is deprecated as of 3.1 and will be removed in 4.0. Implement the %s and inject it in the HttpKernel instead.', __METHOD__, ArgumentResolverInterface::class), E_USER_DEPRECATED);
+        @trigger_error(sprintf('The "%s()" method is deprecated as of 3.1 and will be removed in 4.0. Implement the %s and inject it in the HttpKernel instead.', __METHOD__, ArgumentResolverInterface::class), E_USER_DEPRECATED);
 
-        if (is_array($controller)) {
+        if (\is_array($controller)) {
             $r = new \ReflectionMethod($controller[0], $controller[1]);
-        } elseif (is_object($controller) && !$controller instanceof \Closure) {
+        } elseif (\is_object($controller) && !$controller instanceof \Closure) {
             $r = new \ReflectionObject($controller);
             $r = $r->getMethod('__invoke');
         } else {
@@ -126,13 +126,13 @@ class ControllerResolver implements ArgumentResolverInterface, ControllerResolve
      */
     protected function doGetArguments(Request $request, $controller, array $parameters)
     {
-        @trigger_error(sprintf('%s is deprecated as of 3.1 and will be removed in 4.0. Implement the %s and inject it in the HttpKernel instead.', __METHOD__, ArgumentResolverInterface::class), E_USER_DEPRECATED);
+        @trigger_error(sprintf('The "%s()" method is deprecated as of 3.1 and will be removed in 4.0. Implement the %s and inject it in the HttpKernel instead.', __METHOD__, ArgumentResolverInterface::class), E_USER_DEPRECATED);
 
         $attributes = $request->attributes->all();
         $arguments = array();
         foreach ($parameters as $param) {
             if (array_key_exists($param->name, $attributes)) {
-                if ($this->supportsVariadic && $param->isVariadic() && is_array($attributes[$param->name])) {
+                if ($this->supportsVariadic && $param->isVariadic() && \is_array($attributes[$param->name])) {
                     $arguments = array_merge($arguments, array_values($attributes[$param->name]));
                 } else {
                     $arguments[] = $attributes[$param->name];
@@ -144,10 +144,10 @@ class ControllerResolver implements ArgumentResolverInterface, ControllerResolve
             } elseif ($this->supportsScalarTypes && $param->hasType() && $param->allowsNull()) {
                 $arguments[] = null;
             } else {
-                if (is_array($controller)) {
-                    $repr = sprintf('%s::%s()', get_class($controller[0]), $controller[1]);
-                } elseif (is_object($controller)) {
-                    $repr = get_class($controller);
+                if (\is_array($controller)) {
+                    $repr = sprintf('%s::%s()', \get_class($controller[0]), $controller[1]);
+                } elseif (\is_object($controller)) {
+                    $repr = \get_class($controller);
                 } else {
                     $repr = $controller;
                 }
@@ -197,7 +197,7 @@ class ControllerResolver implements ArgumentResolverInterface, ControllerResolve
 
     private function getControllerError($callable)
     {
-        if (is_string($callable)) {
+        if (\is_string($callable)) {
             if (false !== strpos($callable, '::')) {
                 $callable = explode('::', $callable);
             }
@@ -206,26 +206,26 @@ class ControllerResolver implements ArgumentResolverInterface, ControllerResolve
                 return sprintf('Class "%s" does not have a method "__invoke".', $callable);
             }
 
-            if (!function_exists($callable)) {
+            if (!\function_exists($callable)) {
                 return sprintf('Function "%s" does not exist.', $callable);
             }
         }
 
-        if (!is_array($callable)) {
-            return sprintf('Invalid type for controller given, expected string or array, got "%s".', gettype($callable));
+        if (!\is_array($callable)) {
+            return sprintf('Invalid type for controller given, expected string or array, got "%s".', \gettype($callable));
         }
 
-        if (2 !== count($callable)) {
+        if (2 !== \count($callable)) {
             return 'Invalid format for controller, expected array(controller, method) or controller::method.';
         }
 
         list($controller, $method) = $callable;
 
-        if (is_string($controller) && !class_exists($controller)) {
+        if (\is_string($controller) && !class_exists($controller)) {
             return sprintf('Class "%s" does not exist.', $controller);
         }
 
-        $className = is_object($controller) ? get_class($controller) : $controller;
+        $className = \is_object($controller) ? \get_class($controller) : $controller;
 
         if (method_exists($controller, $method)) {
             return sprintf('Method "%s" on class "%s" should be public and non-abstract.', $method, $className);
@@ -238,7 +238,7 @@ class ControllerResolver implements ArgumentResolverInterface, ControllerResolve
         foreach ($collection as $item) {
             $lev = levenshtein($method, $item);
 
-            if ($lev <= strlen($method) / 3 || false !== strpos($item, $method)) {
+            if ($lev <= \strlen($method) / 3 || false !== strpos($item, $method)) {
                 $alternatives[] = $item;
             }
         }
@@ -247,7 +247,7 @@ class ControllerResolver implements ArgumentResolverInterface, ControllerResolve
 
         $message = sprintf('Expected method "%s" on class "%s"', $method, $className);
 
-        if (count($alternatives) > 0) {
+        if (\count($alternatives) > 0) {
             $message .= sprintf(', did you mean "%s"?', implode('", "', $alternatives));
         } else {
             $message .= sprintf('. Available methods: "%s".', implode('", "', $collection));