Fix reference compatibility issues

src/Feature/SetupModel.php

@@ -87,7 +87,7 @@ public function setupUserModel()
         // all AccessRules for all user roles
         // @TODO in future when there can be multiple, then merge them together
         $this->hasMany('AccessRules', [
-            function ($m) {
+            'model' => function ($m) {
                 return $m->ref('role_id')->ref('AccessRules');
             },
             'our_field' => 'role_id',

src/Model/AccessRule.php

@@ -21,7 +21,7 @@ protected function init(): void
     {
         parent::init();
 
-        $this->hasOne('role_id', [Role::class, 'our_field' => 'role_id', 'their_field' => 'id', 'caption' => 'Role'])->withTitle();
+        $this->hasOne('role_id', ['model' => [Role::class], 'our_field' => 'role_id', 'their_field' => 'id', 'caption' => 'Role'])->withTitle();
 
         $this->addField('model'); // model class name
 

src/Model/Role.php

@@ -22,8 +22,8 @@ protected function init(): void
 
         $this->addField('name');
 
-        $this->hasMany('Users', [User::class, 'our_field' => 'id', 'their_field' => 'role_id']);
-        $this->hasMany('AccessRules', [AccessRule::class, 'our_field' => 'id', 'their_field' => 'role_id']);
+        $this->hasMany('Users', ['model' => [User::class], 'our_field' => 'id', 'their_field' => 'role_id']);
+        $this->hasMany('AccessRules', ['model' => [AccessRule::class], 'our_field' => 'id', 'their_field' => 'role_id']);
 
         // traits
         $this->setupRoleModel();

src/Model/User.php

@@ -36,7 +36,7 @@ protected function init(): void
         $this->addField('password', [Password::class]);
 
         // currently user can have only one role. In future it should be n:n relation
-        $this->hasOne('role_id', [Role::class, 'our_field' => 'role_id', 'their_field' => 'id', 'caption' => 'Role'])->withTitle();
+        $this->hasOne('role_id', ['model' => [Role::class], 'our_field' => 'role_id', 'their_field' => 'id', 'caption' => 'Role'])->withTitle();
 
         // traits
         $this->setupUserModel();

tests/Generic.php

@@ -31,16 +31,16 @@ protected function setupDefaultDb()
 
     protected function getUserModel()
     {
-        return new User($this->db, 'login_user');
+        return new User($this->db, ['table' => 'login_user']);
     }
 
     protected function getRoleModel()
     {
-        return new Role($this->db, 'login_role');
+        return new Role($this->db, ['table' => 'login_role']);
     }
 
     protected function getAccessRuleModel()
     {
-        return new AccessRule($this->db, 'login_access_rule');
+        return new AccessRule($this->db, ['table' => 'login_access_rule']);
     }
 }