Merge branch '3.4'

* 3.4:
  [DI] Fix missing use + minor tweaks
  [Routing] Enhance PHP DSL traits docblocks
  Fix AclSchemaListener deprecation
  Set a NullLogger in ApcuAdapter when Apcu is disabled in CLI
  Minor reword
  [HttpKernel] Make array vs "::" controller definitions consistent
  Fix tests
  [TwigBundle] Remove profiler related scripting
  [TwigBundle][WebProfilerBundle] Switch to DOMContentLoaded event
  [WebProfilerBundle] Hide inactive tabs from CSS
  [TwigBundle] Make deprecations scream in logs
  [TwigBundle] Hide logs if unavailable, i.e. webprofiler
  [TwigBundle] Break long lines in exceptions
  [WebProfilerBundle] Added missing link to profile token
  [DI] Fix decorated service merge in ResolveInstanceofConditionalsPass
  Preserve URI fragment in HttpUtils::generateUri()
  [PhpUnitBridge] do not require an error context

Author: xabbuh

Loader/Configurator/Traits/AddTrait.php

@@ -28,7 +28,7 @@ trait AddTrait
      * Adds a route.
      *
      * @param string $name
-     * @param string $value
+     * @param string $path
      *
      * @return RouteConfigurator
      */

Loader/Configurator/Traits/RouteTrait.php

@@ -95,7 +95,7 @@ final public function host($pattern)
      * Sets the schemes (e.g. 'https') this route is restricted to.
      * So an empty array means that any scheme is allowed.
      *
-     * @param array $schemes
+     * @param string[] $schemes
      *
      * @return $this
      */
@@ -110,7 +110,7 @@ final public function schemes(array $schemes)
      * Sets the HTTP methods (e.g. 'POST') this route is restricted to.
      * So an empty array means that any method is allowed.
      *
-     * @param array $methods
+     * @param string[] $methods
      *
      * @return $this
      */
@@ -124,7 +124,7 @@ final public function methods(array $methods)
     /**
      * Adds the "_controller" entry to defaults.
      *
-     * @param callable $controller a callable or parseable pseudo-callable
+     * @param callable|string $controller a callable or parseable pseudo-callable
      *
      * @return $this
      */