Merge branch '2.7' into 2.8

nicolas-grekas · nicolas-grekas · commit 677d9aa8be72 · 2018-03-19T22:13:58.000+01:00
* 2.7:
  [Console] Fix docblock of DescriptorInterface::describe
diff --git a/src/Symfony/Component/Console/Descriptor/DescriptorInterface.php b/src/Symfony/Component/Console/Descriptor/DescriptorInterface.php
@@ -21,7 +21,7 @@
 interface DescriptorInterface
 {
     /**
-     * Describes an InputArgument instance.
+     * Describes an object if supported.
      *
      * @param OutputInterface $output
      * @param object          $object

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@`
`21`	`21`	`interface DescriptorInterface`
`22`	`22`	`{`
`23`	`23`	`/**`
`24`		`- * Describes an InputArgument instance.`
	`24`	`+ * Describes an object if supported.`
`25`	`25`	`*`
`26`	`26`	`* @param OutputInterface $output`
`27`	`27`	`* @param object $object`