Merge branch '2.7' into 2.8

fabpot · fabpot · commit 6ccef190f128 · 2016-10-05T18:43:09.000-07:00
* 2.7:
  [HttpFoundation] JSONP callback validation
  [Console] Improved the explanation of the hasOption() method
  add missing use statement
  bug #18042 [Security] $attributes can be anything, but RoleVoter assumes strings
diff --git a/DependencyInjection/Compiler/AddConstraintValidatorsPass.php b/DependencyInjection/Compiler/AddConstraintValidatorsPass.php
@@ -13,6 +13,7 @@
 
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
+use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
 
 class AddConstraintValidatorsPass implements CompilerPassInterface
 {

Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@`
`13`	`13`
`14`	`14`	`use Symfony\Component\DependencyInjection\ContainerBuilder;`
`15`	`15`	`use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;`
	`16`	`+use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;`
`16`	`17`
`17`	`18`	`class AddConstraintValidatorsPass implements CompilerPassInterface`
`18`	`19`	`{`