Merge branch '3.4' into 4.3

nicolas-grekas · nicolas-grekas · commit 45e5b5e2fe2a · 2019-08-14T14:26:46.000+02:00
* 3.4:
  Remove superfluous phpdoc tags
diff --git a/Definition/Builder/NodeDefinition.php b/Definition/Builder/NodeDefinition.php
@@ -352,8 +352,6 @@ abstract protected function createNode();
     /**
      * Set PathSeparator to use.
      *
-     * @param string $separator
-     *
      * @return $this
      */
     public function setPathSeparator(string $separator)
diff --git a/Tests/Definition/PrototypedArrayNodeTest.php b/Tests/Definition/PrototypedArrayNodeTest.php
@@ -262,7 +262,6 @@ protected function getPrototypeNodeWithDefaultChildren()
      *     ]
      * ]
      *
-     *
      * @dataProvider getDataForKeyRemovedLeftValueOnly
      */
     public function testMappedAttributeKeyIsRemovedLeftValueOnly($value, $children, $expected)

Original file line number	Diff line number	Diff line change
`@@ -352,8 +352,6 @@ abstract protected function createNode();`
`352`	`352`	`/**`
`353`	`353`	`* Set PathSeparator to use.`
`354`	`354`	`*`
`355`		`- * @param string $separator`
`356`		`- *`
`357`	`355`	`* @return $this`
`358`	`356`	`*/`
`359`	`357`	`public function setPathSeparator(string $separator)`
Original file line number	Diff line number	Diff line change
`@@ -262,7 +262,6 @@ protected function getPrototypeNodeWithDefaultChildren()`
`262`	`262`	`* ]`
`263`	`263`	`* ]`
`264`	`264`	`*`
`265`		`- *`
`266`	`265`	`* @dataProvider getDataForKeyRemovedLeftValueOnly`
`267`	`266`	`*/`
`268`	`267`	`public function testMappedAttributeKeyIsRemovedLeftValueOnly($value, $children, $expected)`