bb-drummer / my-application

module/Admin/src/Admin/Model/Acl.php

Spacing +2 added lines, -2 removed lines

@@ -34,10 +34,10 @@
     
     public function exchangeArray($data)
     {
-        $this->acl_id            = (isset($data['acl_id'])) ? $data['acl_id'] : null;
+        $this->acl_id = (isset($data['acl_id'])) ? $data['acl_id'] : null;
         $this->aclroles_id        = (isset($data['aclroles_id'])) ? $data['aclroles_id'] : null;
         $this->aclresources_id    = (isset($data['aclresources_id'])) ? $data['aclresources_id'] : null;
-        $this->state            = (isset($data['state'])) ? $data['state'] : null;
+        $this->state = (isset($data['state'])) ? $data['state'] : null;
     }
 
     public function getArrayCopy()

module/Admin/src/Admin/Model/Aclrole.php

Spacing +1 added lines, -1 removed lines

@@ -33,7 +33,7 @@
     
     public function exchangeArray($data)
     {
-        $this->aclroles_id    = (isset($data['aclroles_id'])) ? $data['aclroles_id'] : null;
+        $this->aclroles_id = (isset($data['aclroles_id'])) ? $data['aclroles_id'] : null;
         $this->roleslug        = (isset($data['roleslug'])) ? $data['roleslug'] : null;
         $this->rolename        = (isset($data['rolename'])) ? $data['rolename'] : null;
     }

module/Admin/src/Admin/View/Helper/isallowed.php

Indentation +2 added lines, -2 removed lines

