HaaseIT / HCSF

src/Router.php

Spacing +8 added lines, -8 removed lines

@@ -86,7 +86,7 @@ 
 
             $aPath = explode('/', $this->sPath);
             if (!empty($map[$this->sPath])) {
-                $class = '\\HaaseIT\\HCSF\\Controller\\' . $map[$this->sPath];
+                $class = '\\HaaseIT\\HCSF\\Controller\\'.$map[$this->sPath];
             } else {
                 if ($aPath[1] == HelperConfig::$core['directory_images']) {
                     $class = '\\HaaseIT\\HCSF\\Controller\\Glide';
@@ -128,7 +128,7 @@ 
                 } else { // if it is found, go on
                     // Support for shorturls
                     if ($this->P->cb_pagetype == 'shorturl') {
-                        header('Location: ' . $this->P->cb_pageconfig, true, 302);
+                        header('Location: '.$this->P->cb_pageconfig, true, 302);
                         exit();
                     }
 
@@ -145,14 +145,14 @@ 
                 $this->P->iStatus = 404;
 
                 $this->P->oPayload->cl_html = $this->serviceManager->get('textcats')->T("misc_page_not_found");
-                header($_SERVER["SERVER_PROTOCOL"] . " 404 Not Found");
+                header($_SERVER["SERVER_PROTOCOL"]." 404 Not Found");
             } elseif (!is_object($this->P) && $this->P == 500) {
                 $this->P = new CorePage($this->serviceManager);
                 $this->P->cb_pagetype = 'error';
                 $this->P->iStatus = 500;
 
                 $this->P->oPayload->cl_html = $this->serviceManager->get('textcats')->T("misc_server_error");
-                header($_SERVER["SERVER_PROTOCOL"] . " 500 Internal Server Error");
+                header($_SERVER["SERVER_PROTOCOL"]." 500 Internal Server Error");
             } elseif (is_object($this->P) && $this->P->oPayload == NULL) {// elseif the page has been found but contains no payload...
                 if (
                     !(
@@ -162,10 +162,10 @@ 
                     )
                 ) { // no payload is fine if page is one of these
                     $this->P->oPayload->cl_html = $this->serviceManager->get('textcats')->T("misc_content_not_found");
-                    header($_SERVER["SERVER_PROTOCOL"] . " 404 Not Found");
+                    header($_SERVER["SERVER_PROTOCOL"]." 404 Not Found");
                 }
             } elseif ($this->P->oPayload->cl_lang != NULL && $this->P->oPayload->cl_lang != HelperConfig::$lang) { // if the page is available but not in the current language, display info
-                $this->P->oPayload->cl_html = $this->serviceManager->get('textcats')->T("misc_page_not_available_lang") . '<br><br>' . $this->P->oPayload->cl_html;
+                $this->P->oPayload->cl_html = $this->serviceManager->get('textcats')->T("misc_page_not_available_lang").'<br><br>'.$this->P->oPayload->cl_html;
             }
         }
         return $this->P;
@@ -187,7 +187,7 @@ 
                 // to allow dots in the filename, we have to iterate through all parts of the filename
                 $aRoutingoverride["itemno"] = '';
                 for ($i = 0; $i < count($aTMP["exploded_request_file"]) - 1; $i++) {
-                    $aRoutingoverride["itemno"] .= $aTMP["exploded_request_file"][$i] . '.';
+                    $aRoutingoverride["itemno"] .= $aTMP["exploded_request_file"][$i].'.';
                 }
                 // remove the trailing dot
                 $aRoutingoverride["itemno"] = \HaaseIT\Toolbox\Tools::cutStringend($aRoutingoverride["itemno"], 1);
@@ -197,7 +197,7 @@ 
                 // rebuild the path string without the trailing '/item/itemno.html'
                 $this->sPath = '';
                 for ($i = 0; $i < $aTMP["parts_in_path"] - 2; $i++) {
-                    $this->sPath .= $aPath[$i] . '/';
+                    $this->sPath .= $aPath[$i].'/';
                 }
             }
         }

