jaxon-php / jaxon-core

src/Utils/Config/Json.php

Spacing +3 added lines, -3 removed lines

@@ -29,13 +29,13 @@ 
     public static function read($sConfigFile, $sLibKey = '', $sAppKey = null)
     {
         $sConfigFile = realpath($sConfigFile);
-        if(!is_readable($sConfigFile))
+        if (!is_readable($sConfigFile))
         {
             throw new \Jaxon\Exception\Config\File(jaxon_trans('config.errors.file.access', array('path' => $sConfigFile)));
         }
         $sFileContent = file_get_contents($sConfigFile);
         $aConfigOptions = json_decode($sFileContent, true);
-        if(!is_array($aConfigOptions))
+        if (!is_array($aConfigOptions))
         {
             throw new \Jaxon\Exception\Config\File(jaxon_trans('config.errors.file.content', array('path' => $sConfigFile)));
         }
@@ -44,7 +44,7 @@ 
         $jaxon = jaxon();
         $jaxon->setOptions($aConfigOptions, $sLibKey);
         $config = null;
-        if(is_string($sAppKey))
+        if (is_string($sAppKey))
         {
             $config = new Config();
             $config->setOptions($aConfigOptions, $sAppKey);

src/Utils/Config/Yaml.php

Spacing +4 added lines, -4 removed lines

@@ -29,16 +29,16 @@ 
     public static function read($sConfigFile, $sLibKey = '', $sAppKey = null)
     {
         $sConfigFile = realpath($sConfigFile);
-        if(!extension_loaded('yaml'))
+        if (!extension_loaded('yaml'))
         {
             throw new \Jaxon\Exception\Config\Yaml(jaxon_trans('config.errors.yaml.install'));
         }
-        if(!is_readable($sConfigFile))
+        if (!is_readable($sConfigFile))
         {
             throw new \Jaxon\Exception\Config\File(jaxon_trans('config.errors.file.access', array('path' => $sConfigFile)));
         }
         $aConfigOptions = yaml_parse_file($sConfigFile);
-        if(!is_array($aConfigOptions))
+        if (!is_array($aConfigOptions))
         {
             throw new \Jaxon\Exception\Config\File(jaxon_trans('config.errors.file.content', array('path' => $sConfigFile)));
         }
@@ -46,7 +46,7 @@ 
         // Setup the config options into the library.
         $jaxon = jaxon();
         $jaxon->setOptions($aConfigOptions, $sLibKey);
-        if(!is_string($sAppKey))
+        if (!is_string($sAppKey))
         {
             return null;
         }

src/Utils/Config/Php.php

Spacing +3 added lines, -3 removed lines

@@ -29,12 +29,12 @@ 
     public static function read($sConfigFile, $sLibKey = '', $sAppKey = null)
     {
         $sConfigFile = realpath($sConfigFile);
-        if(!is_readable($sConfigFile))
+        if (!is_readable($sConfigFile))
         {
             throw new \Jaxon\Exception\Config\File(jaxon_trans('config.errors.file.access', array('path' => $sConfigFile)));
         }
         $aConfigOptions = include($sConfigFile);
-        if(!is_array($aConfigOptions))
+        if (!is_array($aConfigOptions))
         {
             throw new \Jaxon\Exception\Config\File(jaxon_trans('config.errors.file.content', array('path' => $sConfigFile)));
         }
@@ -42,7 +42,7 @@ 
         // Setup the config options into the library.
         $jaxon = jaxon();
         $jaxon->setOptions($aConfigOptions, $sLibKey);
-        if(!is_string($sAppKey))
+        if (!is_string($sAppKey))
         {
             return null;
         }

src/Request/Parameter.php

Spacing +8 added lines, -8 removed lines

@@ -91,19 +91,19 @@ 
      */
     public static function make($xValue)
     {
-        if($xValue instanceof Interfaces\Parameter)
+        if ($xValue instanceof Interfaces\Parameter)
         {
             return $xValue;
         }
-        elseif(is_numeric($xValue))
+        elseif (is_numeric($xValue))
         {
             return new Parameter(Jaxon::NUMERIC_VALUE, $xValue);
         }
-        elseif(is_string($xValue))
+        elseif (is_string($xValue))
         {
             return new Parameter(Jaxon::QUOTED_VALUE, $xValue);
         }
-        elseif(is_bool($xValue))
+        elseif (is_bool($xValue))
         {
             return new Parameter(Jaxon::BOOL_VALUE, $xValue);
         }
@@ -122,7 +122,7 @@ 
     {
         $sJsCode = '';
         $sQuoteCharacter = "'";
-        switch($this->sType)
+        switch ($this->sType)
         {
         case Jaxon::FORM_VALUES:
             $sFormID = (string)$this->xValue;
@@ -130,11 +130,11 @@ 
             break;
         case Jaxon::INPUT_VALUE:
             $sInputID = (string)$this->xValue;
-            $sJsCode = "jaxon.$("  . $sQuoteCharacter . $sInputID . $sQuoteCharacter  . ").value";
+            $sJsCode = "jaxon.$(" . $sQuoteCharacter . $sInputID . $sQuoteCharacter . ").value";
             break;
         case Jaxon::CHECKED_VALUE:
             $sCheckedID = (string)$this->xValue;
-            $sJsCode = "jaxon.$("  . $sQuoteCharacter . $sCheckedID  . $sQuoteCharacter . ").checked";
+            $sJsCode = "jaxon.$(" . $sQuoteCharacter . $sCheckedID . $sQuoteCharacter . ").checked";
             break;
         case Jaxon::ELEMENT_INNERHTML:
             $sElementID = (string)$this->xValue;
@@ -153,7 +153,7 @@ 
             $sJsCode = (string)$this->xValue;
             break;
         case Jaxon::JS_VALUE:
-            if(is_array($this->xValue) || is_object($this->xValue))
+            if (is_array($this->xValue) || is_object($this->xValue))
             {
                 // Unable to use double quotes here because they cannot be handled on client side.
                 // So we are using simple quotes even if the Json standard recommends double quotes.

Braces +5 added lines, -10 removed lines

@@ -94,20 +94,16 @@ 
         if($xValue instanceof Interfaces\Parameter)
         {
             return $xValue;
-        }
-        elseif(is_numeric($xValue))
+        } elseif(is_numeric($xValue))
         {
             return new Parameter(Jaxon::NUMERIC_VALUE, $xValue);
-        }
-        elseif(is_string($xValue))
+        } elseif(is_string($xValue))
         {
             return new Parameter(Jaxon::QUOTED_VALUE, $xValue);
-        }
-        elseif(is_bool($xValue))
+        } elseif(is_bool($xValue))
         {
             return new Parameter(Jaxon::BOOL_VALUE, $xValue);
-        }
-        else // if(is_array($xValue) || is_object($xValue))
+        } else // if(is_array($xValue) || is_object($xValue))
         {
             return new Parameter(Jaxon::JS_VALUE, $xValue);
         }
@@ -158,8 +154,7 @@ 
                 // Unable to use double quotes here because they cannot be handled on client side.
                 // So we are using simple quotes even if the Json standard recommends double quotes.
                 $sJsCode = str_replace(['"'], ["'"], json_encode($this->xValue, JSON_HEX_APOS | JSON_HEX_QUOT));
-            }
-            else
+            } else
             {
                 $sJsCode = (string)$this->xValue;
             }

src/Request/Plugin/BrowserEvent.php

Spacing +15 added lines, -15 removed lines

@@ -51,11 +51,11 @@ 
 
         $this->sRequestedEvent = null;
 
-        if(isset($_GET['jxnevt']))
+        if (isset($_GET['jxnevt']))
         {
             $this->sRequestedEvent = $_GET['jxnevt'];
         }
-        if(isset($_POST['jxnevt']))
+        if (isset($_POST['jxnevt']))
         {
             $this->sRequestedEvent = $_POST['jxnevt'];
         }
@@ -80,19 +80,19 @@ 
      */
     public function register($aArgs)
     {
-        if(count($aArgs) > 1)
+        if (count($aArgs) > 1)
         {
             $sType = $aArgs[0];
 
-            if($sType == Jaxon::BROWSER_EVENT)
+            if ($sType == Jaxon::BROWSER_EVENT)
             {
                 $sEvent = $aArgs[1];
-                if(!isset($this->aEvents[$sEvent]))
+                if (!isset($this->aEvents[$sEvent]))
                 {
                     $xBrowserEvent = new \Jaxon\Support\BrowserEvent($sEvent);
-                    if(count($aArgs) > 2 && is_array($aArgs[2]))
+                    if (count($aArgs) > 2 && is_array($aArgs[2]))
                     {
-                        foreach($aArgs[2] as $sKey => $sValue)
+                        foreach ($aArgs[2] as $sKey => $sValue)
                         {
                             $xBrowserEvent->configure($sKey, $sValue);
                         }
@@ -101,13 +101,13 @@ 
                     return $xBrowserEvent->generateRequest();
                 }
             }
-            elseif($sType == Jaxon::EVENT_HANDLER)
+            elseif ($sType == Jaxon::EVENT_HANDLER)
             {
                 $sEvent = $aArgs[1];
-                if(isset($this->aEvents[$sEvent]) && isset($aArgs[2]))
+                if (isset($this->aEvents[$sEvent]) && isset($aArgs[2]))
                 {
                     $xUserFunction = $aArgs[2];
-                    if(!($xUserFunction instanceof \Jaxon\Request\Support\UserFunction))
+                    if (!($xUserFunction instanceof \Jaxon\Request\Support\UserFunction))
                     {
                         $xUserFunction = new \Jaxon\Request\Support\UserFunction($xUserFunction);
                     }
@@ -129,7 +129,7 @@ 
     public function generateHash()
     {
         $sHash = '';
-        foreach($this->aEvents as $xEvent)
+        foreach ($this->aEvents as $xEvent)
         {
             $sHash .= $xEvent->getName();
         }
@@ -144,7 +144,7 @@ 
     public function getScript()
     {
         $sCode = '';
-        foreach($this->aEvents as $xEvent)
+        foreach ($this->aEvents as $xEvent)
         {
             $sCode .= $xEvent->getScript();
         }
@@ -159,7 +159,7 @@ 
     public function canProcessRequest()
     {
         // Check the validity of the event name
-        if(($this->sRequestedEvent) && !$this->validateEvent($this->sRequestedEvent))
+        if (($this->sRequestedEvent) && !$this->validateEvent($this->sRequestedEvent))
         {
             $this->sRequestedEvent = null;
         }
@@ -173,12 +173,12 @@ 
      */
     public function processRequest()
     {
-        if(!$this->canProcessRequest())
+        if (!$this->canProcessRequest())
             return false;
 
         $aArgs = $this->getRequestManager()->process();
 
-        if(array_key_exists($this->sRequestedEvent, $this->aEvents))
+        if (array_key_exists($this->sRequestedEvent, $this->aEvents))
         {
             $this->aEvents[$this->sRequestedEvent]->fire($aArgs);
             return true;

Braces +4 added lines, -4 removed lines

@@ -100,8 +100,7 @@ 
                     $this->aEvents[$sEvent] = $xBrowserEvent;
                     return $xBrowserEvent->generateRequest();
                 }
-            }
-            elseif($sType == Jaxon::EVENT_HANDLER)
+            } elseif($sType == Jaxon::EVENT_HANDLER)
             {
                 $sEvent = $aArgs[1];
                 if(isset($this->aEvents[$sEvent]) && isset($aArgs[2]))
@@ -173,8 +172,9 @@ 
      */
     public function processRequest()
     {
-        if(!$this->canProcessRequest())
-            return false;
+        if(!$this->canProcessRequest()) {
+                    return false;
+        }
 
         $aArgs = $this->getRequestManager()->process();
 

src/Request/Support/CallableObject.php

Spacing +22 added lines, -22 removed lines

@@ -92,7 +92,7 @@ 
      */
     public function __construct($xCallable)
     {
-        if(is_string($xCallable)) // Received a class name
+        if (is_string($xCallable)) // Received a class name
         {
             $this->reflectionClass = new \ReflectionClass($xCallable);
             $this->callableObject = null;
@@ -118,12 +118,12 @@ 
      */
     private function setCallable($xCallable = null)
     {
-        if($xCallable == null)
+        if ($xCallable == null)
         {
             $xCallable = $this->reflectionClass->newInstance();
         }
         // Save the Jaxon callable object into the user callable object
-        if($this->reflectionClass->hasMethod('setJaxonCallable'))
+        if ($this->reflectionClass->hasMethod('setJaxonCallable'))
         {
             $xCallable->setJaxonCallable($this);
         }
@@ -137,7 +137,7 @@ 
      */
     public function getRegisteredObject()
     {
-        if($this->callableObject == null)
+        if ($this->callableObject == null)
         {
             $this->setCallable();
         }
@@ -165,7 +165,7 @@ 
         // The class name without the namespace.
         $name = $this->reflectionClass->getShortName();
         // Append the classpath to the name
-        if(($this->classpath))
+        if (($this->classpath))
         {
             $name = $this->classpath . '\\' . $name;
         }
@@ -212,16 +212,16 @@ 
     public function getMethods()
     {
         $aReturn = array();
-        foreach($this->reflectionClass->getMethods(\ReflectionMethod::IS_PUBLIC) as $xMethod)
+        foreach ($this->reflectionClass->getMethods(\ReflectionMethod::IS_PUBLIC) as $xMethod)
         {
             $sMethodName = $xMethod->getShortName();
             // Don't take magic __call, __construct, __destruct methods
-            if(strlen($sMethodName) > 2 && substr($sMethodName, 0, 2) == '__')
+            if (strlen($sMethodName) > 2 && substr($sMethodName, 0, 2) == '__')
             {
                 continue;
             }
             // Don't take excluded methods
-            if(in_array($sMethodName, $this->aProtectedMethods))
+            if (in_array($sMethodName, $this->aProtectedMethods))
             {
                 continue;
             }
@@ -242,37 +242,37 @@ 
     public function configure($sMethod, $sName, $sValue)
     {
         // Set the namespace
-        if($sName == 'namespace')
+        if ($sName == 'namespace')
         {
-            if($sValue != '')
+            if ($sValue != '')
                 $this->namespace = $sValue;
             return;
         }
         // Set the classpath
-        if($sName == 'classpath')
+        if ($sName == 'classpath')
         {
-            if($sValue != '')
+            if ($sValue != '')
                 $this->classpath = trim($sValue, '\\');
             return;
         }
         // Set the separator
-        if($sName == 'separator')
+        if ($sName == 'separator')
         {
-            if($sValue == '_' || $sValue == '.')
+            if ($sValue == '_' || $sValue == '.')
                 $this->separator = $sValue;
             return;
         }
         // Set the excluded methods
-        if($sName == 'protected')
+        if ($sName == 'protected')
         {
-            if(is_array($sValue))
+            if (is_array($sValue))
                 $this->aProtectedMethods = array_merge($this->aProtectedMethods, $sValue);
-            elseif(is_string($sValue))
+            elseif (is_string($sValue))
                 $this->aProtectedMethods[] = $sValue;
             return;
         }
         
-        if(!isset($this->aConfiguration[$sMethod]))
+        if (!isset($this->aConfiguration[$sMethod]))
         {
             $this->aConfiguration[$sMethod] = array();
         }
@@ -293,16 +293,16 @@ 
 
         // Common options to be set on all methods
         $aCommonConfig = array_key_exists('*', $this->aConfiguration) ? $this->aConfiguration['*'] : array();
-        foreach($this->reflectionClass->getMethods(\ReflectionMethod::IS_PUBLIC) as $xMethod)
+        foreach ($this->reflectionClass->getMethods(\ReflectionMethod::IS_PUBLIC) as $xMethod)
         {
             $sMethodName = $xMethod->getShortName();
             // Don't export magic __call, __construct, __destruct methods
-            if(strlen($sMethodName) > 0 && substr($sMethodName, 0, 2) == '__')
+            if (strlen($sMethodName) > 0 && substr($sMethodName, 0, 2) == '__')
             {
                 continue;
             }
             // Don't export "protected" methods
-            if(in_array($sMethodName, $this->aProtectedMethods))
+            if (in_array($sMethodName, $this->aProtectedMethods))
             {
                 continue;
             }
@@ -352,7 +352,7 @@ 
      */
     public function call($sMethod, $aArgs)
     {
-        if(!$this->hasMethod($sMethod))
+        if (!$this->hasMethod($sMethod))
             return;
         $reflectionMethod = $this->reflectionClass->getMethod($sMethod);
         $callableObject = $this->getRegisteredObject();

Braces +21 added lines, -15 removed lines

@@ -92,12 +92,13 @@ 
      */
     public function __construct($xCallable)
     {
-        if(is_string($xCallable)) // Received a class name
+        if(is_string($xCallable)) {
+            // Received a class name
         {
             $this->reflectionClass = new \ReflectionClass($xCallable);
-            $this->callableObject = null;
         }
-        else // if(is_object($xCallable)) // Received a class instance
+            $this->callableObject = null;
+        } else // if(is_object($xCallable)) // Received a class instance
         {
             $this->reflectionClass = new \ReflectionClass(get_class($xCallable));
             $this->setCallable($xCallable);
@@ -244,31 +245,35 @@ 
         // Set the namespace
         if($sName == 'namespace')
         {
-            if($sValue != '')
-                $this->namespace = $sValue;
+            if($sValue != '') {
+                            $this->namespace = $sValue;
+            }
             return;
         }
         // Set the classpath
         if($sName == 'classpath')
         {
-            if($sValue != '')
-                $this->classpath = trim($sValue, '\\');
+            if($sValue != '') {
+                            $this->classpath = trim($sValue, '\\');
+            }
             return;
         }
         // Set the separator
         if($sName == 'separator')
         {
-            if($sValue == '_' || $sValue == '.')
-                $this->separator = $sValue;
+            if($sValue == '_' || $sValue == '.') {
+                            $this->separator = $sValue;
+            }
             return;
         }
         // Set the excluded methods
         if($sName == 'protected')
         {
-            if(is_array($sValue))
-                $this->aProtectedMethods = array_merge($this->aProtectedMethods, $sValue);
-            elseif(is_string($sValue))
-                $this->aProtectedMethods[] = $sValue;
+            if(is_array($sValue)) {
+                            $this->aProtectedMethods = array_merge($this->aProtectedMethods, $sValue);
+            } elseif(is_string($sValue)) {
+                            $this->aProtectedMethods[] = $sValue;
+            }
             return;
         }
         
@@ -352,8 +357,9 @@ 
      */
     public function call($sMethod, $aArgs)
     {
-        if(!$this->hasMethod($sMethod))
-            return;
+        if(!$this->hasMethod($sMethod)) {
+                    return;
+        }
         $reflectionMethod = $this->reflectionClass->getMethod($sMethod);
         $callableObject = $this->getRegisteredObject();
         $this->getResponseManager()->append($reflectionMethod->invokeArgs($callableObject, $aArgs));

src/Utils/Config/Config.php

Spacing +9 added lines, -10 removed lines

@@ -50,14 +50,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\Exception\Config\Data(jaxon_trans('config.errors.data.depth',
                 array('key' => $sPrefix, 'depth' => $nDepth)));
         }
-        foreach($aOptions as $sName => $xOption)
+        foreach ($aOptions as $sName => $xOption)
         {
-            if(is_int($sName))
+            if (is_int($sName))
             {
                 continue;
             }
@@ -67,7 +67,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);
@@ -89,9 +89,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]))
                 {
                     throw new \Jaxon\Exception\Config\Data(jaxon_trans('config.errors.data.missing', array('key' => $sKeys)));
                 }
@@ -139,13 +139,12 @@ 
         $sPrefix = rtrim($sPrefix, '.') . '.';
         $sPrefixLen = strlen($sPrefix);
         $aOptions = array();
-        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/Validation/Validator.php

Spacing +4 added lines, -4 removed lines

@@ -129,7 +129,7 @@ 
         // Verify the file extension
         $xDefault = $this->xConfig->getOption('upload.default.types');
         $aAllowed = $this->xConfig->getOption('upload.files.' . $sName . '.types', $xDefault);
-        if(is_array($aAllowed) && !in_array($aUploadedFile['type'], $aAllowed))
+        if (is_array($aAllowed) && !in_array($aUploadedFile['type'], $aAllowed))
         {
             $this->sErrorMessage = $this->xTranslator->trans('errors.upload.type', $aUploadedFile);
             return false;
@@ -137,7 +137,7 @@ 
         // Verify the file extension
         $xDefault = $this->xConfig->getOption('upload.default.extensions');
         $aAllowed = $this->xConfig->getOption('upload.files.' . $sName . '.extensions', $xDefault);
-        if(is_array($aAllowed) && !in_array($aUploadedFile['extension'], $aAllowed))
+        if (is_array($aAllowed) && !in_array($aUploadedFile['extension'], $aAllowed))
         {
             $this->sErrorMessage = $this->xTranslator->trans('errors.upload.extension', $aUploadedFile);
             return false;
@@ -145,7 +145,7 @@ 
         // Verify the max size
         $xDefault = $this->xConfig->getOption('upload.default.max-size', 0);
         $iSize = $this->xConfig->getOption('upload.files.' . $sName . '.max-size', $xDefault);
-        if($iSize > 0 && $aUploadedFile['size'] > $iSize)
+        if ($iSize > 0 && $aUploadedFile['size'] > $iSize)
         {
             $this->sErrorMessage = $this->xTranslator->trans('errors.upload.max-size', $aUploadedFile);
             return false;
@@ -153,7 +153,7 @@ 
         // Verify the min size
         $xDefault = $this->xConfig->getOption('upload.default.min-size', 0);
         $iSize = $this->xConfig->getOption('upload.files.' . $sName . '.min-size', $xDefault);
-        if($iSize > 0 && $aUploadedFile['size'] < $iSize)
+        if ($iSize > 0 && $aUploadedFile['size'] < $iSize)
         {
             $this->sErrorMessage = $this->xTranslator->trans('errors.upload.min-size', $aUploadedFile);
             return false;

src/Utils/Translation/Translator.php

Indentation +1 added lines, -1 removed lines

@@ -121,7 +121,7 @@
         }
         if(!array_key_exists($sLanguage, $this->aTranslations) || !array_key_exists($sText, $this->aTranslations[$sLanguage]))
         {
-           return $sText;
+            return $sText;
         }
         $message = $this->aTranslations[$sLanguage][$sText];
         foreach($aPlaceHolders as $name => $value)

Spacing +9 added lines, -9 removed lines

@@ -55,11 +55,11 @@ 
      */
     private function _loadTranslations($sLanguage, $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;
@@ -82,17 +82,17 @@ 
      */
     public function loadTranslations($sFilePath, $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] = [];
         }
@@ -111,20 +111,20 @@ 
     public function trans($sText, array $aPlaceHolders = array(), $sLanguage = null)
     {
         $sText = trim((string)$sText);
-        if(!$sLanguage)
+        if (!$sLanguage)
         {
             $sLanguage = $this->xConfig->getOption('language');
         }
-        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);
         }

Braces +1 added lines, -2 removed lines

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