Merge branch '3.4' into 4.0

nicolas-grekas · nicolas-grekas · commit e8833b64b139 · 2018-05-16T16:21:07.000+02:00
* 3.4:
  [PropertyInfo] fix resolving parent|self type hints
  fixed CS
diff --git a/RouteCollectionBuilder.php b/RouteCollectionBuilder.php
@@ -251,8 +251,6 @@ public function setMethods($methods)
     /**
      * Adds a resource for this collection.
      *
-     * @param ResourceInterface $resource
-     *
      * @return $this
      */
     private function addResource(ResourceInterface $resource): self

Original file line number	Diff line number	Diff line change
`@@ -251,8 +251,6 @@ public function setMethods($methods)`
`251`	`251`	`/**`
`252`	`252`	`* Adds a resource for this collection.`
`253`	`253`	`*`
`254`		`- * @param ResourceInterface $resource`
`255`		`- *`
`256`	`254`	`* @return $this`
`257`	`255`	`*/`
`258`	`256`	`private function addResource(ResourceInterface $resource): self`