bb-drummer / my-application

module/UIComponents/src/UIComponents/View/Helper/Utilities/AppTitle.php

Spacing +1 added lines, -1 removed lines

@@ -42,7 +42,7 @@
      */
     public function render($short = null)
     {
-        $config = new \Zend\Config\Config( $this->getServiceLocator()->getServiceLocator()->get('Config') );
+        $config = new \Zend\Config\Config($this->getServiceLocator()->getServiceLocator()->get('Config'));
         if ($short === true) {
             return $config->get('app')->get('short_title');
         }

module/UIComponents/src/UIComponents/View/Helper/Utilities/AppFavicon.php

Spacing +1 added lines, -1 removed lines

@@ -41,7 +41,7 @@
      */
     public function render($container = null)
     {
-        $config = new \Zend\Config\Config( $this->getServiceLocator()->getServiceLocator()->get('Config') );
+        $config = new \Zend\Config\Config($this->getServiceLocator()->getServiceLocator()->get('Config'));
         return $config->get('app')->get('favicon');
     }
     

module/UIComponents/src/UIComponents/View/Helper/Utilities/Config.php

Spacing +1 added lines, -1 removed lines

@@ -42,7 +42,7 @@
      */
     public function render($container = null)
     {
-        $config = new \Zend\Config\Config( $this->getServiceLocator()->getServiceLocator()->get('Config') );
+        $config = new \Zend\Config\Config($this->getServiceLocator()->getServiceLocator()->get('Config'));
         return $config;
     }
     

module/UIComponents/src/UIComponents/Framework/ClassnameCollectionAbstract.php

Indentation +21 added lines, -21 removed lines

@@ -21,14 +21,14 @@ 
  */
 abstract class ClassnameCollectionAbstract {
 	
-	/** @var  string  $framework  framework names, these classnames are related to */
-	public $framework = "Bootstrap";
+    /** @var  string  $framework  framework names, these classnames are related to */
+    public $framework = "Bootstrap";
 	
-	/** @var  string  $version  framework version, these classnames are related to */
-	public $version = "3.3.0";
+    /** @var  string  $version  framework version, these classnames are related to */
+    public $version = "3.3.0";
 	
-	/** @var  array  $size  generic sizes */
-	public $size = array(
+    /** @var  array  $size  generic sizes */
+    public $size = array(
         "xs"    => "xs",
         "s"     => "s",
         "m"     => "m",
@@ -36,9 +36,9 @@ 
         "xl"    => "xl",
     );
     
-	/** @var  array  $column  generic column classname */
+    /** @var  array  $column  generic column classname */
     public $column = "columns";
-	/** @var  array  $columnsize  column sizes classnames*/
+    /** @var  array  $columnsize  column sizes classnames*/
     public $columnsize = array(
         "xs"    => "col-xs-",
         "s"     => "col-s-",
@@ -47,7 +47,7 @@ 
         "xl"    => "col-xl-",
     );
     
-	/** @var  array  $status  status related classnames */
+    /** @var  array  $status  status related classnames */
     public $status = array(
         "default"    => "default",
         "info"       => "info",
@@ -57,7 +57,7 @@ 
         "error"      => "error",
     );
     
-	/** @var  array  $panel  panel related classnames */
+    /** @var  array  $panel  panel related classnames */
     public $panel = array(
         "prefix"     => "panel-",
         "wrapper"    => "panel",
@@ -66,7 +66,7 @@ 
         "footer"     => "panel-footer",
     );
     
-	/** @var  array  $control  control related classnames */
+    /** @var  array  $control  control related classnames */
     public $control = array(
         "button" => array(
             "prefix"    => "btn-",
@@ -77,18 +77,18 @@ 
         ),
     );
     
-	/** @var  array  $form  form generation related classnames */
+    /** @var  array  $form  form generation related classnames */
     public $form = array(
         "formgroup" => array(
             "wrapper"    => "form-group",
         ),
     );
     
-	/** @var  array  $table  table related classnames */
+    /** @var  array  $table  table related classnames */
     public $table = array(
     );
     
-	/** @var  array  $widget  widgets' classnames */
+    /** @var  array  $widget  widgets' classnames */
     public $widget = array(
         "navigation" => array(
             "wrapper" => "navbar navbar-inverse",
@@ -113,12 +113,12 @@ 
         ),
     );
     
-   	/**
-	 * create classname collection object
-	 * @see \Zend\Config\Config
-	 */
-	public function __contruct() {
-	    return new \Zend\Config\Config( get_object_vars($this) );
-	}
+        /**
+         * create classname collection object
+         * @see \Zend\Config\Config
+         */
+    public function __contruct() {
+        return new \Zend\Config\Config( get_object_vars($this) );
+    }
 		
 }

Spacing +1 added lines, -1 removed lines

@@ -118,7 +118,7 @@
 	 * @see \Zend\Config\Config
 	 */
 	public function __contruct() {
-	    return new \Zend\Config\Config( get_object_vars($this) );
+	    return new \Zend\Config\Config(get_object_vars($this));
 	}
 		
 }

module/UIComponents/src/UIComponents/Framework/Bootstrap3.php

Indentation +13 added lines, -13 removed lines

@@ -21,13 +21,13 @@ 
  */
 class Bootstrap3 extends ClassnameCollectionAbstract {
 	
-	/** @var  string  $framework  framework names, these classnames are related to */
-	public $framework = "Bootstrap";
+    /** @var  string  $framework  framework names, these classnames are related to */
+    public $framework = "Bootstrap";
 	
-	/** @var  string  $version  framework version, these classnames are related to */
-	public $version = "3.3.0";
+    /** @var  string  $version  framework version, these classnames are related to */
+    public $version = "3.3.0";
 	
-	/** @var  array  $size  generic sizes */
+    /** @var  array  $size  generic sizes */
     public $size = array(
         "xs"    => "xs",
         "s"     => "s",
@@ -36,9 +36,9 @@ 
         "xl"    => "xl",
     );
     
-	/** @var  array  $column  generic column classname */
+    /** @var  array  $column  generic column classname */
     public $column = "columns";
-	/** @var  array  $columnsize  column sizes classnames*/
+    /** @var  array  $columnsize  column sizes classnames*/
     public $columnsize = array(
         "xs"    => "col-xs-",
         "s"     => "col-s-",
@@ -47,7 +47,7 @@ 
         "xl"    => "col-xl-",
     );
     
-	/** @var  array  $status  status related classnames */
+    /** @var  array  $status  status related classnames */
     public $status = array(
         "default"    => "default",
         "info"       => "info",
@@ -57,7 +57,7 @@ 
         "error"      => "error",
     );
     
-	/** @var  array  $panel  panel related classnames */
+    /** @var  array  $panel  panel related classnames */
     public $panel = array(
         "prefix"     => "panel-",
         "wrapper"    => "panel",
@@ -66,7 +66,7 @@ 
         "footer"     => "panel-footer",
     );
     
-	/** @var  array  $control  control related classnames */
+    /** @var  array  $control  control related classnames */
     public $control = array(
         "button" => array(
             "prefix"    => "btn-",
@@ -77,18 +77,18 @@ 
         ),
     );
     
-	/** @var  array  $form  form generation related classnames */
+    /** @var  array  $form  form generation related classnames */
     public $form = array(
         "formgroup" => array(
             "wrapper"    => "form-group",
         ),
     );
     
-	/** @var  array  $table  table related classnames */
+    /** @var  array  $table  table related classnames */
     public $table = array(
     );
     
-	/** @var  array  $widget  widgets' classnames */
+    /** @var  array  $widget  widgets' classnames */
     public $widget = array(
         "navigation" => array(
             "wrapper" => "navbar navbar-inverse",

module/UIComponents/src/UIComponents/Framework/Foundation6.php

Indentation +13 added lines, -13 removed lines

@@ -21,13 +21,13 @@ 
  */
 class Foundation6 extends ClassnameCollectionAbstract {
 	
-	/** @var  string  $framework  framework names, these classnames are related to */
-	public $framework = "Foundation";
+    /** @var  string  $framework  framework names, these classnames are related to */
+    public $framework = "Foundation";
 	
-	/** @var  string  $version  framework version, these classnames are related to */
-	public $version = "6.1.2";
+    /** @var  string  $version  framework version, these classnames are related to */
+    public $version = "6.1.2";
 	
-	/** @var  array  $size  generic sizes */
+    /** @var  array  $size  generic sizes */
     public $size = array(
         "xs"    => "tiny",
         "s"     => "small",
@@ -36,9 +36,9 @@ 
         "xl"    => "xlarge",
     );
     
-	/** @var  array  $column  generic column classname */
+    /** @var  array  $column  generic column classname */
     public $column = "columns";
-	/** @var  array  $columnsize  column sizes classnames*/
+    /** @var  array  $columnsize  column sizes classnames*/
     public $columnsize = array(
         "xs"    => "tiny-",
         "s"     => "small-",
@@ -47,7 +47,7 @@ 
         "xl"    => "xlargel-",
     );
     
-	/** @var  array  $status  status related classnames */
+    /** @var  array  $status  status related classnames */
     public $status = array(
         "default"    => "",
         "info"       => "info",
@@ -57,7 +57,7 @@ 
         "error"      => "alert",
     );
     
-	/** @var  array  $panel  panel related classnames */
+    /** @var  array  $panel  panel related classnames */
     public $panel = array(
         "prefix"     => "panel-",
         "wrapper"    => "panel",
@@ -66,7 +66,7 @@ 
         "footer"     => "panel-footer",
     );
     
-	/** @var  array  $control  control related classnames */
+    /** @var  array  $control  control related classnames */
     public $control = array(
         "button" => array(
             "prefix"     => "button-",
@@ -77,18 +77,18 @@ 
         ),
     );
     
-	/** @var  array  $form  form generation related classnames */
+    /** @var  array  $form  form generation related classnames */
     public $form = array(
         "formgroup" => array(
             "wrapper"    => "form-group",
         ),
     );
     
-	/** @var  array  $table  table related classnames */
+    /** @var  array  $table  table related classnames */
     public $table = array(
     );
     
-	/** @var  array  $widget  widgets' classnames */
+    /** @var  array  $widget  widgets' classnames */
     public $widget = array(
         "navigation" => array(
             "wrapper" => "top-bar",

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

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

Spacing +9 added lines, -9 removed lines

@@ -125,30 +125,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/Controller/UsersController.php

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());
         }

Indentation +9 added lines, -9 removed lines

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

module/Admin/src/Admin/Controller/RedirectCallback.php

Indentation +1 added lines, -2 removed lines

@@ -144,6 +144,5 @@
             return $this->router->assemble(array(), array('name' => 'zfcuser'));
         }
     } 
-    
-    */
+     */
 }