Merge branch '2.4'

fabpot · fabpot · commit 5c794ae9060c · 2014-04-18T23:02:40.000+02:00
* 2.4:
  Little correction for case 'ar'
  No need to use mb functions here
  Fix doc-blocks
  Fix doc blocks
  [HttpFoundation] update phpdoc of SessionHandlerInterface and unify parameters of all handlers according to interface
  [Doctrine Bridge] fix DbalSessionHandler for high concurrency, interface compliance, compatibility with all drivers (oci8, mysqli, pdo with mysql, sqlsrv, sqlite)
  [Finder] Marked test skipped when ftp stream wrapper is not available

Conflicts:
	src/Symfony/Component/Security/Core/Authorization/Voter/ExpressionVoter.php
diff --git a/Authorization/Voter/ExpressionVoter.php b/Authorization/Voter/ExpressionVoter.php
@@ -34,7 +34,7 @@ class ExpressionVoter implements VoterInterface
      *
      * @param ExpressionLanguage                   $expressionLanguage
      * @param AuthenticationTrustResolverInterface $trustResolver
-     * @param RoleHierarchyInterface               $roleHierarchy
+     * @param RoleHierarchyInterface|null          $roleHierarchy
      */
     public function __construct(ExpressionLanguage $expressionLanguage, AuthenticationTrustResolverInterface $trustResolver, RoleHierarchyInterface $roleHierarchy = null)
     {

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ class ExpressionVoter implements VoterInterface`
`34`	`34`	`*`
`35`	`35`	`* @param ExpressionLanguage $expressionLanguage`
`36`	`36`	`* @param AuthenticationTrustResolverInterface $trustResolver`
`37`		`- * @param RoleHierarchyInterface $roleHierarchy`
	`37`	`+ * @param RoleHierarchyInterface\|null $roleHierarchy`
`38`	`38`	`*/`
`39`	`39`	`public function __construct(ExpressionLanguage $expressionLanguage, AuthenticationTrustResolverInterface $trustResolver, RoleHierarchyInterface $roleHierarchy = null)`
`40`	`40`	`{`