@@ -33,14 +33,14 @@
     public function __invoke( $resource )
     {
         /**
- * @var Zend\Permissions\Acl\Acl $acl 
+         * @var Zend\Permissions\Acl\Acl $acl 
 **/
         $acl = $this->view->navigation()->getAcl();
         if (empty($resource) || !$acl->hasResource($resource) ) {
             return true;
         }    
         /**
- * @var \Admin\Entity\User $user 
+         * @var \Admin\Entity\User $user 
 **/
         $user = $this->view->zfcUserIdentity(); // ->getIdentity();
         if ($user) { // ($this->getAuthService()->hasIdentity()) {

Spacing +3 added lines, -3 removed lines

@@ -30,13 +30,13 @@ 
      * @access public
      * @return \ZfcUser\Entity\UserInterface
      */
-    public function __invoke( $resource )
+    public function __invoke($resource)
     {
         /**
  * @var Zend\Permissions\Acl\Acl $acl 
 **/
         $acl = $this->view->navigation()->getAcl();
-        if (empty($resource) || !$acl->hasResource($resource) ) {
+        if (empty($resource) || !$acl->hasResource($resource)) {
             return true;
         }    
         /**
@@ -49,7 +49,7 @@ 
         } else {
             $role = 'public';
         }
-        return ( $acl->isAllowed($role, $resource) );
+        return ($acl->isAllowed($role, $resource));
     }
     
     /**

module/Admin/src/Admin/View/Helper/isdenied.php

Indentation +2 added lines, -2 removed lines

@@ -33,14 +33,14 @@
     public function __invoke( $resource )
     {
         /**
- * @var \Zend\Permissions\Acl\Acl $acl 
+         * @var \Zend\Permissions\Acl\Acl $acl 
 **/
         $acl = $this->view->navigation()->getAcl();
         if (empty($resource) || !$acl->hasResource($resource) ) {
             return true;
         }    
         /**
- * @var \Admin\Entity\User $user 
+         * @var \Admin\Entity\User $user 
 **/
         $user = $this->view->zfcUserIdentity(); // ->getIdentity();
         if ($user) { // ($this->getAuthService()->hasIdentity()) {

Spacing +3 added lines, -3 removed lines

@@ -30,13 +30,13 @@ 
      * @access public
      * @return \ZfcUser\Entity\UserInterface
      */
-    public function __invoke( $resource )
+    public function __invoke($resource)
     {
         /**
  * @var \Zend\Permissions\Acl\Acl $acl 
 **/
         $acl = $this->view->navigation()->getAcl();
-        if (empty($resource) || !$acl->hasResource($resource) ) {
+        if (empty($resource) || !$acl->hasResource($resource)) {
             return true;
         }    
         /**
@@ -49,7 +49,7 @@ 
         } else {
             $role = 'public';
         }
-        return ( !$acl->isAllowed($role, $resource) );
+        return (!$acl->isAllowed($role, $resource));
     }
     
     /**

module/Application/src/Examples/Controller/JsonResultController.php

Spacing +2 added lines, -2 removed lines

@@ -65,7 +65,7 @@ 
             array(
             'html' => $htmlOutput,
             'jsonVar1' => 'jsonVal2',
-            'jsonArray' => array(1,2,3,4,5,6)
+            'jsonArray' => array(1, 2, 3, 4, 5, 6)
             )
         );
     
@@ -84,7 +84,7 @@ 
         'jsonArray' => array(1, 2, 3, 4, 5, 6)
         );
         $isAjax = $this->getRequest()->isXmlHttpRequest();
-        return isAjax?new JsonModel($data):new ViewModel($data);
+        return isAjax ? new JsonModel($data) : new ViewModel($data);
     }
 
     /**

module/Application/src/Application/Controller/SetupController.php

Indentation +1 added lines, -1 removed lines

@@ -78,7 +78,7 @@
         $tableQueries = array();
         foreach ($tables as $table) { //while ($table = $tables->current()) {
             $tableName = $table["Tables_in_".$config["db"]["database"]];
-             // describe tables
+                // describe tables
             $tableSql = $db->query("SHOW CREATE TABLE `" . $tableName . "`;");
             $tableCreate = $tableSql->execute();
             $tableSpec = $tableCreate->current();

Spacing +15 added lines, -15 removed lines

@@ -53,7 +53,7 @@ 
     public function updatedbAction()
     {
 
-        echo 'update database structure...' . PHP_EOL;
+        echo 'update database structure...'.PHP_EOL;
         
         $request = $this->getRequest();
         $db = $this->getServiceLocator()->get('Zend\Db\Adapter\Adapter');
@@ -69,7 +69,7 @@ 
         $only_testing = $request->getParam('test', false);
         $be_verbose = $request->getParam('verbose', false);
 
-        if ($be_verbose) { echo 'current path: ' . getcwd() . PHP_EOL; 
+        if ($be_verbose) { echo 'current path: '.getcwd().PHP_EOL; 
         }
         
         // get tables
@@ -79,7 +79,7 @@ 
         foreach ($tables as $table) { //while ($table = $tables->current()) {
             $tableName = $table["Tables_in_".$config["db"]["database"]];
              // describe tables
-            $tableSql = $db->query("SHOW CREATE TABLE `" . $tableName . "`;");
+            $tableSql = $db->query("SHOW CREATE TABLE `".$tableName."`;");
             $tableCreate = $tableSql->execute();
             $tableSpec = $tableCreate->current();
             $tableQueries[] = $tableSpec["Create Table"].";";
@@ -87,7 +87,7 @@ 
         $currentStructure = implode("\n", $tableQueries);
         
         // read INSTALL.SQL
-        $filename = getcwd() ."". "/sql/install.sql";
+        $filename = getcwd().""."/sql/install.sql";
         $installSQL = file_get_contents($filename);
         //file_put_contents(getcwd() ."". "/sql/current.sql", $currentStructure);
         
@@ -97,38 +97,38 @@ 
             $compareResult = $structureUpdater->getUpdates($currentStructure, $installSQL);
             //$compareResult = $structureUpdater->getUpdates($installSQL, $currentStructure);
         } catch (\Exception $ex) {
-            echo 'ERROR COMPARING DATABASE STRUCTURE! ' . PHP_EOL;
-            if ($be_verbose) { echo 'EXCEPTION: ' . PHP_EOL . print_r($ex, true) . PHP_EOL; 
+            echo 'ERROR COMPARING DATABASE STRUCTURE! '.PHP_EOL;
+            if ($be_verbose) { echo 'EXCEPTION: '.PHP_EOL.print_r($ex, true).PHP_EOL; 
             }
         }
-        if (!is_array($compareResult) || (count($compareResult) < 1) ) {
-            echo '...database is up-to-date, no actions needed.' . PHP_EOL;
+        if (!is_array($compareResult) || (count($compareResult) < 1)) {
+            echo '...database is up-to-date, no actions needed.'.PHP_EOL;
             return 0;
         }
             
         // transaction(!): update db
         
         if ($only_testing) {
-            echo 'testing mode...' . PHP_EOL;
-            echo 'detected sql update statements:' . PHP_EOL;
-            echo  implode(";\n", $compareResult).";" . PHP_EOL;
+            echo 'testing mode...'.PHP_EOL;
+            echo 'detected sql update statements:'.PHP_EOL;
+            echo  implode(";\n", $compareResult).";".PHP_EOL;
         } else {
             try {
                 $dbConnection = $db->getDriver()->getConnection();
                 $dbConnection->beginTransaction();
                 foreach ($compareResult as $updateSql) {
-                    if ($be_verbose) { echo 'executing sql: ' . $updateSql . PHP_EOL; 
+                    if ($be_verbose) { echo 'executing sql: '.$updateSql.PHP_EOL; 
                     }
                     $dbupdate = $db->query($updateSql);
                     $updateResult = $dbupdate->execute();
-                    if ($be_verbose) { echo '...done' . PHP_EOL; 
+                    if ($be_verbose) { echo '...done'.PHP_EOL; 
                     }
                 }
                 $dbConnection->commit();
             } catch (\Exception $ex) {
                 $dbConnection->rollback();
-                echo 'ERROR COMPARING DATABASE STRUCTURE! ' . PHP_EOL;
-                if ($be_verbose) { echo 'EXCEPTION: ' . PHP_EOL . print_r($ex, true) . PHP_EOL; 
+                echo 'ERROR COMPARING DATABASE STRUCTURE! '.PHP_EOL;
+                if ($be_verbose) { echo 'EXCEPTION: '.PHP_EOL.print_r($ex, true).PHP_EOL; 
                 }
             }
         }

module/Application/src/Application/Controller/Traits/ControllerActiontitlesTrait.php

Spacing +1 added lines, -1 removed lines

@@ -22,7 +22,7 @@
      */
     public function getActionTitles() 
     {
-        return $this->actionTitles ;
+        return $this->actionTitles;
     }
 
     /**

module/Application/src/Application/Controller/Traits/ControllerToolbarTrait.php

Spacing +1 added lines, -1 removed lines

@@ -22,7 +22,7 @@
      */
     public function getToolbarItems() 
     {
-        return $this->toolbarItems ;
+        return $this->toolbarItems;
     }
     
     /**

module/Application/src/Application/Controller/Traits/ControllerTranslatorTrait.php

Indentation +1 added lines, -1 removed lines

@@ -22,7 +22,7 @@
  */
 trait ControllerTranslatorTrait {
 
-	/**
+    /**
      * 
      * @var \Zend\I18n\Translator\Translator
      */

Spacing +1 added lines, -1 removed lines

@@ -64,7 +64,7 @@
      */
     public function translate($message, $textdomain = 'default', $locale = null) 
     {
-        return ( $this->getTranslator()->translate($message, $textdomain, $locale) );
+        return ($this->getTranslator()->translate($message, $textdomain, $locale));
     }
     
 }