Merge branch '3.4'

* 3.4:
  [3.4] Remove useless docblocks
  [3.3] More docblock fixes
  [2.7] More docblock fixes
  [TwigBridge] Fix BC break due required twig environment
  Random fixes
  Docblock fixes
  [DI] Fix cannot bind env var
  Fix some signatures in PHP-DSLs
  [HttpKernel] Enhance deprecation message
  bumped Symfony version to 3.4.0
  updated VERSION for 3.4.0-BETA3
  updated CHANGELOG for 3.4.0-BETA3
  [SecurityBundle] Fix the datacollector to properly support decision.object being null

Author: nicolas-grekas

Loader/Configurator/Traits/RouteTrait.php

@@ -24,8 +24,6 @@ trait RouteTrait
     /**
      * Adds defaults.
      *
-     * @param array $defaults
-     *
      * @return $this
      */
     final public function defaults(array $defaults)
@@ -38,8 +36,6 @@ final public function defaults(array $defaults)
     /**
      * Adds requirements.
      *
-     * @param array $requirements
-     *
      * @return $this
      */
     final public function requirements(array $requirements)
@@ -52,8 +48,6 @@ final public function requirements(array $requirements)
     /**
      * Adds options.
      *
-     * @param array $options
-     *
      * @return $this
      */
     final public function options(array $options)

RouteCompiler.php

@@ -231,9 +231,6 @@ private static function compilePattern(Route $route, $pattern, $isHost)
     /**
      * Determines the longest static prefix possible for a route.
      *
-     * @param Route $route
-     * @param array $tokens
-     *
      * @return string The leading static part of a route's path
      */
     private static function determineStaticPrefix(Route $route, array $tokens)

Tests/CompiledRouteTest.php

@@ -18,7 +18,7 @@ class CompiledRouteTest extends TestCase
 {
     public function testAccessors()
     {
-        $compiled = new CompiledRoute('prefix', 'regex', array('tokens'), array(), array(), array(), array(), array('variables'));
+        $compiled = new CompiledRoute('prefix', 'regex', array('tokens'), array(), null, array(), array(), array('variables'));
         $this->assertEquals('prefix', $compiled->getStaticPrefix(), '__construct() takes a static prefix as its second argument');
         $this->assertEquals('regex', $compiled->getRegex(), '__construct() takes a regexp as its third argument');
         $this->assertEquals(array('tokens'), $compiled->getTokens(), '__construct() takes an array of tokens as its fourth argument');