Merge branch '3.3' into 3.4

* 3.3:
  Update JsonBundleReader.php
  [HttpKernel] Clean test directory on tear down
  [Console] Remove useless http-kernel dev dep
  Fix testHtml method with regexp
  Fixed some param/return annotations in PHPDOC blocks.
  [Workflow] fixed InvalidDefinitionException message for StateMachineValidator

Author: nicolas-grekas

Container.php

@@ -441,7 +441,7 @@ protected function load($file)
     /**
      * Fetches a variable from the environment.
      *
-     * @param string The name of the environment variable
+     * @param string $name The name of the environment variable
      *
      * @return scalar The value to use for the provided environment variable name
      *

Definition.php

@@ -73,6 +73,8 @@ public function getChanges()
     /**
      * Sets the tracked changes for the Definition object.
      *
+     * @param array $changes An array of changes for this Definition
+     *
      * @return $this
      */
     public function setChanges(array $changes)
@@ -403,6 +405,8 @@ public function getMethodCalls()
      * Sets the definition templates to conditionally apply on the current definition, keyed by parent interface/class.
      *
      * @param $instanceof ChildDefinition[]
+     *
+     * @return $this
      */
     public function setInstanceofConditionals(array $instanceof)
     {