bb-drummer / my-application

module/Admin/src/Admin/Controller/IndexController.php

Doc Comments +1 added lines, -1 removed lines

@@ -22,7 +22,7 @@
 {
     /**
      * redirect to acl section
-     * @return mixed|\Zend\Http\Response|\Zend\View\Model\ViewModel
+     * @return \Zend\Http\Response
      */
 	public function indexAction()
     {

module/Admin/src/Admin/Controller/UsersController.php

Doc Comments +2 added lines, -2 removed lines

@@ -253,7 +253,7 @@ 
 
     /**
      * confirm user registration
-     * @return mixed|\Zend\Http\Response|\Zend\View\Model\ViewModel
+     * @return \Zend\Http\Response
      */
     public function confirmAction()
     {
@@ -312,7 +312,7 @@ 
 
     /**
      * active user registration
-     * @return mixed|\Zend\Http\Response|\Zend\View\Model\ViewModel
+     * @return \Zend\Http\Response
      */
     public function activateAction()
     {

Spacing +18 added lines, -18 removed lines

@@ -78,11 +78,11 @@ 
     {
         $tmplVars = $this->getTemplateVars();
         $aUserlist = $this->getUserTable()->fetchAll();
-        if ( $this->isXHR() ) {
+        if ($this->isXHR()) {
             $datatablesData = array('data' => $aUserlist->toArray());
             $oController = $this;
             $datatablesData['data'] = array_map(
-                function ($row) use ($oController) {
+                function($row) use ($oController) {
                     $actions = '<div class="button-group tiny btn-group btn-group-xs">'.
                     '<a class="button btn btn-default tiny btn-xs btn-clean btn-cta-xhr cta-xhr-modal" href="'.$oController->url()->fromRoute(
                         'admin/default',
@@ -139,7 +139,7 @@ 
                 $user->exchangeArray($form->getData());
                 $this->getUserTable()->saveUser($user);
                 $this->flashMessenger()->addSuccessMessage($this->translate("user has been saved"));
-                if ( $this->isXHR() ) {
+                if ($this->isXHR()) {
                     $tmplVars["showForm"] = false;
                 } else {
                     return $this->redirect()->toRoute('admin/default', array('controller' => 'users'));
@@ -175,7 +175,7 @@ 
             return $this->redirect()->toRoute('admin/default', array('controller' => 'users'));
         }
 
-        $form    = new UserForm();
+        $form = new UserForm();
         $form->bind($user);
 
         $roles = $this->getAclroleTable()->fetchAll()->toArray();
@@ -192,7 +192,7 @@ 
             if ($form->isValid()) {
                 $this->getUserTable()->saveUser($user);
                 $this->flashMessenger()->addSuccessMessage($this->translate("user has been saved"));
-                if ( $this->isXHR() ) {
+                if ($this->isXHR()) {
                     $tmplVars["showForm"] = false;
                 } else {
                     return $this->redirect()->toRoute('admin/default', array('controller' => 'users'));
@@ -240,7 +240,7 @@ 
                 $id = (int) $request->getPost('id');
                 $this->getUserTable()->deleteUser($id);
                 $this->flashMessenger()->addSuccessMessage($this->translate("user has been deleted"));
-                if ( $this->isXHR() ) {
+                if ($this->isXHR()) {
                     $tmplVars["showForm"] = false;
                 } else {
                     return $this->redirect()->toRoute('admin/default', array('controller' => 'users'));
@@ -265,23 +265,23 @@ 
         $config = $this->getServiceLocator()->get('Config');
         $users = $this->getServiceLocator()->get('zfcuser_user_mapper');
         
-        $user_id    = $this->params()->fromRoute('user_id', '');
-        $token        = $this->params()->fromRoute('confirmtoken', '');
+        $user_id = $this->params()->fromRoute('user_id', '');
+        $token = $this->params()->fromRoute('confirmtoken', '');
         if (empty($user_id) || empty($token)) {
             $this->flashMessenger()->addWarningMessage($this->translate("missing parameters"));
             return $this->redirect()->toRoute($config["zfcuser_registration_redirect_route"], array());
         }
         
-        if (is_numeric($user_id) ) {
+        if (is_numeric($user_id)) {
             $oUser = $users->findById($user_id);
         } else {
             $oUser = $users->findByUsername($user_id);
         }
-        if (!$oUser ) {
+        if (!$oUser) {
             $this->flashMessenger()->addWarningMessage($this->translate("user could not be found"));
             return $this->redirect()->toRoute($config["zfcuser_registration_redirect_route"], array());
         }
-        if (($oUser->getState() != 0) || ($oUser->getToken() != $token) ) {
+        if (($oUser->getState() != 0) || ($oUser->getToken() != $token)) {
             $this->flashMessenger()->addWarningMessage($this->translate("confirmation token is invalid"));
             return $this->redirect()->toRoute($config["zfcuser_registration_redirect_route"], array());
         }
@@ -321,26 +321,26 @@ 
             $this->params()->fromPost(),
             array()
         );
-        $config    = $this->getServiceLocator()->get('Config');
-        $users    = $this->getServiceLocator()->get('zfcuser_user_mapper');
+        $config = $this->getServiceLocator()->get('Config');
+        $users = $this->getServiceLocator()->get('zfcuser_user_mapper');
         
-        $user_id    = $this->params()->fromRoute('user_id', '');
-        $token        = $this->params()->fromRoute('activatetoken', '');
+        $user_id = $this->params()->fromRoute('user_id', '');
+        $token = $this->params()->fromRoute('activatetoken', '');
         if (empty($user_id) || empty($token)) {
             $this->flashMessenger()->addWarningMessage($this->translate("missing parameters"));
             return $this->redirect()->toRoute($config["zfcuser_registration_redirect_route"], array());
         }
 
-        if (is_numeric($user_id) ) {
+        if (is_numeric($user_id)) {
             $oUser = $users->findById($user_id);
         } else {
             $oUser = $users->findByUsername($user_id);
         }
-        if (!$oUser ) {
+        if (!$oUser) {
             $this->flashMessenger()->addWarningMessage($this->translate("user could not be found"));
             return $this->redirect()->toRoute($config["zfcuser_registration_redirect_route"], array());
         }
-        if (($oUser->getState() != 0) || ($oUser->getToken() != $token) ) {
+        if (($oUser->getState() != 0) || ($oUser->getToken() != $token)) {
             $this->flashMessenger()->addWarningMessage($this->translate("activation token is invalid"));
             return $this->redirect()->toRoute($config["zfcuser_registration_redirect_route"], array());
         }

module/Admin/src/Admin/Controller/ZfcuserController.php

Doc Comments +1 added lines, -24 removed lines

@@ -63,29 +63,6 @@ 
     protected $userTable;
     
     /**
-     * @param callable $redirectCallback
-     * @param callable $redirectCallback
-     * /
-    //public function __construct(ServiceLocatorInterface $serviceLocator, $redirectCallback)
-    public function __construct($userService, $options, $registerForm, $loginForm)
-    {
-        $this->userService = $userService;
-        $this->options = $options;
-        $this->registerForm = $registerForm;
-        $this->loginForm = $loginForm;
-        
-        /*if ( $serviceLocator ) {
-    		$this->setServiceLocator($serviceLocator);
-    	}
-    	if (!is_callable($redirectCallback)) {
-            throw new \InvalidArgumentException('You must supply a callable redirectCallback');
-        }
-        $this->redirectCallback = $redirectCallback; * /
-        
-    }
-
-    /**
-     * set current action titles
      * @return self
      */
     public function defineActionTitles() 
@@ -577,7 +554,7 @@ 
 
     /**
      * view user's basic data
-     * @return mixed|\Zend\Http\Response|\Zend\View\Model\ViewModel
+     * @return \Zend\Http\Response
      */
     public function userdataAction()
     {

Spacing +30 added lines, -30 removed lines

@@ -377,8 +377,8 @@ 
         $request    = $this->getRequest();
         //$service    = $this->getUserService();
         $service    = \Application\Module::getService('zfcuser_user_service');
-        $form        = new RequestPasswordResetForm(null, $options);
-        $translator    = $this->getTranslator();
+        $form = new RequestPasswordResetForm(null, $options);
+        $translator = $this->getTranslator();
         
         // if password reset is disabled
         if (!$config['zfcuser']['enable_passwordreset']) {
@@ -391,7 +391,7 @@ 
             $redirect = false;
         }
 
-        $redirectUrl = $this->url()->fromRoute('userrequestpasswordreset') . ($redirect ? '?redirect=' . rawurlencode($redirect) : '');
+        $redirectUrl = $this->url()->fromRoute('userrequestpasswordreset').($redirect ? '?redirect='.rawurlencode($redirect) : '');
         
         if (!$request->isPost()) {
             return array(
@@ -439,7 +439,7 @@ 
             sprintf($translator->translate("password reset email has been sent to user '%s'"), $identity)
         );
         
-        return $this->redirect()->toUrl($this->url()->fromRoute($config["zfcuser_registration_redirect_route"]) . ($redirect ? '?redirect='. rawurlencode($redirect) : ''));
+        return $this->redirect()->toUrl($this->url()->fromRoute($config["zfcuser_registration_redirect_route"]).($redirect ? '?redirect='.rawurlencode($redirect) : ''));
             
     }
 
@@ -465,8 +465,8 @@ 
         $request    = $this->getRequest();
         //$service    = $this->getUserService();
         $service    = \Application\Module::getService('zfcuser_user_service');
-        $form        = new ResetPasswordForm(null, $options);
-        $translator    = $this->getTranslator();
+        $form = new ResetPasswordForm(null, $options);
+        $translator = $this->getTranslator();
         
         // if password reset is disabled
         if (!$config['zfcuser']['enable_passwordreset']) {
@@ -479,9 +479,9 @@ 
             $redirect = false;
         }
 
-        $redirectUrl = $this->url()->fromRoute(static::ROUTE_LOGIN) . ($redirect ? '?redirect=' . rawurlencode($redirect) : '');
+        $redirectUrl = $this->url()->fromRoute(static::ROUTE_LOGIN).($redirect ? '?redirect='.rawurlencode($redirect) : '');
         
-        if (!$request->isPost() ) {
+        if (!$request->isPost()) {
             
             $user = false;
             $userId = (int) $this->params()->fromRoute('user_id');
@@ -490,14 +490,14 @@ 
             $userTable = \Application\Module::getService('zfcuser_user_mapper');
             $user = $userTable->findById($userId);
             
-            if (!$user ) {
+            if (!$user) {
                 $this->flashMessenger()->addWarningMessage(
                     sprintf($translator->translate("invalid request"), '')
                 );
                 return $this->redirect()->toUrl($redirectUrl);
             }
             
-            if (empty($resetToken) || ($resetToken != $user->getToken()) ) {
+            if (empty($resetToken) || ($resetToken != $user->getToken())) {
                 $this->flashMessenger()->addWarningMessage(
                     sprintf($translator->translate("invalid request"), '')
                 );
@@ -526,23 +526,23 @@ 
         $userTable = \Application\Module::getService('zfcuser_user_mapper');
         $user = $userTable->findByEmail($userId);
             
-        if (!$user ) {
+        if (!$user) {
             $this->flashMessenger()->addWarningMessage(
                 sprintf($translator->translate("invalid request"), $userId)
             );
             return $this->redirect()->toUrl($redirectUrl);
         }
         
-        if (empty($resetToken) || ($resetToken != $user->getToken()) ) {
+        if (empty($resetToken) || ($resetToken != $user->getToken())) {
             $this->flashMessenger()->addWarningMessage(
                 sprintf($translator->translate("invalid request"), $resetToken)
             );
             return $this->redirect()->toUrl($redirectUrl);
         }
         
-        $form->setData((array)$this->params()->fromPost());
+        $form->setData((array) $this->params()->fromPost());
         
-        if (!$form->isValid() ) {
+        if (!$form->isValid()) {
             
             return array(
             'user' => $user,
@@ -568,7 +568,7 @@ 
             );
             return $this->redirect()->toUrl(
                 $this->url()->fromRoute($config["zfcuser_registration_redirect_route"]) 
-                . ($redirect ? '?redirect='. rawurlencode($redirect) : '')
+                . ($redirect ? '?redirect='.rawurlencode($redirect) : '')
             );
             
         }
@@ -603,11 +603,11 @@ 
             return $this->redirect()->toRoute($this->getOptions()->getLoginRedirectRoute());
         }
         
-        $form        = new UserDataForm();
-        $translator    = $this->getTranslator();
+        $form = new UserDataForm();
+        $translator = $this->getTranslator();
         
         /** @var \Admin\Entity\User $oIdentity */
-        $oIdentity        = $this->zfcUserAuthentication()->getIdentity();
+        $oIdentity = $this->zfcUserAuthentication()->getIdentity();
         /** @var \Admin\Model\UserData $oUser */
         $oUser         = new \Admin\Model\UserData();
         
@@ -616,7 +616,7 @@ 
 
         $form->bind($oUser);
     
-        if (!$this->getRequest()->isPost() ) {
+        if (!$this->getRequest()->isPost()) {
             
             return new ViewModel(
                 array(
@@ -629,10 +629,10 @@ 
             
         }
         
-        $data = (array)$this->params()->fromPost();
+        $data = (array) $this->params()->fromPost();
         $form->setData($data);
         
-        if (!$form->isValid() ) {
+        if (!$form->isValid()) {
             
             $this->flashMessenger()->addWarningMessage(
                 $translator->translate("user data could not be changed")
@@ -658,7 +658,7 @@ 
                 $translator->translate("user data has been changed")
             );
 
-            if ($this->getRequest()->isXmlHttpRequest() ) {
+            if ($this->getRequest()->isXmlHttpRequest()) {
                 return new ViewModel(
                     array(
                     'showForm'      => false,
@@ -688,19 +688,19 @@ 
             return $this->redirect()->toRoute($this->getOptions()->getLoginRedirectRoute());
         }
         
-        $form        = new UserProfileForm();
-        $translator    = $this->getTranslator();
+        $form = new UserProfileForm();
+        $translator = $this->getTranslator();
         /**
          * @var \Zend\Http\PhpEnvironment\Request|\Zend\Http\Request $request
          */
         $request    = $this->getRequest();
-        $user        = $this->zfcUserAuthentication()->getIdentity();
-        $userId        = (int) $user->getId();
+        $user = $this->zfcUserAuthentication()->getIdentity();
+        $userId = (int) $user->getId();
         $profile    = new UserProfile;
         $profile->load($userId);
         $form->bind($profile);
         
-        if (!$this->getRequest()->isPost() ) {
+        if (!$this->getRequest()->isPost()) {
             
             return array(
                 'showForm'        => true,
@@ -711,10 +711,10 @@ 
             
         }
         
-        $data = (array)$this->params()->fromPost();
+        $data = (array) $this->params()->fromPost();
         $form->setData($data);
         
-        if (!$form->isValid() ) {
+        if (!$form->isValid()) {
             
             $this->flashMessenger()->addWarningMessage(
                 $translator->translate("user profile data could not be changed")
@@ -735,7 +735,7 @@ 
                 $translator->translate("user profile data has been changed")
             );
             
-            if ($request->isXmlHttpRequest() ) {
+            if ($request->isXmlHttpRequest()) {
                 $response = array(
                     'showForm'          => false,
                     'user'                => $user,

module/Admin/src/Admin/Entity/User.php

Doc Comments +2 added lines, -3 removed lines

@@ -80,7 +80,6 @@ 
     /**
      * Set token string.
      *
-     * @param  STRING $aclrole
      * @return \Admin\Entity\User
      */
     public function setToken($token)
@@ -92,7 +91,7 @@ 
     /**
      * Get user-id string.
      *
-     * @return STRING
+     * @return integer
      */
     public function getUserId()
     {
@@ -105,7 +104,7 @@ 
     /**
      * Set user-id string.
      *
-     * @param  STRING $aclrole
+     * @param integer $user_id
      * @return \Admin\Entity\User
      */
     public function setUserId($user_id)

Spacing +9 added lines, -9 removed lines

@@ -54,30 +54,30 @@
      */
     public function exchangeArray($data = array(), $forceEncryptPassword = false)
     {
-        if (isset($data['id']) && !empty($data["id"]) ) {
+        if (isset($data['id']) && !empty($data["id"])) {
             $this->id            = ($data['id']);
             $this->user_id        = ($data['id']);
-        } elseif (isset($data['user_id']) && !empty($data["user_id"]) ) {
+        } elseif (isset($data['user_id']) && !empty($data["user_id"])) {
             $this->id            = ($data['user_id']);
             $this->user_id        = ($data['user_id']);
         }
-        $this->username        = (isset($data['username'])) ? $data['username'] : $this->username;
-        $this->email        = (isset($data['email'])) ? $data['email'] : $this->email;
-        if (isset($data['displayName']) ) {
+        $this->username = (isset($data['username'])) ? $data['username'] : $this->username;
+        $this->email = (isset($data['email'])) ? $data['email'] : $this->email;
+        if (isset($data['displayName'])) {
             $this->display_name    = $data['displayName'];
             $this->displayName    = $data['displayName'];
-        } elseif (isset($data['display_name']) ) {
+        } elseif (isset($data['display_name'])) {
             $this->display_name    = $data['display_name'];
             $this->displayName    = $data['display_name'];
         }
-        if (isset($data["password"]) && $forceEncryptPassword ) {
+        if (isset($data["password"]) && $forceEncryptPassword) {
             $bcrypt = new Bcrypt;
             $bcrypt->setCost(null); // @TODO $this->getUserService()->getOptions()->getPasswordCost());
             $data["password"] = $bcrypt->create($data['password']);
         }
-        $this->password        = (isset($data['password'])) ? $data['password'] : $this->password;
+        $this->password = (isset($data['password'])) ? $data['password'] : $this->password;
         $this->state        = (isset($data['state'])) ? $data['state'] : $this->state;
-        $this->aclrole        = (isset($data['aclrole'])) ? $data['aclrole'] : $this->aclrole;
+        $this->aclrole = (isset($data['aclrole'])) ? $data['aclrole'] : $this->aclrole;
         $this->token        = (isset($data['token'])) ? $data['token'] : $this->token;
         
         return $this;

module/Admin/src/Admin/Factory/AclControllerFactory.php

Doc Comments +1 added lines, -1 removed lines

@@ -26,7 +26,7 @@
      *
      * @param ServiceLocatorInterface $serviceLocator
      *
-     * @return mixed
+     * @return AclController
      */
     public function createService(ServiceLocatorInterface $serviceLocator)
     {

module/Admin/src/Admin/Factory/AclresourceTableFactory.php

Doc Comments +1 added lines, -1 removed lines

@@ -35,7 +35,7 @@
      *
      * @param ServiceLocatorInterface $serviceLocator
      *
-     * @return Admin\Model\AclresourceTable
+     * @return AclresourceTable
      */
     public function createService(ServiceLocatorInterface $serviceLocator)
     {

Spacing +4 added lines, -4 removed lines

@@ -39,11 +39,11 @@
      */
     public function createService(ServiceLocatorInterface $serviceLocator)
     {
-        $dbAdapter            = $serviceLocator->get('Zend\Db\Adapter\Adapter');
-        $resultSetPrototype    = new ResultSet();
+        $dbAdapter = $serviceLocator->get('Zend\Db\Adapter\Adapter');
+        $resultSetPrototype = new ResultSet();
         $resultSetPrototype->setArrayObjectPrototype(new Aclresource());
-        $tableGateway        = new TableGateway('aclresource', $dbAdapter, null, $resultSetPrototype);
-        $table                = new AclresourceTable($tableGateway);
+        $tableGateway = new TableGateway('aclresource', $dbAdapter, null, $resultSetPrototype);
+        $table = new AclresourceTable($tableGateway);
         return $table;
     }
 }
\ No newline at end of file

module/Admin/src/Admin/Factory/AclroleTableFactory.php

Doc Comments +1 added lines, -1 removed lines

@@ -35,7 +35,7 @@
      *
      * @param ServiceLocatorInterface $serviceLocator
      *
-     * @return Admin\Model\AclroleTable
+     * @return AclroleTable
      */
     public function createService(ServiceLocatorInterface $serviceLocator)
     {

Spacing +4 added lines, -4 removed lines

@@ -39,11 +39,11 @@
      */
     public function createService(ServiceLocatorInterface $serviceLocator)
     {
-        $dbAdapter            = $serviceLocator->get('Zend\Db\Adapter\Adapter');
-        $resultSetPrototype    = new ResultSet();
+        $dbAdapter = $serviceLocator->get('Zend\Db\Adapter\Adapter');
+        $resultSetPrototype = new ResultSet();
         $resultSetPrototype->setArrayObjectPrototype(new Aclrole());
-        $tableGateway        = new TableGateway('aclrole', $dbAdapter, null, $resultSetPrototype);
-        $table                = new AclroleTable($tableGateway);
+        $tableGateway = new TableGateway('aclrole', $dbAdapter, null, $resultSetPrototype);
+        $table = new AclroleTable($tableGateway);
         return $table;
     }
 }
\ No newline at end of file

module/Admin/src/Admin/Factory/AclTableFactory.php

Doc Comments +1 added lines, -1 removed lines

@@ -35,7 +35,7 @@
      *
      * @param ServiceLocatorInterface $serviceLocator
      *
-     * @return Admin\Model\AclTable
+     * @return AclTable
      */
     public function createService(ServiceLocatorInterface $serviceLocator)
     {

Spacing +4 added lines, -4 removed lines

@@ -39,11 +39,11 @@
      */
     public function createService(ServiceLocatorInterface $serviceLocator)
     {
-        $dbAdapter            = $serviceLocator->get('Zend\Db\Adapter\Adapter');
-        $resultSetPrototype    = new ResultSet();
+        $dbAdapter = $serviceLocator->get('Zend\Db\Adapter\Adapter');
+        $resultSetPrototype = new ResultSet();
         $resultSetPrototype->setArrayObjectPrototype(new Acl());
-        $tableGateway        = new TableGateway('acl', $dbAdapter, null, $resultSetPrototype);
-        $table                = new AclTable($tableGateway);
+        $tableGateway = new TableGateway('acl', $dbAdapter, null, $resultSetPrototype);
+        $table = new AclTable($tableGateway);
         return $table;
     }
 }
\ No newline at end of file

module/Admin/src/Admin/Factory/ApplicationsControllerFactory.php

Doc Comments +1 added lines, -1 removed lines

@@ -26,7 +26,7 @@
      *
      * @param ServiceLocatorInterface $serviceLocator
      *
-     * @return mixed
+     * @return ApplicationsController
      */
     public function createService(ServiceLocatorInterface $serviceLocator)
     {