Merge branch '2.8' into 3.1

fabpot · fabpot · commit 80717a8186d5 · 2016-10-05T18:44:51.000-07:00
* 2.8:
  [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/Definition.php b/Definition.php
@@ -664,7 +664,7 @@ public function isAutowired()
     /**
      * Sets autowired.
      *
-     * @param $autowired
+     * @param bool $autowired
      *
      * @return Definition The current instance
      */

Original file line number	Diff line number	Diff line change
`@@ -664,7 +664,7 @@ public function isAutowired()`
`664`	`664`	`/**`
`665`	`665`	`* Sets autowired.`
`666`	`666`	`*`
`667`		`- * @param $autowired`
	`667`	`+ * @param bool $autowired`
`668`	`668`	`*`
`669`	`669`	`* @return Definition The current instance`
`670`	`670`	`*/`