Fix registration

maniple · Mar 10, 2019 · 1e1e666 · 1e1e666
1 parent 64bb41f
commit 1e1e666
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 5 deletions.
diff --git a/controllers/RegistrationController/CreateAction.php b/controllers/RegistrationController/CreateAction.php
@@ -1,8 +1,23 @@
 <?php
 
-class ModUser_RegistrationController_CreateAction
-    extends Maniple_Controller_Action_StandaloneForm
+/**
+ * @property Zend_Controller_Request_Http $_request
+ * @method Zend_Session_Namespace getSessionNamespace()
+ */
+class ModUser_RegistrationController_CreateAction extends Maniple_Controller_Action_StandaloneForm
 {
+    /**
+     * @Inject('user.model.userMapper')
+     * @var ModUser_Model_UserMapperInterface
+     */
+    protected $_userRepository;
+
+    /**
+     * @Inject('Zefram_Db')
+     * @var Zefram_Db
+     */
+    protected $_db;
+
     protected function _prepare()
     {
         if ($this->getSecurityContext()->isAuthenticated()) {
@@ -27,7 +42,7 @@ protected function _prepare()
         if (!$formClass) {
             $formClass = ModUser_Form_Registration::className;
         }
-        $this->_form = new $formClass($this->getUserManager(), array('view' => $this->view));
+        $this->_form = new $formClass($this->_userRepository, array('view' => $this->view));
 
         $this->view->form_template = 'mod-user/forms/registration';
     }
@@ -47,7 +62,7 @@ protected function _process()
         // hash password
         $data['password'] = password_hash($data['password'], PASSWORD_BCRYPT);
 
-        $reg = $this->getTableManager()->getTable('ModUser_Model_DbTable_Registrations')->createRow(array(
+        $reg = $this->_db->getTable(ModUser_Model_DbTable_Registrations::className)->createRow(array(
             'reg_id'     => Zefram_Math_Rand::getString(64, Zefram_Math_Rand::BASE64URL),
             'created_at' => time(),
             'expires_at' => null, // TODO registration.lifetime setting

diff --git a/library/ModUser/Form/Registration.php b/library/ModUser/Form/Registration.php
@@ -4,7 +4,7 @@ class ModUser_Form_Registration extends Zefram_Form
 {
     const className = __CLASS__;
 
-    public function __construct(ModUser_Model_UserManagerInterface $userManager, array $options = array())
+    public function __construct(ModUser_Model_UserMapperInterface $userManager, array $options = array())
     {
         $elements = array(
             'first_name' => array(