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()
     {

Indentation +1 added lines, -1 removed lines

@@ -24,7 +24,7 @@
      * redirect to acl section
      * @return mixed|\Zend\Http\Response|\Zend\View\Model\ViewModel
      */
-	public function indexAction()
+    public function indexAction()
     {
         return $this->redirect()->toRoute('admin/acledit', array());
     }

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()
     {

Indentation +8 added lines, -8 removed lines

@@ -26,15 +26,15 @@
 class UsersController extends BaseActionController
 {
 	
-	/**
-	 * @var array|\Admin\Model\UserTable
-	 */
-	protected $userTable;
+    /**
+     * @var array|\Admin\Model\UserTable
+     */
+    protected $userTable;
 	
-	/**
-	 * @var array|\Admin\Model\AclroleTable
-	 */
-	protected $AclroleTable;
+    /**
+     * @var array|\Admin\Model\AclroleTable
+     */
+    protected $AclroleTable;
 
     /**
      * initialize titles and toolbar items

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()
     {

Indentation +7 added lines, -7 removed lines

@@ -46,9 +46,9 @@ 
  */
 class ZfcuserController extends UserController
 {
-	use ControllerTranslatorTrait;
-	use ControllerActiontitlesTrait;
-	use ControllerToolbarTrait;
+    use ControllerTranslatorTrait;
+    use ControllerActiontitlesTrait;
+    use ControllerToolbarTrait;
 	
     /**
      * 
@@ -210,7 +210,7 @@ 
             // ...redirect to the login redirect route
             return $this->redirect()->toRoute('zfcuser/login'); //$this->getOptions()->getLoginRedirectRoute());
         }
-    	$oIdentity = $this->zfcUserAuthentication()->getIdentity();
+        $oIdentity = $this->zfcUserAuthentication()->getIdentity();
         $oProfile = new \Admin\Model\UserProfile();
         $oProfile->load($oIdentity->getId());
         
@@ -766,7 +766,7 @@ 
             $sm = $this->getServiceLocator();
             $this->userTable = $sm->get('Admin\Model\UserTable');
             if (!$this->userTable instanceof \Admin\Model\UserTable) {
-            	throw new \Exception("invalid user table object: ".gettype($this->userTable));
+                throw new \Exception("invalid user table object: ".gettype($this->userTable));
             }
         }
         return $this->userTable;
@@ -784,7 +784,7 @@ 
             $sm = $this->getServiceLocator();
             $this->aclroleTable = $sm->get('Admin\Model\AclroleTable');
             if (!$this->aclroleTable instanceof \Admin\Model\AclroleTable) {
-            	throw new \Exception("invalid ACL role table object: ".gettype($this->aclroleTable));
+                throw new \Exception("invalid ACL role table object: ".gettype($this->aclroleTable));
             }
         }
         return $this->aclroleTable;
@@ -798,7 +798,7 @@ 
      */
     public function getOptions()
     {
-    	return \Application\Module::getService('zfcuser_module_options');
+        return \Application\Module::getService('zfcuser_module_options');
     } 
     
 }

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)

Indentation +6 added lines, -6 removed lines

@@ -23,21 +23,21 @@ 
     
     /**
      * user's confirmation/activation token
-  *
+     *
      * @var string
      */
     protected $token;
 
     /**
      * user's ACL role
-  *
+     *
      * @var string
      */
     protected $aclrole;
 
     /**
      * user's ID
-  *
+     *
      * @var int
      */
     protected $user_id;
@@ -118,7 +118,7 @@ 
     
     /**
      * set user's object property data
-  *
+     *
      * @param  array   $data
      * @param  boolean $forceEncryptPassword
      * @return \Admin\Entity\User
@@ -156,7 +156,7 @@ 
     
     /**
      * get copy of user's object properties in an assosiative array
-  *
+     *
      * @return array
      */
     public function __getArrayCopy()
@@ -177,7 +177,7 @@ 
     
     /**
      * get copy of user's object properties in an assosiative array
-  *
+     *
      * @return array
      * /
     public function getArrayCopy() 

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)
     {

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)
     {

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)
     {

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)
     {