Braces +6 added lines, -2 removed lines

@@ -116,9 +116,13 @@
                     If the last part of the path doesn't include a dot (.) and is not empty, apend a slash.
                     If there is already a slash at the end, the last part of the path array will be empty.
                      */
-                    if (mb_strpos($aPath[count($aPath) - 1], '.') === false && $aPath[count($aPath) - 1] != '') $this->sPath .= '/';
+                    if (mb_strpos($aPath[count($aPath) - 1], '.') === false && $aPath[count($aPath) - 1] != '') {
+                        $this->sPath .= '/';
+                    }
 
-                    if ($this->sPath[strlen($this->sPath) - 1] == '/') $this->sPath .= 'index.html';
+                    if ($this->sPath[strlen($this->sPath) - 1] == '/') {
+                        $this->sPath .= 'index.html';
+                    }
 
                     $this->P = new UserPage($this->serviceManager, $this->sPath);
                 }

src/HCSF.php

Spacing +8 added lines, -8 removed lines

@@ -30,7 +30,7 @@ 
 
         $this->setupHardcodedTextcats();
 
-        $this->serviceManager->setFactory('db', function () {
+        $this->serviceManager->setFactory('db', function() {
             return null;
         });
 
@@ -43,7 +43,7 @@ 
         $this->setupTwig();
 
         if (HelperConfig::$core["enable_module_shop"]) {
-            $this->serviceManager->setFactory('oItem', function (ServiceManager $serviceManager) {
+            $this->serviceManager->setFactory('oItem', function(ServiceManager $serviceManager) {
                 return new \HaaseIT\HCSF\Shop\Items($serviceManager);
             });
         }
@@ -56,7 +56,7 @@ 
     {
         // PSR-7 Stuff
         // Init request object
-        $this->serviceManager->setFactory('request', function () {
+        $this->serviceManager->setFactory('request', function() {
             $request = \Zend\Diactoros\ServerRequestFactory::fromGlobals();
 
             // cleanup request
@@ -76,7 +76,7 @@ 
 // session.use_trans_sid wenn nötig aktivieren
             ini_set('session.use_only_cookies', 0);
             session_name('sid');
-            if(ini_get('session.use_trans_sid') == 1) {
+            if (ini_get('session.use_trans_sid') == 1) {
                 ini_set('session.use_trans_sid', 0);
             }
 // Session wenn nötig starten
@@ -120,7 +120,7 @@ 
 
     protected function setupDB()
     {
-        $this->serviceManager->setFactory('dbal', function () {
+        $this->serviceManager->setFactory('dbal', function() {
             $config = new \Doctrine\DBAL\Configuration();
 
             $connectionParams = [
@@ -141,14 +141,14 @@ 
             return \Doctrine\DBAL\DriverManager::getConnection($connectionParams, $config);
         });
 
-        $this->serviceManager->setFactory('db', function (ServiceManager $serviceManager) {
+        $this->serviceManager->setFactory('db', function(ServiceManager $serviceManager) {
             return $serviceManager->get('dbal')->getWrappedConnection();
         });
     }
 
     protected function setupTextcats()
     {
-        $this->serviceManager->setFactory('textcats', function (ServiceManager $serviceManager) {
+        $this->serviceManager->setFactory('textcats', function(ServiceManager $serviceManager) {
             $langavailable = HelperConfig::$core["lang_available"];
             $textcats = new \HaaseIT\Toolbox\Textcat(
                 HelperConfig::$lang,
@@ -165,7 +165,7 @@ 
 
     protected function setupTwig()
     {
-        $this->serviceManager->setFactory('twig', function (ServiceManager $serviceManager) {
+        $this->serviceManager->setFactory('twig', function(ServiceManager $serviceManager) {
             $loader = new \Twig_Loader_Filesystem([PATH_BASEDIR.'customviews', HCSF_BASEDIR.'src/views/']);
 
             $twig_options = [