Backward compatibility for UserPasswordValidator

src/Silex/Provider/SecurityServiceProvider.php

@@ -33,6 +33,7 @@ use Symfony\Component\Security\Core\Authorization\Voter\AuthenticatedVoter;
 use Symfony\Component\Security\Core\Authorization\AccessDecisionManager;
 use Symfony\Component\Security\Core\Role\RoleHierarchy;
 use Symfony\Component\Security\Core\Validator\Constraints\UserPasswordValidator;
+use Symfony\Component\Security\Core\Validator\Constraint\UserPasswordValidator as DeprecatedUserPasswordValidator;
 use Symfony\Component\Security\Http\Firewall;
 use Symfony\Component\Security\Http\FirewallMap;
 use Symfony\Component\Security\Http\Firewall\AccessListener;
@@ -508,7 +509,13 @@ class SecurityServiceProvider implements ServiceProviderInterface
 
         if (isset($app['validator'])) {
             $app['security.validator.user_password_validator'] = $app->share(function ($app) {
-                return new UserPasswordValidator($app['security'], $app['security.encoder_factory']);
+                // FIXME: in Symfony 2.2 Symfony\Component\Security\Core\Validator\Constraint
+                // is replaced by Symfony\Component\Security\Core\Validator\Constraints
+                if (class_exists('Symfony\Component\Security\Core\Validator\Constraints\UserPasswordValidator')) {
+                    return new UserPasswordValidator($app['security'], $app['security.encoder_factory']);
+                }
+
+                return new DeprecatedUserPasswordValidator($app['security'], $app['security.encoder_factory']);
             });
 
             if (isset($app['validator.validator_service_ids'])) {

tests/Silex/Tests/Provider/SecurityServiceProviderTest.php

@@ -149,7 +149,13 @@ class SecurityServiceProviderTest extends WebTestCase
 
         $app->boot();
 
-        $this->assertInstanceOf('Symfony\Component\Security\Core\Validator\Constraints\UserPasswordValidator', $app['security.validator.user_password_validator']);
+        // FIXME: in Symfony 2.2 Symfony\Component\Security\Core\Validator\Constraint
+        // is replaced by Symfony\Component\Security\Core\Validator\Constraints
+        if (class_exists('Symfony\Component\Security\Core\Validator\Constraints\UserPasswordValidator')) {
+            $this->assertInstanceOf('Symfony\Component\Security\Core\Validator\Constraints\UserPasswordValidator', $app['security.validator.user_password_validator']);
+        } else {
+            $this->assertInstanceOf('Symfony\Component\Security\Core\Validator\Constraint\UserPasswordValidator', $app['security.validator.user_password_validator']);
+        }
     }
 
     public function createApplication($authenticationMethod = 'form')