Merge branch '2.7' into 2.8

nicolas-grekas · nicolas-grekas · commit 1fcec4f17988 · 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/PluralizationRules.php b/PluralizationRules.php
@@ -189,8 +189,8 @@ public static function get($number, $locale)
     /**
      * Overrides the default plural rule for a given locale.
      *
-     * @param string $rule   A PHP callable
-     * @param string $locale The locale
+     * @param callable $rule   A PHP callable
+     * @param string   $locale The locale
      *
      * @throws \LogicException
      */

Original file line number	Diff line number	Diff line change
`@@ -189,8 +189,8 @@ public static function get($number, $locale)`
`189`	`189`	`/**`
`190`	`190`	`* Overrides the default plural rule for a given locale.`
`191`	`191`	`*`
`192`		`- * @param string $rule A PHP callable`
`193`		`- * @param string $locale The locale`
	`192`	`+ * @param callable $rule A PHP callable`
	`193`	`+ * @param string $locale The locale`
`194`	`194`	`*`
`195`	`195`	`* @throws \LogicException`
`196`	`196`	`*/`