Static analysis fixes as reported by scrutinizer-ci

Author: Ocramius

lib/Doctrine/ORM/Configuration.php

@@ -162,10 +162,8 @@ public function setProxyDir(string $directory) : void
      *
      * @param boolean|int $autoGenerate Possible values are constants of Doctrine\ORM\Proxy\Factory\ProxyFactory.
      *                                  True is converted to AUTOGENERATE_ALWAYS, false to AUTOGENERATE_NEVER.
-     *
-     * @return void
      */
-    public function setAutoGenerateProxyClasses($autoGenerate)
+    public function setAutoGenerateProxyClasses($autoGenerate) : void
     {
         $proxyManagerConfig = $this->getProxyManagerConfiguration();
 
@@ -432,10 +430,8 @@ public function getCustomStringFunction(string $functionName)
      * Any previously added string functions are discarded.
      *
      * @param array $functions The map of custom DQL string functions.
-     *
-     * @return void
      */
-    public function setCustomStringFunctions(array $functions)
+    public function setCustomStringFunctions(array $functions) : void
     {
         foreach ($functions as $name => $className) {
             $this->addCustomStringFunction($name, $className);
@@ -500,11 +496,9 @@ public function addCustomDatetimeFunction(string $functionName, $classNameOrFact
     /**
      * Gets the implementation class name of a registered custom date/time DQL function.
      *
-     * @param string $name
-     *
-     * @return string|null
+     * @return string|callable|null
      */
-    public function getCustomDatetimeFunction($functionName)
+    public function getCustomDatetimeFunction(string $functionName)
     {
         return $this->customDatetimeFunctions[\strtolower($functionName)] ?? null;
     }
@@ -518,10 +512,8 @@ public function getCustomDatetimeFunction($functionName)
      * Any previously added date/time functions are discarded.
      *
      * @param array $functions The map of custom DQL date/time functions.
-     *
-     * @return void
      */
-    public function setCustomDatetimeFunctions(array $functions)
+    public function setCustomDatetimeFunctions(array $functions) : void
     {
         foreach ($functions as $name => $className) {
             $this->addCustomDatetimeFunction($name, $className);

lib/Doctrine/ORM/Mapping/Driver/AnnotationDriver.php

@@ -5,6 +5,7 @@
 namespace Doctrine\ORM\Mapping\Driver;
 
 use Doctrine\Common\Annotations\AnnotationReader;
+use Doctrine\Common\Annotations\Reader;
 use Doctrine\DBAL\Types\Type;
 use Doctrine\ORM\Annotation;
 use Doctrine\ORM\Events;
@@ -68,10 +69,10 @@ class AnnotationDriver implements MappingDriver
      * Initializes a new AnnotationDriver that uses the given AnnotationReader for reading
      * docblock annotations.
      *
-     * @param AnnotationReader  $reader The AnnotationReader to use, duck-typed.
+     * @param Reader            $reader The AnnotationReader to use, duck-typed.
      * @param string|array|null $paths  One or multiple paths where mapping classes can be found.
      */
-    public function __construct($reader, $paths = null)
+    public function __construct(Reader $reader, $paths = null)
     {
         $this->reader = $reader;
         if ($paths) {