Merge branch '4.4' into 5.1

javiereguiluz · javiereguiluz · commit f11e51169b2c · 2020-10-23T15:20:39.000+02:00
* 4.4:
  [Security] Remove extra argument from call to EntityManager#flush()
diff --git a/security/password_migration.rst b/security/password_migration.rst
@@ -188,7 +188,7 @@ storing the newly created password hash::
             $user->setPassword($newEncodedPassword);
 
             // execute the queries on the database
-            $this->getEntityManager()->flush($user);
+            $this->getEntityManager()->flush();
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -188,7 +188,7 @@ storing the newly created password hash::`
`188`	`188`	`$user->setPassword($newEncodedPassword);`
`189`	`189`
`190`	`190`	`// execute the queries on the database`
`191`		`- $this->getEntityManager()->flush($user);`
	`191`	`+ $this->getEntityManager()->flush();`
`192`	`192`	`}`
`193`	`193`	`}`
`194`	`194`