Merge branch '2.7' into 2.8

nicolas-grekas · nicolas-grekas · commit 14d30937c36c · 2015-10-06T19:12:59.000+02:00
Conflicts:
	src/Symfony/Component/Security/Http/Tests/RememberMe/PersistentTokenBasedRememberMeServicesTest.php
	src/Symfony/Component/Security/Http/Tests/RememberMe/TokenBasedRememberMeServicesTest.php
	src/Symfony/Component/Security/composer.json
diff --git a/Normalizer/AbstractNormalizer.php b/Normalizer/AbstractNormalizer.php
@@ -105,7 +105,7 @@ public function setCircularReferenceHandler($circularReferenceHandler)
     /**
      * Set normalization callbacks.
      *
-     * @param array $callbacks help normalize the result
+     * @param callable[] $callbacks help normalize the result
      *
      * @return self
      *

Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,7 @@ public function setCircularReferenceHandler($circularReferenceHandler)`
`105`	`105`	`/**`
`106`	`106`	`* Set normalization callbacks.`
`107`	`107`	`*`
`108`		`- * @param array $callbacks help normalize the result`
	`108`	`+ * @param callable[] $callbacks help normalize the result`
`109`	`109`	`*`
`110`	`110`	`* @return self`
`111`	`111`	`*`