Merge branch '3.1'

fabpot · fabpot · commit 5ffc8af4619f · 2016-05-30T08:58:55.000+02:00
* 3.1:
  [Console] SymfonyStyle: Fix alignment/prefixing of multi-line comments
  [Routing] Finish annotation loader taking a class constant as a beginning of a class name
  [Routing] Fix the annotation loader taking a class constant as a beginning of a class name
diff --git a/Console/Descriptor/TextDescriptor.php b/Console/Descriptor/TextDescriptor.php
@@ -331,7 +331,7 @@ protected function describeContainerDefinition(Definition $definition, array $op
      */
     protected function describeContainerAlias(Alias $alias, array $options = array())
     {
-        $options['output']->comment(sprintf("This service is an alias for the service <info>%s</info>\n", (string) $alias));
+        $options['output']->comment(sprintf('This service is an alias for the service <info>%s</info>', (string) $alias));
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -331,7 +331,7 @@ protected function describeContainerDefinition(Definition $definition, array $op`
`331`	`331`	`*/`
`332`	`332`	`protected function describeContainerAlias(Alias $alias, array $options = array())`
`333`	`333`	`{`
`334`		`- $options['output']->comment(sprintf("This service is an alias for the service <info>%s</info>\n", (string) $alias));`
	`334`	`+ $options['output']->comment(sprintf('This service is an alias for the service <info>%s</info>', (string) $alias));`
`335`	`335`	`}`
`336`	`336`
`337`	`337`	`/**`