Merge branch '2.7' into 2.8

nicolas-grekas · nicolas-grekas · commit 57a2a3c93341 · 2017-10-24T15:48:52.000+02:00
* 2.7:
  [DI] minor docblock fixes
diff --git a/Compiler.php b/Compiler.php
@@ -51,8 +51,6 @@ public function reset()
     /**
      * Compiles a node.
      *
-     * @param Node\Node $node The node to compile
-     *
      * @return $this
      */
     public function compile(Node\Node $node)
diff --git a/Node/ArrayNode.php b/Node/ArrayNode.php
@@ -38,8 +38,6 @@ public function addElement(Node $value, Node $key = null)
 
     /**
      * Compiles the node to PHP.
-     *
-     * @param Compiler $compiler A Compiler instance
      */
     public function compile(Compiler $compiler)
     {
diff --git a/ParserCache/ArrayParserCache.php b/ParserCache/ArrayParserCache.php
@@ -18,9 +18,6 @@
  */
 class ArrayParserCache implements ParserCacheInterface
 {
-    /**
-     * @var array
-     */
     private $cache = array();
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -51,8 +51,6 @@ public function reset()`
`51`	`51`	`/**`
`52`	`52`	`* Compiles a node.`
`53`	`53`	`*`
`54`		`- * @param Node\Node $node The node to compile`
`55`		`- *`
`56`	`54`	`* @return $this`
`57`	`55`	`*/`
`58`	`56`	`public function compile(Node\Node $node)`
Original file line number	Diff line number	Diff line change
`@@ -38,8 +38,6 @@ public function addElement(Node $value, Node $key = null)`
`38`	`38`
`39`	`39`	`/**`
`40`	`40`	`* Compiles the node to PHP.`
`41`		`- *`
`42`		`- * @param Compiler $compiler A Compiler instance`
`43`	`41`	`*/`
`44`	`42`	`public function compile(Compiler $compiler)`
`45`	`43`	`{`
Original file line number	Diff line number	Diff line change
`@@ -18,9 +18,6 @@`
`18`	`18`	`*/`
`19`	`19`	`class ArrayParserCache implements ParserCacheInterface`
`20`	`20`	`{`
`21`		`- /**`
`22`		`- * @var array`
`23`		`- */`
`24`	`21`	`private $cache = array();`
`25`	`22`
`26`	`23`	`/**`