jaxon-php / jaxon-utils

src/Config/Config.php

Spacing +11 added lines, -12 removed lines

@@ -46,7 +46,7 @@ 
      */
     public function __construct(array $aOptions = [], string $sKeys = '')
     {
-        if(count($aOptions) > 0)
+        if (count($aOptions) > 0)
         {
             $this->setOptions($aOptions, $sKeys);
         }
@@ -80,13 +80,13 @@ 
         $sPrefix = trim($sPrefix);
         $nDepth = intval($nDepth);
         // Check the max depth
-        if($nDepth < 0 || $nDepth > 9)
+        if ($nDepth < 0 || $nDepth > 9)
         {
             throw new Exception\DataDepth($sPrefix, $nDepth);
         }
-        foreach($aOptions as $sName => $xOption)
+        foreach ($aOptions as $sName => $xOption)
         {
-            if(is_int($sName))
+            if (is_int($sName))
             {
                 continue;
             }
@@ -96,7 +96,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);
@@ -117,11 +117,11 @@ 
     {
         // Find the config array in the input data
         $aKeys = explode('.', (string)$sKeys);
-        foreach($aKeys as $sKey)
+        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 $this;
                 }
@@ -170,14 +170,13 @@ 
         $sPrefix = rtrim(trim($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);
+                    substr($sName, $sPrefixLen) : substr($sName, $sPrefixLen, $iNextDotPos - $sPrefixLen);
                 $aOptions[$sOptionName] = $sPrefix . $sOptionName;
             }
         }

src/Http/URI.php

Spacing +17 added lines, -17 removed lines

@@ -32,11 +32,11 @@ 
      */
     private function setScheme(array &$aUrl)
     {
-        if(!empty($aUrl['scheme']))
+        if (!empty($aUrl['scheme']))
         {
             return;
         }
-        if(!empty($_SERVER['HTTP_SCHEME']))
+        if (!empty($_SERVER['HTTP_SCHEME']))
         {
             $aUrl['scheme'] = $_SERVER['HTTP_SCHEME'];
             return;
@@ -54,11 +54,11 @@ 
      */
     private function setHostFromServer(array &$aUrl, string $sKey)
     {
-        if(!empty($aUrl['host']) && !empty($_SERVER[$sKey]))
+        if (!empty($aUrl['host']) && !empty($_SERVER[$sKey]))
         {
             return;
         }
-        if(strpos($_SERVER[$sKey], ':') === false)
+        if (strpos($_SERVER[$sKey], ':') === false)
         {
             $aUrl['host'] = $_SERVER[$sKey];
             return;
@@ -77,11 +77,11 @@ 
         $this->setHostFromServer($aUrl, 'HTTP_X_FORWARDED_HOST');
         $this->setHostFromServer($aUrl, 'HTTP_HOST');
         $this->setHostFromServer($aUrl, 'SERVER_NAME');
-        if(empty($aUrl['host']))
+        if (empty($aUrl['host']))
         {
             throw new Error();
         }
-        if(empty($aUrl['port']) && !empty($_SERVER['SERVER_PORT']))
+        if (empty($aUrl['port']) && !empty($_SERVER['SERVER_PORT']))
         {
             $aUrl['port'] = $_SERVER['SERVER_PORT'];
         }
@@ -94,16 +94,16 @@ 
      */
     private function setPath(array &$aUrl)
     {
-        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']))
         {
             return;
         }
         $sPath = parse_url(!empty($_SERVER['PATH_INFO']) ? $_SERVER['PATH_INFO'] : $_SERVER['PHP_SELF']);
-        if(isset($sPath['path']))
+        if (isset($sPath['path']))
         {
             $aUrl['path'] = str_replace(['"', "'", '<', '>'], ['%22', '%27', '%3C', '%3E'], $sPath['path']);
         }
@@ -116,12 +116,12 @@ 
      */
     private function getUser(array $aUrl)
     {
-        if(empty($aUrl['user']))
+        if (empty($aUrl['user']))
         {
             return '';
         }
         $sUrl = $aUrl['user'];
-        if(!empty($aUrl['pass']))
+        if (!empty($aUrl['pass']))
         {
             $sUrl .= ':' . $aUrl['pass'];
         }
@@ -135,7 +135,7 @@ 
      */
     private function getPort(array $aUrl)
     {
-        if(!empty($aUrl['port']) &&
+        if (!empty($aUrl['port']) &&
             (($aUrl['scheme'] === 'http' && $aUrl['port'] != 80) ||
                 ($aUrl['scheme'] === 'https' && $aUrl['port'] != 443)))
         {
@@ -151,7 +151,7 @@ 
      */
     private function setQuery(array &$aUrl)
     {
-        if(empty($aUrl['query']))
+        if (empty($aUrl['query']))
         {
             $aUrl['query'] = empty($_SERVER['QUERY_STRING']) ? '' : $_SERVER['QUERY_STRING'];
         }
@@ -164,14 +164,14 @@ 
      */
     private function getQuery(array $aUrl)
     {
-        if(empty($aUrl['query']))
+        if (empty($aUrl['query']))
         {
             return '';
         }
         $aQueries = explode("&", $aUrl['query']);
-        foreach($aQueries as $sKey => $sQuery)
+        foreach ($aQueries as $sKey => $sQuery)
         {
-            if(substr($sQuery, 0, 11) === 'jxnGenerate')
+            if (substr($sQuery, 0, 11) === 'jxnGenerate')
             {
                 unset($aQueries[$sKey]);
             }
@@ -189,7 +189,7 @@ 
     {
         $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']);
             $aUrl = parse_url($_SERVER['REQUEST_URI']);