Merge branch '2.4'

api-platform · Jun 15, 2019 · e18bffb · e18bffb
2 parents d9ed1b9 + b1815d6
commit e18bffb
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/behat.yml.dist b/behat.yml.dist
@@ -5,6 +5,7 @@ default:
         - 'CommandContext'
         - 'DoctrineContext':
             doctrine: '@doctrine'
+            passwordEncoder: '@security.password_encoder'
         - 'HttpHeaderContext'
         - 'GraphqlContext'
         - 'JsonContext'
@@ -42,6 +43,7 @@ postgres:
         - 'CommandContext'
         - 'DoctrineContext':
             doctrine: '@doctrine'
+            passwordEncoder: '@security.password_encoder'
         - 'HttpHeaderContext'
         - 'GraphqlContext'
         - 'JsonContext'
@@ -66,6 +68,7 @@ mongodb:
         - 'CommandContext'
         - 'DoctrineContext':
             doctrine: '@doctrine_mongodb'
+            passwordEncoder: '@security.password_encoder'
         - 'HttpHeaderContext'
         - 'GraphqlContext'
         - 'JsonContext'
@@ -108,6 +111,7 @@ default-coverage:
         - 'CommandContext'
         - 'DoctrineContext':
             doctrine: '@doctrine'
+            passwordEncoder: '@security.password_encoder'
         - 'HttpHeaderContext'
         - 'GraphqlContext'
         - 'JsonContext'
@@ -133,6 +137,7 @@ mongodb-coverage:
         - 'CommandContext'
         - 'DoctrineContext':
             doctrine: '@doctrine_mongodb'
+            passwordEncoder: '@security.password_encoder'
         - 'HttpHeaderContext'
         - 'GraphqlContext'
         - 'JsonContext'

diff --git a/features/bootstrap/DoctrineContext.php b/features/bootstrap/DoctrineContext.php
@@ -127,6 +127,7 @@
 use Doctrine\ODM\MongoDB\DocumentManager;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\Tools\SchemaTool;
+use Symfony\Component\Security\Core\Encoder\UserPasswordEncoderInterface;
 
 /**
  * Defines application features from the specific context.
@@ -138,6 +139,7 @@ final class DoctrineContext implements Context
      */
     private $manager;
     private $doctrine;
+    private $passwordEncoder;
     private $schemaTool;
     private $schemaManager;
     private $classes;
@@ -149,9 +151,10 @@ final class DoctrineContext implements Context
      * You can also pass arbitrary arguments to the
      * context constructor through behat.yml.
      */
-    public function __construct(ManagerRegistry $doctrine)
+    public function __construct(ManagerRegistry $doctrine, UserPasswordEncoderInterface $passwordEncoder)
     {
         $this->doctrine = $doctrine;
+        $this->passwordEncoder = $passwordEncoder;
         $this->manager = $doctrine->getManager();
         $this->schemaTool = $this->manager instanceof EntityManagerInterface ? new SchemaTool($this->manager) : null;
         $this->schemaManager = $this->manager instanceof DocumentManager ? $this->manager->getSchemaManager() : null;
@@ -1066,8 +1069,7 @@ public function thereAreNodesInAContainer(int $nb, string $uuid)
     public function thePasswordForUserShouldBeHashed(string $password, string $user)
     {
         $user = $this->doctrine->getRepository($this->isOrm() ? User::class : UserDocument::class)->find($user);
-
-        if (!password_verify($password, $user->getPassword())) {
+        if (!$this->passwordEncoder->isPasswordValid($user, $password)) {
             throw new \Exception('User password mismatch');
         }
     }