jaxon-php / jaxon-core

src/Utils/Config/Json.php

Spacing +2 added lines, -2 removed lines

@@ -26,13 +26,13 @@
     public static function read($sConfigFile)
     {
         $sConfigFile = realpath($sConfigFile);
-        if(!is_readable($sConfigFile))
+        if (!is_readable($sConfigFile))
         {
             throw new \Jaxon\Utils\Config\Exception\File(jaxon_trans('config.errors.file.access', ['path' => $sConfigFile]));
         }
         $sFileContent = file_get_contents($sConfigFile);
         $aConfigOptions = json_decode($sFileContent, true);
-        if(!is_array($aConfigOptions))
+        if (!is_array($aConfigOptions))
         {
             throw new \Jaxon\Utils\Config\Exception\File(jaxon_trans('config.errors.file.content', ['path' => $sConfigFile]));
         }

src/Utils/Config/Config.php

Spacing +10 added lines, -11 removed lines

@@ -33,7 +33,7 @@ 
      */
     public function __construct(array $aOptions = [], $sKeys = '')
     {
-        if(count($aOptions) > 0)
+        if (count($aOptions) > 0)
         {
             $this->setOptions($aOptions, $sKeys);
         }
@@ -66,14 +66,14 @@ 
         $sPrefix = trim((string)$sPrefix);
         $nDepth = intval($nDepth);
         // Check the max depth
-        if($nDepth < 0 || $nDepth > 9)
+        if ($nDepth < 0 || $nDepth > 9)
         {
             throw new \Jaxon\Utils\Config\Exception\Data(jaxon_trans('config.errors.data.depth',
                 ['key' => $sPrefix, 'depth' => $nDepth]));
         }
-        foreach($aOptions as $sName => $xOption)
+        foreach ($aOptions as $sName => $xOption)
         {
-            if(is_int($sName))
+            if (is_int($sName))
             {
                 continue;
             }
@@ -83,7 +83,7 @@ 
             // Save the value of this option
             $this->aOptions[$sFullName] = $xOption;
             // Save the values of its sub-options
-            if(is_array($xOption))
+            if (is_array($xOption))
             {
                 // Recursively read the options in the array
                 $this->_setOptions($xOption, $sFullName, $nDepth + 1);
@@ -105,9 +105,9 @@ 
         $aKeys = explode('.', (string)$sKeys);
         foreach ($aKeys as $sKey)
         {
-            if(($sKey))
+            if (($sKey))
             {
-                if(!array_key_exists($sKey, $aOptions) || !is_array($aOptions[$sKey]))
+                if (!array_key_exists($sKey, $aOptions) || !is_array($aOptions[$sKey]))
                 {
                     return;
                 }
@@ -157,13 +157,12 @@ 
         $sPrefix = rtrim($sPrefix, '.') . '.';
         $sPrefixLen = strlen($sPrefix);
         $aOptions = [];
-        foreach($this->aOptions as $sName => $xValue)
+        foreach ($this->aOptions as $sName => $xValue)
         {
-            if(substr($sName, 0, $sPrefixLen) == $sPrefix)
+            if (substr($sName, 0, $sPrefixLen) == $sPrefix)
             {
                 $iNextDotPos = strpos($sName, '.', $sPrefixLen);
-                $sOptionName = $iNextDotPos === false ? substr($sName, $sPrefixLen) :
-                    substr($sName, $sPrefixLen, $iNextDotPos - $sPrefixLen);
+                $sOptionName = $iNextDotPos === false ? substr($sName, $sPrefixLen) : substr($sName, $sPrefixLen, $iNextDotPos - $sPrefixLen);
                 $aOptions[$sOptionName] = $sPrefix . $sOptionName;
             }
         }

src/Utils/Config/Php.php

Spacing +2 added lines, -2 removed lines

@@ -26,12 +26,12 @@
     public static function read($sConfigFile)
     {
         $sConfigFile = realpath($sConfigFile);
-        if(!is_readable($sConfigFile))
+        if (!is_readable($sConfigFile))
         {
             throw new \Jaxon\Utils\Config\Exception\File(jaxon_trans('config.errors.file.access', ['path' => $sConfigFile]));
         }
         $aConfigOptions = include($sConfigFile);
-        if(!is_array($aConfigOptions))
+        if (!is_array($aConfigOptions))
         {
             throw new \Jaxon\Utils\Config\Exception\File(jaxon_trans('config.errors.file.content', ['path' => $sConfigFile]));
         }

src/Utils/Config/Yaml.php

Spacing +3 added lines, -3 removed lines

@@ -26,16 +26,16 @@
     public static function read($sConfigFile)
     {
         $sConfigFile = realpath($sConfigFile);
-        if(!extension_loaded('yaml'))
+        if (!extension_loaded('yaml'))
         {
             throw new \Jaxon\Utils\Config\Exception\Yaml(jaxon_trans('config.errors.yaml.install'));
         }
-        if(!is_readable($sConfigFile))
+        if (!is_readable($sConfigFile))
         {
             throw new \Jaxon\Utils\Config\Exception\File(jaxon_trans('config.errors.file.access', ['path' => $sConfigFile]));
         }
         $aConfigOptions = yaml_parse_file($sConfigFile);
-        if(!is_array($aConfigOptions))
+        if (!is_array($aConfigOptions))
         {
             throw new \Jaxon\Utils\Config\Exception\File(jaxon_trans('config.errors.file.content', ['path' => $sConfigFile]));
         }

src/Utils/Config/Reader.php

Spacing +1 added lines, -1 removed lines

@@ -24,7 +24,7 @@
     public function read($sConfigFile)
     {
         $sExt = pathinfo($sConfigFile, PATHINFO_EXTENSION);
-        switch($sExt)
+        switch ($sExt)
         {
         case 'php':
             $aConfigOptions = Php::read($sConfigFile);

src/Utils/View/Renderer.php

Spacing +3 added lines, -3 removed lines

@@ -40,7 +40,7 @@ 
      */
     protected function store()
     {
-        if(!$this->xStore)
+        if (!$this->xStore)
         {
             $this->xStore = new Store();
         }
@@ -93,12 +93,12 @@ 
         $sNamespace = $this->xManager->getDefaultNamespace();
         // Get the namespace from the view name
         $iSeparatorPosition = strrpos($sViewName, '::');
-        if($iSeparatorPosition !== false)
+        if ($iSeparatorPosition !== false)
         {
             $sNamespace = substr($sViewName, 0, $iSeparatorPosition);
         }
         $aRenderers = $this->xManager->getRenderers();
-        if(!key_exists($sNamespace, $aRenderers))
+        if (!key_exists($sNamespace, $aRenderers))
         {
             // Cannot render a view if there's no renderer corresponding to the namespace.
             return null;

src/Utils/View/View.php

Spacing +1 added lines, -1 removed lines

@@ -48,7 +48,7 @@
         $sViewName = $store->getViewName();
         $sNamespace = $store->getNamespace();
         // In this view renderer, the namespace must always be prepended to the view name.
-        if(substr($sViewName, 0, strlen($sNamespace) + 2) != $sNamespace . '::')
+        if (substr($sViewName, 0, strlen($sNamespace) + 2) != $sNamespace . '::')
         {
             $sViewName = $sNamespace . '::' . $sViewName;
         }

src/Utils/View/Manager.php

Braces +1 added lines, -2 removed lines

@@ -81,8 +81,7 @@
         if(key_exists($sRenderer, $this->aNamespaces))
         {
             $this->aNamespaces[$sRenderer][] = $aNamespace;
-        }
-        else
+        } else
         {
             $this->aNamespaces[$sRenderer] = [$aNamespace];
         }

Spacing +8 added lines, -8 removed lines

@@ -78,7 +78,7 @@ 
             'directory' => $sDirectory,
             'extension' => $sExtension,
         ];
-        if(key_exists($sRenderer, $this->aNamespaces))
+        if (key_exists($sRenderer, $this->aNamespaces))
         {
             $this->aNamespaces[$sRenderer][] = $aNamespace;
         }
@@ -99,12 +99,12 @@ 
     public function addNamespaces($xAppConfig)
     {
         $this->sDefaultNamespace = $xAppConfig->getOption('options.views.default', false);
-        if(is_array($namespaces = $xAppConfig->getOptionNames('views')))
+        if (is_array($namespaces = $xAppConfig->getOptionNames('views')))
         {
-            foreach($namespaces as $namespace => $option)
+            foreach ($namespaces as $namespace => $option)
             {
                 // If no default namespace is defined, use the first one as default.
-                if($this->sDefaultNamespace == false)
+                if ($this->sDefaultNamespace == false)
                 {
                     $this->sDefaultNamespace = (string)$namespace;
                 }
@@ -126,7 +126,7 @@ 
      */
     public function getRenderer($sId = '')
     {
-        if(!$sId)
+        if (!$sId)
         {
             // Return the view renderer facade
             return jaxon()->di()->get(\Jaxon\Utils\View\Renderer::class);
@@ -149,14 +149,14 @@ 
         jaxon()->di()->set('jaxon.app.view.base.' . $sId, $xClosure);
 
         // Return the initialized view renderer
-        jaxon()->di()->set('jaxon.app.view.' . $sId, function ($c) use ($sId) {
+        jaxon()->di()->set('jaxon.app.view.' . $sId, function($c) use ($sId) {
             // Get the defined renderer
             $renderer = $c['jaxon.app.view.base.' . $sId];
 
             // Init the renderer with the template namespaces
-            if(key_exists($sId, $this->aNamespaces))
+            if (key_exists($sId, $this->aNamespaces))
             {
-                foreach($this->aNamespaces[$sId] as $ns)
+                foreach ($this->aNamespaces[$sId] as $ns)
                 {
                     $renderer->addNamespace($ns['namespace'], $ns['directory'], $ns['extension']);
                 }

src/Utils/Http/URI.php

Spacing +32 added lines, -32 removed lines

@@ -25,16 +25,16 @@ 
     {
         $aURL = [];
         // Try to get the request URL
-        if(!empty($_SERVER['REQUEST_URI']))
+        if (!empty($_SERVER['REQUEST_URI']))
         {
-            $_SERVER['REQUEST_URI'] = str_replace(['"',"'",'<','>'], ['%22','%27','%3C','%3E'], $_SERVER['REQUEST_URI']);
+            $_SERVER['REQUEST_URI'] = str_replace(['"', "'", '<', '>'], ['%22', '%27', '%3C', '%3E'], $_SERVER['REQUEST_URI']);
             $aURL = parse_url($_SERVER['REQUEST_URI']);
         }
 
         // Fill in the empty values
-        if(empty($aURL['scheme']))
+        if (empty($aURL['scheme']))
         {
-            if(!empty($_SERVER['HTTP_SCHEME']))
+            if (!empty($_SERVER['HTTP_SCHEME']))
             {
                 $aURL['scheme'] = $_SERVER['HTTP_SCHEME'];
             }
@@ -44,11 +44,11 @@ 
             }
         }
 
-        if(empty($aURL['host']))
+        if (empty($aURL['host']))
         {
-            if(!empty($_SERVER['HTTP_X_FORWARDED_HOST']))
+            if (!empty($_SERVER['HTTP_X_FORWARDED_HOST']))
             {
-                if(strpos($_SERVER['HTTP_X_FORWARDED_HOST'], ':') > 0)
+                if (strpos($_SERVER['HTTP_X_FORWARDED_HOST'], ':') > 0)
                 {
                     list($aURL['host'], $aURL['port']) = explode(':', $_SERVER['HTTP_X_FORWARDED_HOST']);
                 }
@@ -57,9 +57,9 @@ 
                     $aURL['host'] = $_SERVER['HTTP_X_FORWARDED_HOST'];
                 }
             }
-            elseif(!empty($_SERVER['HTTP_HOST']))
+            elseif (!empty($_SERVER['HTTP_HOST']))
             {
-                if(strpos($_SERVER['HTTP_HOST'], ':') > 0)
+                if (strpos($_SERVER['HTTP_HOST'], ':') > 0)
                 {
                     list($aURL['host'], $aURL['port']) = explode(':', $_SERVER['HTTP_HOST']);
                 }
@@ -68,7 +68,7 @@ 
                     $aURL['host'] = $_SERVER['HTTP_HOST'];
                 }
             }
-            elseif(!empty($_SERVER['SERVER_NAME']))
+            elseif (!empty($_SERVER['SERVER_NAME']))
             {
                 $aURL['host'] = $_SERVER['SERVER_NAME'];
             }
@@ -78,19 +78,19 @@ 
             }
         }
 
-        if(empty($aURL['port']) && !empty($_SERVER['SERVER_PORT']))
+        if (empty($aURL['port']) && !empty($_SERVER['SERVER_PORT']))
         {
             $aURL['port'] = $_SERVER['SERVER_PORT'];
         }
 
-        if(!empty($aURL['path']) && strlen(basename($aURL['path'])) == 0)
+        if (!empty($aURL['path']) && strlen(basename($aURL['path'])) == 0)
         {
             unset($aURL['path']);
         }
 
-        if(empty($aURL['path']))
+        if (empty($aURL['path']))
         {
-            if(!empty($_SERVER['PATH_INFO']))
+            if (!empty($_SERVER['PATH_INFO']))
             {
                 $sPath = parse_url($_SERVER['PATH_INFO']);
             }
@@ -98,61 +98,61 @@ 
             {
                 $sPath = parse_url($_SERVER['PHP_SELF']);
             }
-            if(isset($sPath['path']))
+            if (isset($sPath['path']))
             {
-                $aURL['path'] = str_replace(['"',"'",'<','>'], ['%22','%27','%3C','%3E'], $sPath['path']);
+                $aURL['path'] = str_replace(['"', "'", '<', '>'], ['%22', '%27', '%3C', '%3E'], $sPath['path']);
             }
             unset($sPath);
         }
 
-        if(empty($aURL['query']) && !empty($_SERVER['QUERY_STRING']))
+        if (empty($aURL['query']) && !empty($_SERVER['QUERY_STRING']))
         {
             $aURL['query'] = $_SERVER['QUERY_STRING'];
         }
 
-        if(!empty($aURL['query']))
+        if (!empty($aURL['query']))
         {
-            $aURL['query'] = '?'.$aURL['query'];
+            $aURL['query'] = '?' . $aURL['query'];
         }
 
         // Build the URL: Start with scheme, user and pass
-        $sURL = $aURL['scheme'].'://';
-        if(!empty($aURL['user']))
+        $sURL = $aURL['scheme'] . '://';
+        if (!empty($aURL['user']))
         {
-            $sURL.= $aURL['user'];
-            if(!empty($aURL['pass']))
+            $sURL .= $aURL['user'];
+            if (!empty($aURL['pass']))
             {
-                $sURL.= ':'.$aURL['pass'];
+                $sURL .= ':' . $aURL['pass'];
             }
-            $sURL.= '@';
+            $sURL .= '@';
         }
 
         // Add the host
-        $sURL.= $aURL['host'];
+        $sURL .= $aURL['host'];
 
         // Add the port if needed
-        if(!empty($aURL['port'])
+        if (!empty($aURL['port'])
                 && (($aURL['scheme'] == 'http' && $aURL['port'] != 80)
                         || ($aURL['scheme'] == 'https' && $aURL['port'] != 443)))
         {
-            $sURL.= ':'.$aURL['port'];
+            $sURL .= ':' . $aURL['port'];
         }
 
         // Add the path and the query string
-        $sURL.= $aURL['path'].@$aURL['query'];
+        $sURL .= $aURL['path'] . @$aURL['query'];
 
         // Clean up
         unset($aURL);
 
         $aURL = explode("?", $sURL);
 
-        if(1 < count($aURL))
+        if (1 < count($aURL))
         {
             $aQueries = explode("&", $aURL[1]);
 
-            foreach($aQueries as $sKey => $sQuery)
+            foreach ($aQueries as $sKey => $sQuery)
             {
-                if("jxnGenerate" == substr($sQuery, 0, 11))
+                if ("jxnGenerate" == substr($sQuery, 0, 11))
                     unset($aQueries[$sKey]);
             }
 

Braces +10 added lines, -16 removed lines

@@ -37,8 +37,7 @@ 
             if(!empty($_SERVER['HTTP_SCHEME']))
             {
                 $aURL['scheme'] = $_SERVER['HTTP_SCHEME'];
-            }
-            else
+            } else
             {
                 $aURL['scheme'] = ((!empty($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) != 'off') ? 'https' : 'http');
             }
@@ -51,28 +50,23 @@ 
                 if(strpos($_SERVER['HTTP_X_FORWARDED_HOST'], ':') > 0)
                 {
                     list($aURL['host'], $aURL['port']) = explode(':', $_SERVER['HTTP_X_FORWARDED_HOST']);
-                }
-                else
+                } else
                 {
                     $aURL['host'] = $_SERVER['HTTP_X_FORWARDED_HOST'];
                 }
-            }
-            elseif(!empty($_SERVER['HTTP_HOST']))
+            } elseif(!empty($_SERVER['HTTP_HOST']))
             {
                 if(strpos($_SERVER['HTTP_HOST'], ':') > 0)
                 {
                     list($aURL['host'], $aURL['port']) = explode(':', $_SERVER['HTTP_HOST']);
-                }
-                else
+                } else
                 {
                     $aURL['host'] = $_SERVER['HTTP_HOST'];
                 }
-            }
-            elseif(!empty($_SERVER['SERVER_NAME']))
+            } elseif(!empty($_SERVER['SERVER_NAME']))
             {
                 $aURL['host'] = $_SERVER['SERVER_NAME'];
-            }
-            else
+            } else
             {
                 throw new \Jaxon\Exception\URI();
             }
@@ -94,8 +88,7 @@ 
             if(!empty($_SERVER['PATH_INFO']))
             {
                 $sPath = parse_url($_SERVER['PATH_INFO']);
-            }
-            else
+            } else
             {
                 $sPath = parse_url($_SERVER['PHP_SELF']);
             }
@@ -153,8 +146,9 @@ 
         
             foreach($aQueries as $sKey => $sQuery)
             {
-                if("jxnGenerate" == substr($sQuery, 0, 11))
-                    unset($aQueries[$sKey]);
+                if("jxnGenerate" == substr($sQuery, 0, 11)) {
+                                    unset($aQueries[$sKey]);
+                }
             }
                 
             $sQueries = implode("&", $aQueries);