jaxon-php / jaxon-utils

src/Validation/Validator.php

Spacing +6 added lines, -6 removed lines

@@ -133,7 +133,7 @@ 
     {
         $xDefault = $this->xConfig->getOption('upload.default.' . $sProperty);
         $aAllowed = $this->xConfig->getOption('upload.files.' . $sName . '.' . $sProperty, $xDefault);
-        if(is_array($aAllowed) && !in_array($sValue, $aAllowed))
+        if (is_array($aAllowed) && !in_array($sValue, $aAllowed))
         {
             $this->sErrorMessage = $this->xTranslator->trans('errors.upload.' . $sField, [$sField => $sValue]);
             return false;
@@ -154,7 +154,7 @@ 
     {
         $xDefault = $this->xConfig->getOption('upload.default.' . $sProperty, 0);
         $iSize = $this->xConfig->getOption('upload.files.' . $sName . '.' . $sProperty, $xDefault);
-        if($iSize > 0 && (
+        if ($iSize > 0 && (
             ($sProperty == 'max-size' && $iFileSize > $iSize) ||
             ($sProperty == 'min-size' && $iFileSize < $iSize)))
         {
@@ -176,25 +176,25 @@ 
     {
         $this->sErrorMessage = '';
         // Verify the file extension
-        if(!$this->validateFileProperty($sName, $aUploadedFile['type'], 'types', 'type'))
+        if (!$this->validateFileProperty($sName, $aUploadedFile['type'], 'types', 'type'))
         {
             return false;
         }
 
         // Verify the file extension
-        if(!$this->validateFileProperty($sName, $aUploadedFile['extension'], 'extensions', 'extension'))
+        if (!$this->validateFileProperty($sName, $aUploadedFile['extension'], 'extensions', 'extension'))
         {
             return false;
         }
 
         // Verify the max size
-        if(!$this->validateFileSize($sName, $aUploadedFile['size'], 'max-size'))
+        if (!$this->validateFileSize($sName, $aUploadedFile['size'], 'max-size'))
         {
             return false;
         }
 
         // Verify the min size
-        if(!$this->validateFileSize($sName, $aUploadedFile['size'], 'min-size'))
+        if (!$this->validateFileSize($sName, $aUploadedFile['size'], 'min-size'))
         {
             return false;
         }

src/Template/Engine.php

Spacing +4 added lines, -4 removed lines

@@ -64,7 +64,7 @@ 
     {
         // Make the template vars available, throught a Context object.
         $xContext = new Context($this);
-        foreach($aVars as $sName => $xValue)
+        foreach ($aVars as $sName => $xValue)
         {
             $sName = (string)$sName;
             $xContext->$sName = $xValue;
@@ -94,18 +94,18 @@ 
         // Get the namespace name
         $sNamespace = '';
         $iSeparatorPosition = strrpos($sTemplate, '::');
-        if($iSeparatorPosition !== false)
+        if ($iSeparatorPosition !== false)
         {
             $sNamespace = substr($sTemplate, 0, $iSeparatorPosition);
             $sTemplate = substr($sTemplate, $iSeparatorPosition + 2);
         }
         // The default namespace is 'jaxon'
-        if(!($sNamespace = trim($sNamespace)))
+        if (!($sNamespace = trim($sNamespace)))
         {
             $sNamespace = 'jaxon';
         }
         // Check if the namespace is defined
-        if(!key_exists($sNamespace, $this->aNamespaces))
+        if (!key_exists($sNamespace, $this->aNamespaces))
         {
             return '';
         }

src/Http/URI.php

Braces +3 added lines, -6 removed lines

@@ -31,8 +31,7 @@ 
             if(strpos($_SERVER[$sKey], ':') > 0)
             {
                 list($aURL['host'], $aURL['port']) = explode(':', $_SERVER[$sKey]);
-            }
-            else
+            } else
             {
                 $aURL['host'] = $_SERVER[$sKey];
             }
@@ -65,8 +64,7 @@ 
             if(!empty($_SERVER['HTTP_SCHEME']))
             {
                 $aURL['scheme'] = $_SERVER['HTTP_SCHEME'];
-            }
-            else
+            } else
             {
                 $aURL['scheme'] = ((!empty($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) != 'off') ? 'https' : 'http');
             }
@@ -95,8 +93,7 @@ 
             if(!empty($_SERVER['PATH_INFO']))
             {
                 $sPath = parse_url($_SERVER['PATH_INFO']);
-            }
-            else
+            } else
             {
                 $sPath = parse_url($_SERVER['PHP_SELF']);
             }

Spacing +19 added lines, -19 removed lines

@@ -26,9 +26,9 @@ 
      */
     private function getHostFromServer(array &$aURL, string $sKey)
     {
-        if(empty($aURL['host']) && !empty($_SERVER[$sKey]))
+        if (empty($aURL['host']) && !empty($_SERVER[$sKey]))
         {
-            if(strpos($_SERVER[$sKey], ':') > 0)
+            if (strpos($_SERVER[$sKey], ':') > 0)
             {
                 list($aURL['host'], $aURL['port']) = explode(':', $_SERVER[$sKey]);
             }
@@ -49,16 +49,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']);
             $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'];
             }
@@ -71,24 +71,24 @@ 
         $this->getHostFromServer($aURL, 'HTTP_X_FORWARDED_HOST');
         $this->getHostFromServer($aURL, 'HTTP_HOST');
         $this->getHostFromServer($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'];
         }
 
-        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']);
             }
@@ -96,29 +96,29 @@ 
             {
                 $sPath = parse_url($_SERVER['PHP_SELF']);
             }
-            if(isset($sPath['path']))
+            if (isset($sPath['path']))
             {
                 $aURL['path'] = str_replace(['"', "'", '<', '>'], ['%22', '%27', '%3C', '%3E'], $sPath['path']);
             }
             unset($sPath);
         }
 
-        if(empty($aURL['query']))
+        if (empty($aURL['query']))
         {
             $aURL['query'] = empty($_SERVER['QUERY_STRING']) ? '' : $_SERVER['QUERY_STRING'];
         }
 
-        if(!empty($aURL['query']))
+        if (!empty($aURL['query']))
         {
             $aURL['query'] = '?' . $aURL['query'];
         }
 
         // Build the URL: Start with scheme, user and pass
         $sURL = $aURL['scheme'] . '://';
-        if(!empty($aURL['user']))
+        if (!empty($aURL['user']))
         {
             $sURL .= $aURL['user'];
-            if(!empty($aURL['pass']))
+            if (!empty($aURL['pass']))
             {
                 $sURL .= ':' . $aURL['pass'];
             }
@@ -129,7 +129,7 @@ 
         $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)))
         {
@@ -144,13 +144,13 @@ 
 
         $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]);
                 }

src/Translation/Translator.php

Braces +1 added lines, -2 removed lines

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

Spacing +9 added lines, -9 removed lines

@@ -61,11 +61,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))
             {
                 // Save this translation
                 $this->aTranslations[$sLanguage][$sName] = $xTranslation;
@@ -88,17 +88,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(!array_key_exists($sLanguage, $this->aTranslations))
+        if (!array_key_exists($sLanguage, $this->aTranslations))
         {
             $this->aTranslations[$sLanguage] = [];
         }
@@ -117,20 +117,20 @@ 
     public function trans(string $sText, array $aPlaceHolders = [], string $sLanguage = '')
     {
         $sText = trim($sText);
-        if(!$sLanguage)
+        if (!$sLanguage)
         {
             $sLanguage = $this->xConfig->getOption('language', 'en');
         }
-        if(!$sLanguage)
+        if (!$sLanguage)
         {
             $sLanguage = $this->sDefaultLocale;
         }
-        if(!array_key_exists($sLanguage, $this->aTranslations) || !array_key_exists($sText, $this->aTranslations[$sLanguage]))
+        if (!array_key_exists($sLanguage, $this->aTranslations) || !array_key_exists($sText, $this->aTranslations[$sLanguage]))
         {
             return $sText;
         }
         $message = $this->aTranslations[$sLanguage][$sText];
-        foreach($aPlaceHolders as $name => $value)
+        foreach ($aPlaceHolders as $name => $value)
         {
             $message = str_replace(':' . $name, $value, $message);
         }

src/Config/Reader.php

Spacing +2 added lines, -2 removed lines

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

src/Config/Json.php

Spacing +2 added lines, -2 removed lines

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

src/Config/Php.php

Spacing +2 added lines, -2 removed lines

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

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((string)$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/Config/Yaml.php

Spacing +3 added lines, -3 removed lines

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