Merge branch '3.4' into 4.3

* 3.4: (21 commits)
  [SecurityBundle] fix return type declarations
  [BrowserKit] fix return type declarations
  [PropertyInfo] fix return type declarations
  [Bridge/Doctrine] fix return type declarations
  [Form] fix return type declarations
  [Console] fix return type declarations
  [Intl] fix return type declarations
  [Templating] fix return type declarations
  [DomCrawler] fix return type declarations
  [Validator] fix return type declarations
  [Process] fix return type declarations
  [Workflow] fix return type declarations
  [Cache] fix return type declarations
  [Serializer] fix return type declarations
  [Translation] fix return type declarations
  [DI] fix return type declarations
  [Config] fix return type declarations
  [HttpKernel] Fix return type declarations
  [Security] Fix return type declarations
  [Routing] Fix return type declarations
  ...

Author: nicolas-grekas

Controller/ControllerResolver.php

@@ -82,7 +82,11 @@ public function getController(Request $request)
             return $controller;
         }
 
-        $callable = $this->createController($controller);
+        try {
+            $callable = $this->createController($controller);
+        } catch (\InvalidArgumentException $e) {
+            throw new \InvalidArgumentException(sprintf('The controller for URI "%s" is not callable. %s', $request->getPathInfo(), $e->getMessage()));
+        }
 
         if (!\is_callable($callable)) {
             throw new \InvalidArgumentException(sprintf('The controller for URI "%s" is not callable. %s', $request->getPathInfo(), $this->getControllerError($callable)));
@@ -97,17 +101,25 @@ public function getController(Request $request)
      * @param string $controller A Controller string
      *
      * @return callable A PHP callable
+     *
+     * @throws \InvalidArgumentException When the controller cannot be created
      */
     protected function createController($controller)
     {
         if (false === strpos($controller, '::')) {
-            return $this->instantiateController($controller);
+            $controller = $this->instantiateController($controller);
+
+            if (!\is_callable($controller)) {
+                throw new \InvalidArgumentException($this->getControllerError($controller));
+            }
+
+            return $controller;
         }
 
         list($class, $method) = explode('::', $controller, 2);
 
         try {
-            return [$this->instantiateController($class), $method];
+            $controller = [$this->instantiateController($class), $method];
         } catch (\Error | \LogicException $e) {
             try {
                 if ((new \ReflectionMethod($class, $method))->isStatic()) {
@@ -119,6 +131,12 @@ protected function createController($controller)
 
             throw $e;
         }
+
+        if (!\is_callable($controller)) {
+            throw new \InvalidArgumentException($this->getControllerError($controller));
+        }
+
+        return $controller;
     }
 
     /**

ControllerMetadata/ArgumentMetadata.php

@@ -50,7 +50,7 @@ public function getName()
      *
      * The type is the PHP class in 5.5+ and additionally the basic type in PHP 7.0+.
      *
-     * @return string
+     * @return string|null
      */
     public function getType()
     {

DataCollector/ConfigDataCollector.php

@@ -131,7 +131,7 @@ public function getApplicationVersion()
     /**
      * Gets the token.
      *
-     * @return string The token
+     * @return string|null The token
      */
     public function getToken()
     {

DataCollector/ExceptionDataCollector.php

@@ -55,7 +55,7 @@ public function hasException()
     /**
      * Gets the exception.
      *
-     * @return \Exception The exception
+     * @return \Exception|FlattenException
      */
     public function getException()
     {

DataCollector/LoggerDataCollector.php

@@ -75,11 +75,6 @@ public function lateCollect()
         $this->currentRequest = null;
     }
 
-    /**
-     * Gets the logs.
-     *
-     * @return array An array of logs
-     */
     public function getLogs()
     {
         return isset($this->data['logs']) ? $this->data['logs'] : [];

DataCollector/TimeDataCollector.php

@@ -132,7 +132,7 @@ public function getInitTime()
     /**
      * Gets the request time.
      *
-     * @return int The time
+     * @return float
      */
     public function getStartTime()
     {

HttpCache/AbstractSurrogate.php

@@ -110,7 +110,7 @@ public function handle(HttpCache $cache, $uri, $alt, $ignoreErrors)
             }
         }
 
-        return null;
+        return '';
     }
 
     /**

HttpCache/Ssi.php

@@ -95,6 +95,6 @@ public function process(Request $request, Response $response)
         // remove SSI/1.0 from the Surrogate-Control header
         $this->removeFromControl($response);
 
-        return null;
+        return $response;
     }
 }

Kernel.php

@@ -204,7 +204,7 @@ public function handle(Request $request, $type = HttpKernelInterface::MASTER_REQ
     /**
      * Gets a HTTP kernel from the container.
      *
-     * @return HttpKernel
+     * @return HttpKernelInterface
      */
     protected function getHttpKernel()
     {
@@ -377,7 +377,7 @@ public function setAnnotatedClassCache(array $annotatedClasses)
      */
     public function getStartTime()
     {
-        return $this->debug ? $this->startTime : -INF;
+        return $this->debug && null !== $this->startTime ? $this->startTime : -INF;
     }
 
     /**

KernelInterface.php

@@ -140,7 +140,7 @@ public function getContainer();
     /**
      * Gets the request start time (not available if debug is disabled).
      *
-     * @return int The request start timestamp
+     * @return float The request start timestamp
      */
     public function getStartTime();