Merge branch '1.5'

Author: Guite

src/system/UsersModule/Entity/Repository/UserRepository.php

@@ -41,10 +41,16 @@ public function persistAndFlush(UserEntity $user)
 
     public function removeAndFlush(UserEntity $user)
     {
-        foreach ($user->getAttributes() as $attribute) {
-            // this should be unnecessary because cascade = all but MySQL 5.7 not working with that
-            $this->_em->remove($attribute);
-        }
+        // the following process should be unnecessary because cascade = all but MySQL 5.7 not working with that (#3726)
+        $qb = $this->_em->createQueryBuilder();
+        $qb->delete('Zikula\UsersModule\Entity\UserAttributeEntity', 'a')
+           ->where('a.user = :userId')
+           ->setParameter('userId', $user->getUid());
+        $query = $qb->getQuery();
+        $query->execute();
+        // end of theoretically unrequired process
+
+        $user->setAttributes(new ArrayCollection());
         $this->_em->remove($user);
         $this->_em->flush($user);
     }

src/system/UsersModule/Entity/UserEntity.php

@@ -431,9 +431,9 @@ public function getAttributeValue($name)
     /**
      * set the attributes for the user
      *
-     * @param UserAttributeEntity $attributes the attributes for the user
+     * @param ArrayCollection $attributes the attributes for the user
      */
-    public function setAttributes($attributes)
+    public function setAttributes(ArrayCollection $attributes)
     {
         $this->attributes = $attributes;
     }
@@ -482,6 +482,11 @@ public function getGroups()
         return $this->groups;
     }
 
+    /**
+     * set the groups for the user
+     *
+     * @param ArrayCollection $groups the groups for the user
+     */
     public function setGroups(ArrayCollection $groups)
     {
         $this->groups = $groups;