Merge branch '3.1'

nicolas-grekas · nicolas-grekas · commit 6df67e421ff5 · 2016-10-06T10:59:27.000+02:00
* 3.1:
  Minor fixes &amp; cleanups
  [DependencyInjection] Add missing PHPDoc type
  Correct a typo in the ReflectionExtractor's description
  [HttpFoundation] JSONP callback validation
  [Console] Improved the explanation of the hasOption() method
  Uniformize exception vars according to our CS
  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`	`{`