Merge branch '2.8' into 3.0

fabpot · fabpot · commit 25e96bc25d99 · 2016-05-30T08:58:27.000+02:00
* 2.8:
  [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
@@ -322,7 +322,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
`@@ -322,7 +322,7 @@ protected function describeContainerDefinition(Definition $definition, array $op`
`322`	`322`	`*/`
`323`	`323`	`protected function describeContainerAlias(Alias $alias, array $options = array())`
`324`	`324`	`{`
`325`		`- $options['output']->comment(sprintf("This service is an alias for the service <info>%s</info>\n", (string) $alias));`
	`325`	`+ $options['output']->comment(sprintf('This service is an alias for the service <info>%s</info>', (string) $alias));`
`326`	`326`	`}`
`327`	`327`
`328`	`328`	`/**`