Merge branch '2.8' into 3.3

nicolas-grekas · nicolas-grekas · commit 93857b77269a · 2017-10-24T14:44:43.000+02:00
* 2.8:
  [2.8] Fix some docblocks
  Escape trailing \ in QuestionHelper autocompletion
  Add "doctrine/annotations" to top-level composer.json
  Remove inapplicable phpdoc comment
  nit: Fix phpdoc inconsistency and unreachable statement
diff --git a/Console/Descriptor/TextDescriptor.php b/Console/Descriptor/TextDescriptor.php
@@ -417,9 +417,6 @@ protected function describeCallable($callable, array $options = array())
         $this->writeText($this->formatCallable($callable), $options);
     }
 
-    /**
-     * @param array $array
-     */
     private function renderEventListenerTable(EventDispatcherInterface $eventDispatcher, $event, array $eventListeners, SymfonyStyle $io)
     {
         $tableHeaders = array('Order', 'Callable', 'Priority');

Original file line number	Diff line number	Diff line change
`@@ -417,9 +417,6 @@ protected function describeCallable($callable, array $options = array())`
`417`	`417`	`$this->writeText($this->formatCallable($callable), $options);`
`418`	`418`	`}`
`419`	`419`
`420`		`- /**`
`421`		`- * @param array $array`
`422`		`- */`
`423`	`420`	`private function renderEventListenerTable(EventDispatcherInterface $eventDispatcher, $event, array $eventListeners, SymfonyStyle $io)`
`424`	`421`	`{`
`425`	`422`	`$tableHeaders = array('Order', 'Callable', 'Priority');`