minor #19343 PassConfig::getMergePass is not an array (aschempp)

fabpot · fabpot · commit d303b9dffe63 · 2016-07-14T11:24:46.000+02:00
This PR was squashed before being merged into the 2.7 branch (closes #19343). Discussion ---------- PassConfig::getMergePass is not an array | Q | A | ------------- | --- | Branch? | 2.7 | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - Just a minor glitch my IDE noticed :-) Commits ------- edbefac PassConfig::getMergePass is not an array
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/PassConfig.php b/src/Symfony/Component/DependencyInjection/Compiler/PassConfig.php
@@ -152,9 +152,9 @@ public function getRemovingPasses()
     }
 
     /**
-     * Gets all passes for the Merge pass.
+     * Gets the Merge pass.
      *
-     * @return array An array of passes
+     * @return CompilerPassInterface The merge pass
      */
     public function getMergePass()
     {

Original file line number	Diff line number	Diff line change
`@@ -152,9 +152,9 @@ public function getRemovingPasses()`
`152`	`152`	`}`
`153`	`153`
`154`	`154`	`/**`
`155`		`- * Gets all passes for the Merge pass.`
	`155`	`+ * Gets the Merge pass.`
`156`	`156`	`*`
`157`		`- * @return array An array of passes`
	`157`	`+ * @return CompilerPassInterface The merge pass`
`158`	`158`	`*/`
`159`	`159`	`public function getMergePass()`
`160`	`160`	`{`