bb-drummer / my-application

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

Unused Use Statements -4 removed lines

@@ -19,7 +19,6 @@ 
 use Application\Controller\Traits\ControllerTranslatorTrait;
 use Application\Controller\Traits\ControllerActiontitlesTrait;
 use Application\Controller\Traits\ControllerToolbarTrait;
-
 use Admin\Module as AdminModule;
 use Admin\Form\RequestPasswordResetForm;
 use Admin\Form\ResetPasswordForm;
@@ -28,14 +27,11 @@ 
 use Admin\Form\UserDataForm;
 use Admin\Form\UserProfileForm;
 use Admin\Model\UserProfile;
-
 use Zend\Crypt\Password\Bcrypt;
 use Zend\Stdlib\ResponseInterface as Response;
-
 use Zend\View\Model\ViewModel;
 use Zend\Mvc\MvcEvent;
 use Zend\ServiceManager\ServiceLocatorInterface;
-
 use ZfcUser\Controller\UserController;
 use ZfcUser\Controller\Plugin\ZfcUserAuthentication;
 

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/Factory/AclresourceTableFactory.php

Unused Use Statements -1 removed lines

@@ -19,7 +19,6 @@
 use Zend\Db\TableGateway\TableGateway;
 use Zend\ServiceManager\FactoryInterface;
 use Zend\ServiceManager\ServiceLocatorInterface;
-
 use Admin\Model\Aclresource;
 use Admin\Model\AclresourceTable;
 

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

Unused Use Statements -1 removed lines

@@ -19,7 +19,6 @@
 use Zend\Db\TableGateway\TableGateway;
 use Zend\ServiceManager\FactoryInterface;
 use Zend\ServiceManager\ServiceLocatorInterface;
-
 use Admin\Model\Aclrole;
 use Admin\Model\AclroleTable;
 

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

Unused Use Statements -1 removed lines

@@ -19,7 +19,6 @@
 use Zend\Db\TableGateway\TableGateway;
 use Zend\ServiceManager\FactoryInterface;
 use Zend\ServiceManager\ServiceLocatorInterface;
-
 use Admin\Model\Acl;
 use Admin\Model\AclTable;
 

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/ApplicationsTableFactory.php

Unused Use Statements -1 removed lines

@@ -19,7 +19,6 @@
 use Zend\Db\TableGateway\TableGateway;
 use Zend\ServiceManager\FactoryInterface;
 use Zend\ServiceManager\ServiceLocatorInterface;
-
 use Admin\Model\Applications;
 use Admin\Model\ApplicationsTable;
 

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 Applications());
-        $tableGateway        = new TableGateway('applications', $dbAdapter, null, $resultSetPrototype);
-        $table                = new ApplicationsTable($tableGateway);
+        $tableGateway = new TableGateway('applications', $dbAdapter, null, $resultSetPrototype);
+        $table = new ApplicationsTable($tableGateway);
         return $table;
     }
 }
\ No newline at end of file

module/Admin/src/Admin/Factory/ClientsTableFactory.php

Unused Use Statements -1 removed lines

@@ -19,7 +19,6 @@
 use Zend\Db\TableGateway\TableGateway;
 use Zend\ServiceManager\FactoryInterface;
 use Zend\ServiceManager\ServiceLocatorInterface;
-
 use Admin\Model\Clients;
 use Admin\Model\ClientsTable;
 

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 Clients());
-        $tableGateway        = new TableGateway('clients', $dbAdapter, null, $resultSetPrototype);
-        $table                = new ClientsTable($tableGateway);
+        $tableGateway = new TableGateway('clients', $dbAdapter, null, $resultSetPrototype);
+        $table = new ClientsTable($tableGateway);
         return $table;
     }
 }
\ No newline at end of file

module/Admin/src/Admin/Factory/SettingsTableFactory.php

Unused Use Statements -1 removed lines

@@ -19,7 +19,6 @@
 use Zend\Db\TableGateway\TableGateway;
 use Zend\ServiceManager\FactoryInterface;
 use Zend\ServiceManager\ServiceLocatorInterface;
-
 use Admin\Model\Settings;
 use Admin\Model\SettingsTable;
 

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 Settings());
-        $tableGateway        = new TableGateway('settings', $dbAdapter, null, $resultSetPrototype);
-        $table                = new SettingsTable($tableGateway);
+        $tableGateway = new TableGateway('settings', $dbAdapter, null, $resultSetPrototype);
+        $table = new SettingsTable($tableGateway);
         return $table;
     }
 }
\ No newline at end of file

module/Admin/src/Admin/Factory/UserProfileTableFactory.php

Unused Use Statements -1 removed lines

@@ -19,7 +19,6 @@
 use Zend\Db\TableGateway\TableGateway;
 use Zend\ServiceManager\FactoryInterface;
 use Zend\ServiceManager\ServiceLocatorInterface;
-
 use Admin\Model\UserProfile;
 use Admin\Model\UserProfileTable;
 

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 UserProfile());
-        $tableGateway        = new TableGateway('userprofile', $dbAdapter, null, $resultSetPrototype);
-        $table                = new UserProfileTable($tableGateway);
+        $tableGateway = new TableGateway('userprofile', $dbAdapter, null, $resultSetPrototype);
+        $table = new UserProfileTable($tableGateway);
         return $table;
     }
 }
\ No newline at end of file

module/Admin/src/Admin/Factory/UserTableFactory.php

Unused Use Statements -1 removed lines

@@ -19,7 +19,6 @@
 use Zend\Db\TableGateway\TableGateway;
 use Zend\ServiceManager\FactoryInterface;
 use Zend\ServiceManager\ServiceLocatorInterface;
-
 use Admin\Model\User;
 use Admin\Model\UserTable;
 

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 User());
-        $tableGateway        = new TableGateway('user', $dbAdapter, null, $resultSetPrototype);
-        $table                = new UserTable($tableGateway);
+        $tableGateway = new TableGateway('user', $dbAdapter, null, $resultSetPrototype);
+        $table = new UserTable($tableGateway);
         return $table;
     }
 }
\ No newline at end of file