jaxon-php / jaxon-mono

jaxon-examples/public/ajax.php

Spacing +1 added lines, -1 removed lines

@@ -4,7 +4,7 @@
 
 $menus = menu_entries();
 $example = menu_current();
-if(isset($menus[$example]))
+if (isset($menus[$example]))
 {
     require dirname(__DIR__) . "/examples/$example/code.php";
 

jaxon-utils/src/Http/UriDetector.php

Spacing +24 added lines, -24 removed lines

@@ -43,16 +43,16 @@ 
      */
     private function setScheme(array $aServerParams): void
     {
-        if(isset($this->aUrl['scheme']))
+        if (isset($this->aUrl['scheme']))
         {
             return;
         }
-        if(isset($aServerParams['HTTP_SCHEME']))
+        if (isset($aServerParams['HTTP_SCHEME']))
         {
             $this->aUrl['scheme'] = $aServerParams['HTTP_SCHEME'];
             return;
         }
-        if((isset($aServerParams['HTTPS']) && strtolower($aServerParams['HTTPS']) === 'on') ||
+        if ((isset($aServerParams['HTTPS']) && strtolower($aServerParams['HTTPS']) === 'on') ||
             (isset($aServerParams['HTTP_X_FORWARDED_SSL']) && $aServerParams['HTTP_X_FORWARDED_SSL'] === 'on') ||
             (isset($aServerParams['HTTP_X_FORWARDED_PROTO']) && $aServerParams['HTTP_X_FORWARDED_PROTO'] === 'https'))
         {
@@ -72,11 +72,11 @@ 
      */
     private function setHostFromServer(array $aServerParams, string $sKey): void
     {
-        if(isset($this->aUrl['host']) || empty($aServerParams[$sKey]))
+        if (isset($this->aUrl['host']) || empty($aServerParams[$sKey]))
         {
             return;
         }
-        if(strpos($aServerParams[$sKey], ':') === false)
+        if (strpos($aServerParams[$sKey], ':') === false)
         {
             $this->aUrl['host'] = $aServerParams[$sKey];
             return;
@@ -95,11 +95,11 @@ 
         $this->setHostFromServer($aServerParams, 'HTTP_X_FORWARDED_HOST');
         $this->setHostFromServer($aServerParams, 'HTTP_HOST');
         $this->setHostFromServer($aServerParams, 'SERVER_NAME');
-        if(empty($this->aUrl['host']))
+        if (empty($this->aUrl['host']))
         {
             throw new UriException();
         }
-        if(empty($this->aUrl['port']) && isset($aServerParams['SERVER_PORT']))
+        if (empty($this->aUrl['port']) && isset($aServerParams['SERVER_PORT']))
         {
             $this->aUrl['port'] = $aServerParams['SERVER_PORT'];
         }
@@ -112,16 +112,16 @@ 
      */
     private function setPath(array $aServerParams): void
     {
-        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($aServerParams['PATH_INFO'] ?? ($aServerParams['PHP_SELF'] ?? ''));
-        if(isset($aPath['path']))
+        if (isset($aPath['path']))
         {
             $this->aUrl['path'] = $aPath['path'];
         }
@@ -140,12 +140,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'];
         }
@@ -157,7 +157,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)))
         {
@@ -173,7 +173,7 @@ 
      */
     private function setQuery(array $aServerParams): void
     {
-        if(empty($this->aUrl['query']))
+        if (empty($this->aUrl['query']))
         {
             $this->aUrl['query'] = $aServerParams['QUERY_STRING'] ?? '';
         }
@@ -184,19 +184,19 @@ 
      */
     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]);
             }
         }
-        if(empty($aQueries))
+        if (empty($aQueries))
         {
             return '';
         }
@@ -215,7 +215,7 @@ 
     {
         $this->aUrl = [];
         // Try to get the request URL
-        if(isset($aServerParams['REQUEST_URI']))
+        if (isset($aServerParams['REQUEST_URI']))
         {
             $this->aUrl = parse_url($aServerParams['REQUEST_URI']);
         }
@@ -255,17 +255,17 @@ 
     {
         $aQueryParts = [];
         parse_str($sQueryPart, $aQueryParts);
-        if(empty($aQueryParts))
+        if (empty($aQueryParts))
         {
             // Couldn't break up the query, but there's one there.
             // Possibly "http://url/page.html?query1234" type of query?
             // Try to get data from the server environment var.
             parse_str($aServerParams['QUERY_STRING'] ?? '', $aQueryParts);
         }
-        if(($aQueryParts))
+        if (($aQueryParts))
         {
             $aNewQueryParts = [];
-            foreach($aQueryParts as $sKey => $sValue)
+            foreach ($aQueryParts as $sKey => $sValue)
             {
                 $aNewQueryParts[] = $this->makeQueryPart($sQueryPart, $sKey, $sValue);
             }
@@ -288,13 +288,13 @@ 
         // Can't just use parse_url() cos we could be dealing with a relative URL which parse_url() can't deal with.
         $sURL = trim($sURL);
         $nQueryStart = strpos($sURL, '?', strrpos($sURL, '/'));
-        if($nQueryStart === false)
+        if ($nQueryStart === false)
         {
             return $sURL;
         }
         $nQueryStart++;
         $nQueryEnd = strpos($sURL, '#', $nQueryStart);
-        if($nQueryEnd === false)
+        if ($nQueryEnd === false)
         {
             $nQueryEnd = strlen($sURL);
         }

jaxon-utils/src/Template/Context.php

Spacing +5 added lines, -6 removed lines

@@ -138,13 +138,13 @@ 
         // Get the namespace name
         $namespace = $this->__default_namespace__;
         $separatorPosition = strrpos($template, '::');
-        if($separatorPosition !== false)
+        if ($separatorPosition !== false)
         {
             $namespace = substr($template, 0, $separatorPosition);
             $template = substr($template, $separatorPosition + 2);
         }
         // Check if the namespace is defined
-        if(!isset($this->__namespaces__[$namespace]))
+        if (!isset($this->__namespaces__[$namespace]))
         {
             return $template;
         }
@@ -165,13 +165,13 @@ 
     {
         // Get the template path
         $templatePath = $this->__path();
-        if(!@is_readable($templatePath))
+        if (!@is_readable($templatePath))
         {
             return '';
         }
 
         // Save the template properties.
-        foreach($vars as $name => $value)
+        foreach ($vars as $name => $value)
         {
             $this->__set((string)$name, $value);
         }
@@ -182,8 +182,7 @@ 
             include $templatePath;
             $content = ob_get_clean();
 
-            return $this->__extends__ === null ? $content :
-                // Render the extended template with the same properties.
+            return $this->__extends__ === null ? $content : // Render the extended template with the same properties.
                 $this->__extends__->__render($this->__properties__);
         };
 

jaxon-utils/src/Translation/Translator.php

Spacing +12 added lines, -12 removed lines

@@ -56,7 +56,7 @@ 
      */
     public function setLocale(string $sLocale): void
     {
-        if(($sLocale = trim($sLocale)))
+        if (($sLocale = trim($sLocale)))
         {
             $this->sDefaultLocale = $sLocale;
         }
@@ -73,11 +73,11 @@ 
      */
     private function _loadTranslations(string $sLanguage, string $sPrefix, array $aTranslations): void
     {
-        foreach($aTranslations as $sKey => $xTranslation)
+        foreach ($aTranslations as $sKey => $xTranslation)
         {
             $sKey = trim($sKey);
             $sKey = ($sPrefix) ? $sPrefix . '.' . $sKey : $sKey;
-            if(is_array($xTranslation))
+            if (is_array($xTranslation))
             {
                 // Recursively read the translations in the array
                 $this->_loadTranslations($sLanguage, $sKey, $xTranslation);
@@ -100,18 +100,18 @@ 
      */
     public function loadTranslations(string $sFilePath, string $sLanguage): bool
     {
-        if(!file_exists($sFilePath))
+        if (!file_exists($sFilePath))
         {
             return false;
         }
         $aTranslations = require($sFilePath);
-        if(!is_array($aTranslations))
+        if (!is_array($aTranslations))
         {
             return false;
         }
 
         // Load the translations
-        if(!isset($this->aTranslations[$sLanguage]))
+        if (!isset($this->aTranslations[$sLanguage]))
         {
             $this->aTranslations[$sLanguage] = [];
         }
@@ -133,16 +133,16 @@ 
     public function trans(string $sText, array $aPlaceHolders = [], string $sLanguage = ''): string
     {
         $sText = trim($sText);
-        if(empty($sLanguage))
+        if (empty($sLanguage))
         {
             $sLanguage = $this->sDefaultLocale;
         }
-        if(!isset($this->aTranslations[$sLanguage][$sText]))
+        if (!isset($this->aTranslations[$sLanguage][$sText]))
         {
             return $sText;
         }
         $sMessage = $this->aTranslations[$sLanguage][$sText];
-        if(!empty($aPlaceHolders))
+        if (!empty($aPlaceHolders))
         {
             $aVars = array_map(function($sVar) {
                 return ':' . $sVar;
@@ -162,16 +162,16 @@ 
      */
     public function translations(string $sKey, string $sLanguage = ''): array
     {
-        if(empty($sLanguage))
+        if (empty($sLanguage))
         {
             $sLanguage = $this->sDefaultLocale;
         }
         $aKeys = explode('.', $sKey);
 
         $aTranslations = $this->aRawTranslations[$sLanguage];
-        foreach($aKeys as $sKey)
+        foreach ($aKeys as $sKey)
         {
-            if($sKey !== '')
+            if ($sKey !== '')
             {
                 $aTranslations = $aTranslations[$sKey] ?? [];
             }

Braces +1 added lines, -2 removed lines

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

jaxon-utils/src/File/FileMinifier.php

Spacing +3 added lines, -3 removed lines

@@ -37,7 +37,7 @@ 
         {
             return file_get_contents($sPath);
         }
-        catch(Exception $e)
+        catch (Exception $e)
         {
             return false;
         }
@@ -56,7 +56,7 @@ 
         {
             return Minifier::minify($sCode);
         }
-        catch(Exception $e)
+        catch (Exception $e)
         {
             return false;
         }
@@ -72,7 +72,7 @@ 
      */
     public function minify(string $sJsFile, string $sMinFile): bool
     {
-        if(($sJsCode = $this->readFile($sJsFile)) === false ||
+        if (($sJsCode = $this->readFile($sJsFile)) === false ||
             ($sMinCode = $this->minifyCode($sJsCode)) === false)
         {
             return false;

Braces +2 added lines, -4 removed lines

@@ -36,8 +36,7 @@ 
         try
         {
             return file_get_contents($sPath);
-        }
-        catch(Exception $e)
+        } catch(Exception $e)
         {
             return false;
         }
@@ -55,8 +54,7 @@ 
         try
         {
             return Minifier::minify($sCode);
-        }
-        catch(Exception $e)
+        } catch(Exception $e)
         {
             return false;
         }

jaxon-config/tests/TestConfig/ConfigTest.php

Spacing +1 added lines, -1 removed lines

@@ -35,7 +35,7 @@
 
     protected function setUp(): void
     {
-        $this->sConfigDir = __DIR__ .  '/../config';
+        $this->sConfigDir = __DIR__ . '/../config';
         $this->xConfigSetter = new ConfigSetter();
         $this->xConfigReader = new ConfigReader($this->xConfigSetter);
         $this->xConfig = $this->xConfigSetter->newConfig(['core' => ['language' => 'en']]);

jaxon-config/src/Config.php

Spacing +2 added lines, -2 removed lines

@@ -90,11 +90,11 @@
         $sKey = trim($sKey, ' .');
         $aKeys = Value::explodeName($sKey);
         $aValues = $this->aValues;
-        foreach($aKeys as $_sKey)
+        foreach ($aKeys as $_sKey)
         {
             $aValues = $aValues[$_sKey] ?? [];
         }
-        if(!Value::containsOptions($aValues))
+        if (!Value::containsOptions($aValues))
         {
             return [];
         }

jaxon-config/src/Reader/Value.php

Spacing +3 added lines, -3 removed lines

@@ -34,13 +34,13 @@
      */
     public static function containsOptions($xValue): bool
     {
-        if(!is_array($xValue) || count($xValue) === 0)
+        if (!is_array($xValue) || count($xValue) === 0)
         {
             return false;
         }
-        foreach(array_keys($xValue) as $xKey)
+        foreach (array_keys($xValue) as $xKey)
         {
-            if(!is_string($xKey))
+            if (!is_string($xKey))
             {
                 return false;
             }

jaxon-config/src/Reader/PhpReader.php

Spacing +2 added lines, -2 removed lines

@@ -35,13 +35,13 @@
     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);
         }