jaxon-php / jaxon-utils

src/Template/Engine.php

Spacing +3 added lines, -3 removed lines

@@ -97,18 +97,18 @@
         // Get the namespace name
         $sNamespace = '';
         $nSeparatorPosition = strrpos($sTemplate, '::');
-        if($nSeparatorPosition !== false)
+        if ($nSeparatorPosition !== false)
         {
             $sNamespace = substr($sTemplate, 0, $nSeparatorPosition);
             $sTemplate = substr($sTemplate, $nSeparatorPosition + 2);
         }
         // The default namespace is 'jaxon'
-        if(!($sNamespace = trim($sNamespace)))
+        if (!($sNamespace = trim($sNamespace)))
         {
             $sNamespace = 'jaxon';
         }
         // Check if the namespace is defined
-        if(!isset($this->aNamespaces[$sNamespace]))
+        if (!isset($this->aNamespaces[$sNamespace]))
         {
             return '';
         }

src/Template/Context.php

Spacing +1 added lines, -1 removed lines

@@ -34,7 +34,7 @@
     public function __construct(Engine $engine, array $aVars)
     {
         $this->__engine__ = $engine;
-        foreach($aVars as $sName => $xValue)
+        foreach ($aVars as $sName => $xValue)
         {
             $sName = (string)$sName;
             $this->$sName = $xValue;

src/Http/UriDetector.php

Spacing +17 added lines, -17 removed lines

@@ -39,11 +39,11 @@ 
      */
     private function setScheme(array $server)
     {
-        if(isset($this->aUrl['scheme']))
+        if (isset($this->aUrl['scheme']))
         {
             return;
         }
-        if(isset($server['HTTP_SCHEME']))
+        if (isset($server['HTTP_SCHEME']))
         {
             $this->aUrl['scheme'] = $server['HTTP_SCHEME'];
             return;
@@ -61,11 +61,11 @@ 
      */
     private function setHostFromServer(array $server, string $sKey)
     {
-        if(isset($this->aUrl['host']) && isset($server[$sKey]))
+        if (isset($this->aUrl['host']) && isset($server[$sKey]))
         {
             return;
         }
-        if(strpos($server[$sKey], ':') === false)
+        if (strpos($server[$sKey], ':') === false)
         {
             $this->aUrl['host'] = $server[$sKey];
             return;
@@ -84,11 +84,11 @@ 
         $this->setHostFromServer($server, 'HTTP_X_FORWARDED_HOST');
         $this->setHostFromServer($server, 'HTTP_HOST');
         $this->setHostFromServer($server, 'SERVER_NAME');
-        if(empty($this->aUrl['host']))
+        if (empty($this->aUrl['host']))
         {
             throw new UriException();
         }
-        if(empty($this->aUrl['port']) && isset($server['SERVER_PORT']))
+        if (empty($this->aUrl['port']) && isset($server['SERVER_PORT']))
         {
             $this->aUrl['port'] = $server['SERVER_PORT'];
         }
@@ -101,16 +101,16 @@ 
      */
     private function setPath(array $server)
     {
-        if(isset($this->aUrl['path']) && strlen(basename($this->aUrl['path'])) === 0)
+        if (isset($this->aUrl['path']) && strlen(basename($this->aUrl['path'])) === 0)
         {
             unset($this->aUrl['path']);
         }
-        if(isset($this->aUrl['path']))
+        if (isset($this->aUrl['path']))
         {
             return;
         }
         $aPath = parse_url($server['PATH_INFO'] ?? $server['PHP_SELF']);
-        if(isset($aPath['path']))
+        if (isset($aPath['path']))
         {
             $this->aUrl['path'] = str_replace(['"', "'", '<', '>'], ['%22', '%27', '%3C', '%3E'], $aPath['path']);
         }
@@ -121,12 +121,12 @@ 
      */
     private function getUser(): string
     {
-        if(empty($this->aUrl['user']))
+        if (empty($this->aUrl['user']))
         {
             return '';
         }
         $sUrl = $this->aUrl['user'];
-        if(isset($this->aUrl['pass']))
+        if (isset($this->aUrl['pass']))
         {
             $sUrl .= ':' . $this->aUrl['pass'];
         }
@@ -138,7 +138,7 @@ 
      */
     private function getPort(): string
     {
-        if(isset($this->aUrl['port']) &&
+        if (isset($this->aUrl['port']) &&
             (($this->aUrl['scheme'] === 'http' && $this->aUrl['port'] != 80) ||
                 ($this->aUrl['scheme'] === 'https' && $this->aUrl['port'] != 443)))
         {
@@ -154,7 +154,7 @@ 
      */
     private function setQuery(array $server)
     {
-        if(empty($this->aUrl['query']))
+        if (empty($this->aUrl['query']))
         {
             $this->aUrl['query'] = empty($server['QUERY_STRING']) ? '' : $server['QUERY_STRING'];
         }
@@ -165,14 +165,14 @@ 
      */
     private function getQuery(): string
     {
-        if(empty($this->aUrl['query']))
+        if (empty($this->aUrl['query']))
         {
             return '';
         }
         $aQueries = explode("&", $this->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]);
             }
@@ -192,7 +192,7 @@ 
     {
         $this->aUrl = [];
         // Try to get the request URL
-        if(isset($server['REQUEST_URI']))
+        if (isset($server['REQUEST_URI']))
         {
             $sUri = str_replace(['"', "'", '<', '>'], ['%22', '%27', '%3C', '%3E'], $server['REQUEST_URI']);
             $this->aUrl = parse_url($sUri);

src/Translation/Translator.php

Spacing +9 added lines, -9 removed lines

@@ -45,7 +45,7 @@ 
      */
     public function __construct(string $sDefaultLocale)
     {
-        if(($sDefaultLocale))
+        if (($sDefaultLocale))
         {
             $this->sDefaultLocale = $sDefaultLocale;
         }
@@ -62,11 +62,11 @@ 
      */
     private function _loadTranslations(string $sLanguage, string $sPrefix, array $aTranslations)
     {
-        foreach($aTranslations as $sName => $xTranslation)
+        foreach ($aTranslations as $sName => $xTranslation)
         {
             $sName = trim($sName);
             $sName = ($sPrefix) ? $sPrefix . '.' . $sName : $sName;
-            if(is_array($xTranslation))
+            if (is_array($xTranslation))
             {
                 // Recursively read the translations in the array
                 $this->_loadTranslations($sLanguage, $sName, $xTranslation);
@@ -89,17 +89,17 @@ 
      */
     public function loadTranslations(string $sFilePath, string $sLanguage)
     {
-        if(!file_exists($sFilePath))
+        if (!file_exists($sFilePath))
         {
             return;
         }
         $aTranslations = require($sFilePath);
-        if(!is_array($aTranslations))
+        if (!is_array($aTranslations))
         {
             return;
         }
         // Load the translations
-        if(!isset($this->aTranslations[$sLanguage]))
+        if (!isset($this->aTranslations[$sLanguage]))
         {
             $this->aTranslations[$sLanguage] = [];
         }
@@ -118,16 +118,16 @@ 
     public function trans(string $sText, array $aPlaceHolders = [], string $sLanguage = ''): string
     {
         $sText = trim($sText);
-        if(!$sLanguage)
+        if (!$sLanguage)
         {
             $sLanguage = $this->sDefaultLocale;
         }
-        if(!isset($this->aTranslations[$sLanguage][$sLanguage]))
+        if (!isset($this->aTranslations[$sLanguage][$sLanguage]))
         {
             return $sText;
         }
         $sMessage = $this->aTranslations[$sLanguage][$sText];
-        if(($aPlaceHolders))
+        if (($aPlaceHolders))
         {
             $aNames = array_map(function($sName) {
                 return ':' . $sName;

Braces +1 added lines, -2 removed lines

@@ -70,8 +70,7 @@
             {
                 // Recursively read the translations in the array
                 $this->_loadTranslations($sLanguage, $sName, $xTranslation);
-            }
-            else
+            } else
             {
                 // Save this translation
                 $this->aTranslations[$sLanguage][$sName] = $xTranslation;

src/Config/File/Json.php

Spacing +2 added lines, -2 removed lines

@@ -37,13 +37,13 @@
     public static function read(string $sConfigFile): array
     {
         $sConfigFile = realpath($sConfigFile);
-        if(!is_readable($sConfigFile))
+        if (!is_readable($sConfigFile))
         {
             throw new FileAccess($sConfigFile);
         }
         $sFileContent = file_get_contents($sConfigFile);
         $aConfigOptions = json_decode($sFileContent, true);
-        if(!is_array($aConfigOptions))
+        if (!is_array($aConfigOptions))
         {
             throw new FileContent($sConfigFile);
         }

src/Config/File/Yaml.php

Spacing +3 added lines, -3 removed lines

@@ -39,16 +39,16 @@
     public static function read(string $sConfigFile): array
     {
         $sConfigFile = realpath($sConfigFile);
-        if(!extension_loaded('yaml'))
+        if (!extension_loaded('yaml'))
         {
             throw new YamlExtension();
         }
-        if(!is_readable($sConfigFile))
+        if (!is_readable($sConfigFile))
         {
             throw new FileAccess($sConfigFile);
         }
         $aConfigOptions = yaml_parse_file($sConfigFile);
-        if(!is_array($aConfigOptions))
+        if (!is_array($aConfigOptions))
         {
             throw new FileContent($sConfigFile);
         }

src/Config/File/Php.php

Spacing +2 added lines, -2 removed lines

@@ -35,12 +35,12 @@
     public static function read(string $sConfigFile): array
     {
         $sConfigFile = realpath($sConfigFile);
-        if(!is_readable($sConfigFile))
+        if (!is_readable($sConfigFile))
         {
             throw new FileAccess($sConfigFile);
         }
         $aConfigOptions = include($sConfigFile);
-        if(!is_array($aConfigOptions))
+        if (!is_array($aConfigOptions))
         {
             throw new FileContent($sConfigFile);
         }

src/Config/Config.php

Spacing +11 added lines, -12 removed lines

@@ -45,7 +45,7 @@ 
      */
     public function __construct(array $aOptions = [], string $sKeys = '')
     {
-        if(count($aOptions) > 0)
+        if (count($aOptions) > 0)
         {
             $this->setOptions($aOptions, $sKeys);
         }
@@ -78,13 +78,13 @@ 
     {
         $sPrefix = trim($sPrefix);
         // Check the max depth
-        if($nDepth < 0 || $nDepth > 9)
+        if ($nDepth < 0 || $nDepth > 9)
         {
             throw new DataDepth($sPrefix, $nDepth);
         }
-        foreach($aOptions as $sName => $xOption)
+        foreach ($aOptions as $sName => $xOption)
         {
-            if(is_int($sName))
+            if (is_int($sName))
             {
                 continue;
             }
@@ -94,7 +94,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);
@@ -115,11 +115,11 @@ 
     {
         // Find the config array in the input data
         $aKeys = explode('.', $sKeys);
-        foreach($aKeys as $sKey)
+        foreach ($aKeys as $sKey)
         {
-            if(($sKey))
+            if (($sKey))
             {
-                if(!isset($aOptions[$sKey]) || !is_array($aOptions[$sKey]))
+                if (!isset($aOptions[$sKey]) || !is_array($aOptions[$sKey]))
                 {
                     return $this;
                 }
@@ -168,14 +168,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)
             {
                 $nNextDotPos = strpos($sName, '.', $sPrefixLen);
                 $sOptionName = $nNextDotPos === false ?
-                    substr($sName, $sPrefixLen) :
-                    substr($sName, $sPrefixLen, $nNextDotPos - $sPrefixLen);
+                    substr($sName, $sPrefixLen) : substr($sName, $sPrefixLen, $nNextDotPos - $sPrefixLen);
                 $aOptions[$sOptionName] = $sPrefix . $sOptionName;
             }
         }

src/Config/Reader.php

Spacing +2 added lines, -2 removed lines

@@ -45,13 +45,13 @@
      */
     public function read(string $sConfigFile): array
     {
-        if(!($sConfigFile = trim($sConfigFile)))
+        if (!($sConfigFile = trim($sConfigFile)))
         {
             return [];
         }
 
         $sExt = pathinfo($sConfigFile, PATHINFO_EXTENSION);
-        switch($sExt)
+        switch ($sExt)
         {
         case 'php':
             $aConfigOptions = File\Php::read($sConfigFile);