Merge branch '6.10'

ezpublishlegacy · Jul 18, 2017 · e57d4d4 · e57d4d4
2 parents 963f50b + b1b8c39
commit e57d4d4
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/eZ/Publish/API/Repository/Tests/BaseTest.php b/eZ/Publish/API/Repository/Tests/BaseTest.php
@@ -269,9 +269,11 @@ private function assertPropertiesEqual($propertyName, $expectedValue, $actualVal
     /**
      * Create a user in editor user group.
      *
+     * @param string $login
+     *
      * @return \eZ\Publish\API\Repository\Values\User\User
      */
-    protected function createUserVersion1()
+    protected function createUserVersion1($login = 'user')
     {
         $repository = $this->getRepository();
 
@@ -283,8 +285,8 @@ protected function createUserVersion1()
 
         // Instantiate a create struct with mandatory properties
         $userCreate = $userService->newUserCreateStruct(
-            'user',
-            'user@example.com',
+            $login,
+            "{$login}@example.com",
             'secret',
             'eng-US'
         );

diff --git a/eZ/Publish/API/Repository/Tests/UserServiceTest.php b/eZ/Publish/API/Repository/Tests/UserServiceTest.php
@@ -1353,10 +1353,10 @@ public function testLoadUserByLogin()
         $userService = $repository->getUserService();
 
         /* BEGIN: Use Case */
-        $user = $this->createUserVersion1();
+        $user = $this->createUserVersion1('User');
 
         // Load the newly created user
-        $userReloaded = $userService->loadUserByLogin('user');
+        $userReloaded = $userService->loadUserByLogin('User');
         /* END: Use Case */
 
         $this->assertPropertiesCorrect(

diff --git a/eZ/Publish/Core/Persistence/Legacy/User/Gateway/DoctrineDatabase.php b/eZ/Publish/Core/Persistence/Legacy/User/Gateway/DoctrineDatabase.php
@@ -177,7 +177,7 @@ public function loadByLogin($login)
             )
         )->where(
             $query->expr->eq(
-                $this->handler->quoteColumn('login', 'ezuser'),
+                $query->expr->lower($this->handler->quoteColumn('login', 'ezuser')),
                 // Index is case in-sensitive, on some db's lowercase, so we lowercase $login
                 $query->bindValue(mb_strtolower($login, 'UTF-8'), null, \PDO::PARAM_STR)
             )