Add rapsys_user translate, locales and languages config keys

[userbundle] / Entity / User.php

diff --git a/Entity/User.php b/Entity/User.php
index cca45c74c28998b4086c2190910e5666c5996025..8286e55dd59c7c7cad07b03744e768459c23ff29 100644 (file)
--- a/Entity/User.php
+++ b/Entity/User.php
@@ -319,9 +319,10 @@ class User implements UserInterface, \Serializable {
                                $array[$group->getId()] = $group->getRole();
                                return $array;
                        },
-                       //Init with ROLE_USER
-                       //XXX: we assume that ROLE_USER has id 1 in database
-                       [ 1 => 'ROLE_USER' ]
+                       //Init with empty array
+                       //XXX: on registration, add each group present in rapsys_user.default.group array to user
+                       //XXX: see vendor/rapsys/userbundle/Controller/DefaultController.php +450
+                       []
                ));
        }
 
@@ -329,17 +330,23 @@ class User implements UserInterface, \Serializable {
                //Retrieve roles
                $roles = $this->getRoles();
 
+               //With roles array empty
+               if ($roles === []) {
+                       //Return null
+                       return null;
+               }
+
                //Return the role with max id
                //XXX: should be rewriten if it change in your configuration
                return $roles[array_reduce(
                        array_keys($roles),
                        function($cur, $id) {
-                               if ($id > $cur) {
+                               if ($cur === null || $id > $cur) {
                                        return $id;
                                }
                                return $cur;
                        },
-                       0
+                       null
                )];
        }