jaxon-php / jaxon-core

src/Plugin/Manager.php

Spacing +55 added lines, -55 removed lines

@@ -262,32 +262,32 @@ 
     {
         $bIsAlert = ($xPlugin instanceof \Jaxon\Request\Interfaces\Alert);
         $bIsConfirm = ($xPlugin instanceof \Jaxon\Request\Interfaces\Confirm);
-        if($xPlugin instanceof Request)
+        if ($xPlugin instanceof Request)
         {
             // The name of a request plugin is used as key in the plugin table
             $this->aRequestPlugins[$xPlugin->getName()] = $xPlugin;
         }
-        elseif($xPlugin instanceof Response)
+        elseif ($xPlugin instanceof Response)
         {
             // The name of a response plugin is used as key in the plugin table
             $this->aResponsePlugins[$xPlugin->getName()] = $xPlugin;
         }
-        elseif(!$bIsConfirm && !$bIsAlert)
+        elseif (!$bIsConfirm && !$bIsAlert)
         {
             throw new \Jaxon\Exception\Error($this->trans('errors.register.invalid', array('name' => get_class($xPlugin))));
         }
         // This plugin implements the Alert interface
-        if($bIsAlert)
+        if ($bIsAlert)
         {
             $this->setAlert($xPlugin);
         }
         // This plugin implements the Confirm interface
-        if($bIsConfirm)
+        if ($bIsConfirm)
         {
             $this->setConfirm($xPlugin);
         }
         // Register the plugin as an event listener
-        if($xPlugin instanceof \Jaxon\Utils\Interfaces\EventListener)
+        if ($xPlugin instanceof \Jaxon\Utils\Interfaces\EventListener)
         {
             $this->addEventListener($xPlugin);
         }
@@ -303,7 +303,7 @@ 
     private function generateHash()
     {
         $sHash = $this->getVersion();
-        foreach($this->aPlugins as $xPlugin)
+        foreach ($this->aPlugins as $xPlugin)
         {
             $sHash .= $xPlugin->generateHash();
         }
@@ -320,9 +320,9 @@ 
      */
     public function canProcessRequest()
     {
-        foreach($this->aRequestPlugins as $xPlugin)
+        foreach ($this->aRequestPlugins as $xPlugin)
         {
-            if($xPlugin->canProcessRequest())
+            if ($xPlugin->canProcessRequest())
             {
                 return true;
             }
@@ -340,9 +340,9 @@ 
      */
     public function processRequest()
     {
-        foreach($this->aRequestPlugins as $xPlugin)
+        foreach ($this->aRequestPlugins as $xPlugin)
         {
-            if($xPlugin->canProcessRequest())
+            if ($xPlugin->canProcessRequest())
             {
                 return $xPlugin->processRequest();
             }
@@ -363,10 +363,10 @@ 
      */
     public function register($aArgs)
     {
-        foreach($this->aRequestPlugins as $xPlugin)
+        foreach ($this->aRequestPlugins as $xPlugin)
         {
             $mResult = $xPlugin->register($aArgs);
-            if($mResult instanceof \Jaxon\Request\Request || is_array($mResult) || $mResult === true)
+            if ($mResult instanceof \Jaxon\Request\Request || is_array($mResult) || $mResult === true)
             {
                 return $mResult;
             }
@@ -386,38 +386,38 @@ 
      */
     public function addClassDir($sDirectory, $sNamespace = null, $sSeparator = '.', array $aProtected = array())
     {
-        if(!is_dir(($sDirectory = trim($sDirectory))))
+        if (!is_dir(($sDirectory = trim($sDirectory))))
         {
             return false;
         }
         // Only '.' and '_' are allowed to be used as separator. Any other value is ignored and '.' is used instead.
-        if(($sSeparator = trim($sSeparator)) != '_')
+        if (($sSeparator = trim($sSeparator)) != '_')
         {
             $sSeparator = '.';
         }
-        if(!($sNamespace = trim($sNamespace)))
+        if (!($sNamespace = trim($sNamespace)))
         {
             $sNamespace = null;
         }
-        if(($sNamespace))
+        if (($sNamespace))
         {
             $sNamespace = trim($sNamespace, '\\');
             // If there is an autoloader, register the dir with PSR4 autoloading
-            if(($this->xAutoloader))
+            if (($this->xAutoloader))
             {
                 $this->xAutoloader->setPsr4($sNamespace . '\\', $sDirectory);
             }
         }
-        elseif(($this->xAutoloader))
+        elseif (($this->xAutoloader))
         {
             // If there is an autoloader, register the dir with classmap autoloading
             $itDir = new RecursiveDirectoryIterator($sDirectory);
             $itFile = new RecursiveIteratorIterator($itDir);
             // Iterate on dir content
-            foreach($itFile as $xFile)
+            foreach ($itFile as $xFile)
             {
                 // skip everything except PHP files
-                if(!$xFile->isFile() || $xFile->getExtension() != 'php')
+                if (!$xFile->isFile() || $xFile->getExtension() != 'php')
                 {
                     continue;
                 }
@@ -448,7 +448,7 @@ 
         $sClassPath = trim(substr($xFile->getPath(), strlen($sDirectory)), DIRECTORY_SEPARATOR);
         $sClassPath = str_replace(array(DIRECTORY_SEPARATOR), array($sSeparator), $sClassPath);
         $sClassName = $xFile->getBasename('.php');
-        if(($sNamespace))
+        if (($sNamespace))
         {
             $sNamespace = trim($sNamespace, '\\');
             $sClassPath = str_replace(array('\\'), array($sSeparator), $sNamespace) . $sSeparator . $sClassPath;
@@ -456,27 +456,27 @@ 
             $sClassName = '\\' . str_replace(array($sSeparator), array('\\'), $sClassPath) . '\\' . $sClassName;
         }
         // Require the file only if autoload is enabled but there is no autoloader
-        if(($this->bAutoloadEnabled) && !($this->xAutoloader))
+        if (($this->bAutoloadEnabled) && !($this->xAutoloader))
         {
             require_once($xFile->getPathname());
         }
         // Create and register an instance of the class
-        if(!array_key_exists('*', $aOptions) || !is_array($aOptions['*']))
+        if (!array_key_exists('*', $aOptions) || !is_array($aOptions['*']))
         {
             $aOptions['*'] = array();
         }
         $aOptions['*']['separator'] = $sSeparator;
-        if(($sNamespace))
+        if (($sNamespace))
         {
             $aOptions['*']['namespace'] = $sNamespace;
         }
-        if(($sClassPath))
+        if (($sClassPath))
         {
             $aOptions['*']['classpath'] = $sClassPath;
         }
         // Filter excluded methods
-        $aProtected = array_filter($aProtected, function ($sName) {return is_string($sName);});
-        if(count($aProtected) > 0)
+        $aProtected = array_filter($aProtected, function($sName) {return is_string($sName); });
+        if (count($aProtected) > 0)
         {
             $aOptions['*']['protected'] = $aProtected;
         }
@@ -490,15 +490,15 @@ 
      */
     public function registerClasses()
     {
-        foreach($this->aClassDirs as $sClassDir)
+        foreach ($this->aClassDirs as $sClassDir)
         {
             $itDir = new RecursiveDirectoryIterator($sClassDir['directory']);
             $itFile = new RecursiveIteratorIterator($itDir);
             // Iterate on dir content
-            foreach($itFile as $xFile)
+            foreach ($itFile as $xFile)
             {
                 // skip everything except PHP files
-                if(!$xFile->isFile() || $xFile->getExtension() != 'php')
+                if (!$xFile->isFile() || $xFile->getExtension() != 'php')
                 {
                     continue;
                 }
@@ -518,18 +518,18 @@ 
      */
     public function registerClass($sClassName, array $aOptions = array())
     {
-        if(!($sInitialClassName = trim($sClassName)))
+        if (!($sInitialClassName = trim($sClassName)))
         {
             return false;
         }
-        foreach($this->aClassDirs as $aClassDir)
+        foreach ($this->aClassDirs as $aClassDir)
         {
             // Get the separator
             $sSeparator = $aClassDir['separator'];
             // Replace / and \ with dots, and trim the string
             $sClassName = trim(str_replace(array('\\', '/'), array($sSeparator, $sSeparator), $sInitialClassName), $sSeparator);
             $sClassPath = '';
-            if(($nLastDotPosition = strrpos($sClassName, $sSeparator)) !== false)
+            if (($nLastDotPosition = strrpos($sClassName, $sSeparator)) !== false)
             {
                 $sClassPath = substr($sClassName, 0, $nLastDotPosition);
                 $sClassName = substr($sClassName, $nLastDotPosition + 1);
@@ -541,17 +541,17 @@ 
             $nLen = strlen($sNamespace);
             $bRegister = false;
             // Check if the class belongs to the namespace
-            if(($sNamespace) && substr($sClassPath, 0, $nLen) == str_replace(array('\\'), array($sSeparator), $sNamespace))
+            if (($sNamespace) && substr($sClassPath, 0, $nLen) == str_replace(array('\\'), array($sSeparator), $sNamespace))
             {
                 $sClassFile = $aClassDir['directory'] . DIRECTORY_SEPARATOR . substr($sClassFile, $nLen);
                 $bRegister = true;
             }
-            elseif(!($sNamespace))
+            elseif (!($sNamespace))
             {
                 $sClassFile = $aClassDir['directory'] . DIRECTORY_SEPARATOR . $sClassFile;
                 $bRegister = true;
             }
-            if($bRegister && is_file($sClassFile))
+            if ($bRegister && is_file($sClassFile))
             {
                 // Found the file in this directory
                 $xFileInfo = new \SplFileInfo($sClassFile);
@@ -575,7 +575,7 @@ 
     {
         $xObject = null; // The user registered object
         $xPlugin = $this->getRequestPlugin('CallableObject'); // The CallableObject plugin
-        if(($xPlugin))
+        if (($xPlugin))
         {
             $xObject = $xPlugin->getRegisteredObject($sClassName);
         }
@@ -589,7 +589,7 @@ 
      */
     private function getJsLibUri()
     {
-        if(!$this->hasOption('js.lib.uri'))
+        if (!$this->hasOption('js.lib.uri'))
         {
             return 'https://cdn.jsdelivr.net/jaxon/1.2.0/';
         }
@@ -609,7 +609,7 @@ 
         $jsDelivrUri = 'https://cdn.jsdelivr.net';
         $nLen = strlen($jsDelivrUri);
         // The jsDelivr CDN only hosts minified files
-        if(($this->getOption('js.app.minify')) || substr($this->getJsLibUri(), 0, $nLen) == $jsDelivrUri)
+        if (($this->getOption('js.app.minify')) || substr($this->getJsLibUri(), 0, $nLen) == $jsDelivrUri)
         {
             return '.min.js';
         }
@@ -626,7 +626,7 @@ 
         // Check config options
         // - The js.app.extern option must be set to true
         // - The js.app.uri and js.app.dir options must be set to non null values
-        if(!$this->getOption('js.app.extern') ||
+        if (!$this->getOption('js.app.extern') ||
             !$this->getOption('js.app.uri') ||
             !$this->getOption('js.app.dir'))
         {
@@ -635,7 +635,7 @@ 
         // Check dir access
         // - The js.app.dir must be writable
         $sJsAppDir = $this->getOption('js.app.dir');
-        if(!is_dir($sJsAppDir) || !is_writable($sJsAppDir))
+        if (!is_dir($sJsAppDir) || !is_writable($sJsAppDir))
         {
             return false;
         }
@@ -649,7 +649,7 @@ 
      */
     private function setTemplateCacheDir()
     {
-        if($this->hasOption('core.template.cache_dir'))
+        if ($this->hasOption('core.template.cache_dir'))
         {
             $this->setCacheDir($this->getOption('core.template.cache_dir'));
         }
@@ -671,11 +671,11 @@ 
 
         // Add component files to the javascript file array;
         $aJsFiles = array($sJsCoreUrl);
-        if($this->getOption('core.debug.on'))
+        if ($this->getOption('core.debug.on'))
         {
             $aJsFiles[] = $sJsDebugUrl;
             $aJsFiles[] = $sJsLanguageUrl;
-            if($this->getOption('core.debug.verbose'))
+            if ($this->getOption('core.debug.verbose'))
             {
                 $aJsFiles[] = $sJsVerboseUrl;
             }
@@ -687,7 +687,7 @@ 
             'sJsOptions' => $this->getOption('js.app.options'),
             'aUrls' => $aJsFiles,
         ));
-        foreach($this->aResponsePlugins as $xPlugin)
+        foreach ($this->aResponsePlugins as $xPlugin)
         {
             $sCode .= rtrim($xPlugin->getJs(), " \n") . "\n";
         }
@@ -705,7 +705,7 @@ 
         $this->setTemplateCacheDir();
 
         $sCode = '';
-        foreach($this->aResponsePlugins as $xPlugin)
+        foreach ($this->aResponsePlugins as $xPlugin)
         {
             $sCode .= rtrim($xPlugin->getCss(), " \n") . "\n";
         }
@@ -793,7 +793,7 @@ 
         ));
 
         $sPluginScript = '';
-        foreach($this->aResponsePlugins as $xPlugin)
+        foreach ($this->aResponsePlugins as $xPlugin)
         {
             $sPluginScript .= "\n" . trim($xPlugin->getScript(), " \n");
         }
@@ -825,11 +825,11 @@ 
 
         // Get the config and plugins scripts
         $sScript = $this->getConfigScript() . "\n" . $this->getReadyScript() . "\n";
-        foreach($this->aRequestPlugins as $xPlugin)
+        foreach ($this->aRequestPlugins as $xPlugin)
         {
             $sScript .= "\n" . trim($xPlugin->getScript(), " \n");
         }
-        if($this->canExportJavascript())
+        if ($this->canExportJavascript())
         {
             $sJsAppURI = rtrim($this->getOption('js.app.uri'), '/') . '/';
             $sJsAppDir = rtrim($this->getOption('js.app.dir'), '/') . '/';
@@ -838,13 +838,13 @@ 
             $sHash = $this->generateHash();
             $sOutFile = $sHash . '.js';
             $sMinFile = $sHash . '.min.js';
-            if(!is_file($sJsAppDir . $sOutFile))
+            if (!is_file($sJsAppDir . $sOutFile))
             {
                 file_put_contents($sJsAppDir . $sOutFile, $sScript);
             }
-            if(($this->getOption('js.app.minify')))
+            if (($this->getOption('js.app.minify')))
             {
-                if(($this->minify($sJsAppDir . $sOutFile, $sJsAppDir . $sMinFile)))
+                if (($this->minify($sJsAppDir . $sOutFile, $sJsAppDir . $sMinFile)))
                 {
                     $sOutFile = $sMinFile;
                 }
@@ -877,7 +877,7 @@ 
      */
     public function getResponsePlugin($sName)
     {
-        if(array_key_exists($sName, $this->aResponsePlugins))
+        if (array_key_exists($sName, $this->aResponsePlugins))
         {
             return $this->aResponsePlugins[$sName];
         }
@@ -893,7 +893,7 @@ 
      */
     public function getRequestPlugin($sName)
     {
-        if(array_key_exists($sName, $this->aRequestPlugins))
+        if (array_key_exists($sName, $this->aRequestPlugins))
         {
             return $this->aRequestPlugins[$sName];
         }

Braces +5 added lines, -10 removed lines

@@ -266,13 +266,11 @@ 
         {
             // The name of a request plugin is used as key in the plugin table
             $this->aRequestPlugins[$xPlugin->getName()] = $xPlugin;
-        }
-        elseif($xPlugin instanceof Response)
+        } elseif($xPlugin instanceof Response)
         {
             // The name of a response plugin is used as key in the plugin table
             $this->aResponsePlugins[$xPlugin->getName()] = $xPlugin;
-        }
-        elseif(!$bIsConfirm && !$bIsAlert)
+        } elseif(!$bIsConfirm && !$bIsAlert)
         {
             throw new \Jaxon\Exception\Error($this->trans('errors.register.invalid', array('name' => get_class($xPlugin))));
         }
@@ -407,8 +405,7 @@ 
             {
                 $this->xAutoloader->setPsr4($sNamespace . '\\', $sDirectory);
             }
-        }
-        elseif(($this->xAutoloader))
+        } elseif(($this->xAutoloader))
         {
             // If there is an autoloader, register the dir with classmap autoloading
             $itDir = new RecursiveDirectoryIterator($sDirectory);
@@ -545,8 +542,7 @@ 
             {
                 $sClassFile = $aClassDir['directory'] . DIRECTORY_SEPARATOR . substr($sClassFile, $nLen);
                 $bRegister = true;
-            }
-            elseif(!($sNamespace))
+            } elseif(!($sNamespace))
             {
                 $sClassFile = $aClassDir['directory'] . DIRECTORY_SEPARATOR . $sClassFile;
                 $bRegister = true;
@@ -855,8 +851,7 @@ 
                 'sJsOptions' => $this->getOption('js.app.options'),
                 'sUrl' => $sJsAppURI . $sOutFile,
             ));
-        }
-        else
+        } else
         {
             // The plugins scripts are wrapped with javascript tags
             $sScript = $this->render('jaxon::plugins/wrapper.js', array(

src/Request/Manager.php

Spacing +26 added lines, -26 removed lines

@@ -55,17 +55,17 @@ 
         $this->aArgs = array();
         $this->nMethod = Jaxon::METHOD_UNKNOWN;
         
-        if(isset($_POST['jxnargs']))
+        if (isset($_POST['jxnargs']))
         {
             $this->nMethod = Jaxon::METHOD_POST;
             $this->aArgs = $_POST['jxnargs'];
         }
-        elseif(isset($_GET['jxnargs']))
+        elseif (isset($_GET['jxnargs']))
         {
             $this->nMethod = Jaxon::METHOD_GET;
             $this->aArgs = $_GET['jxnargs'];
         }
-        if(get_magic_quotes_gpc() == 1)
+        if (get_magic_quotes_gpc() == 1)
         {
             array_walk($this->aArgs, array(&$this, '__argumentStripSlashes'));
         }
@@ -81,17 +81,17 @@ 
      */
     private function __convertStringToBool($sValue)
     {
-        if(strcasecmp($sValue, 'true') == 0)
+        if (strcasecmp($sValue, 'true') == 0)
         {
             return true;
         }
-        if(strcasecmp($sValue, 'false') == 0)
+        if (strcasecmp($sValue, 'false') == 0)
         {
             return false;
         }
-        if(is_numeric($sValue))
+        if (is_numeric($sValue))
         {
-            if($sValue == 0)
+            if ($sValue == 0)
             {
                 return false;
             }
@@ -109,7 +109,7 @@ 
      */
     private function __argumentStripSlashes(&$sArg)
     {
-        if(!is_string($sArg))
+        if (!is_string($sArg))
         {
             return '';
         }
@@ -157,14 +157,14 @@ 
      */
     private function __argumentDecode(&$sArg)
     {
-        if($sArg == '')
+        if ($sArg == '')
         {
             return '';
         }
 
         $data = json_decode($sArg, true);
 
-        if($data !== null && $sArg != $data)
+        if ($data !== null && $sArg != $data)
         {
             $sArg = $data;
         }
@@ -183,13 +183,13 @@ 
      */
     private function __argumentDecodeUTF8_iconv(&$mArg)
     {
-        if(is_array($mArg))
+        if (is_array($mArg))
         {
-            foreach($mArg as $sKey => $xArg)
+            foreach ($mArg as $sKey => $xArg)
             {
                 $sNewKey = $sKey;
                 $this->__argumentDecodeUTF8_iconv($sNewKey);
-                if($sNewKey != $sKey)
+                if ($sNewKey != $sKey)
                 {
                     $mArg[$sNewKey] = $xArg;
                     unset($mArg[$sKey]);
@@ -198,7 +198,7 @@ 
                 $this->__argumentDecodeUTF8_iconv($xArg);
             }
         }
-        elseif(is_string($mArg))
+        elseif (is_string($mArg))
         {
             $mArg = iconv("UTF-8", $this->getOption('core.encoding') . '//TRANSLIT', $mArg);
         }
@@ -213,13 +213,13 @@ 
      */
     private function __argumentDecodeUTF8_mb_convert_encoding(&$mArg)
     {
-        if(is_array($mArg))
+        if (is_array($mArg))
         {
-            foreach($mArg as $sKey => $xArg)
+            foreach ($mArg as $sKey => $xArg)
             {
                 $sNewKey = $sKey;
                 $this->__argumentDecodeUTF8_mb_convert_encoding($sNewKey);
-                if($sNewKey != $sKey)
+                if ($sNewKey != $sKey)
                 {
                     $mArg[$sNewKey] = $xArg;
                     unset($mArg[$sKey]);
@@ -228,7 +228,7 @@ 
                 $this->__argumentDecodeUTF8_mb_convert_encoding($xArg);
             }
         }
-        elseif(is_string($mArg))
+        elseif (is_string($mArg))
         {
             $mArg = mb_convert_encoding($mArg, $this->getOption('core.encoding'), "UTF-8");
         }
@@ -243,14 +243,14 @@ 
      */
     private function __argumentDecodeUTF8_utf8_decode(&$mArg)
     {
-        if(is_array($mArg))
+        if (is_array($mArg))
         {
-            foreach($mArg as $sKey => $xArg)
+            foreach ($mArg as $sKey => $xArg)
             {
                 $sNewKey = $sKey;
                 $this->__argumentDecodeUTF8_utf8_decode($sNewKey);
                 
-                if($sNewKey != $sKey)
+                if ($sNewKey != $sKey)
                 {
                     $mArg[$sNewKey] = $xArg;
                     unset($mArg[$sKey]);
@@ -260,7 +260,7 @@ 
                 $this->__argumentDecodeUTF8_utf8_decode($xArg);
             }
         }
-        elseif(is_string($mArg))
+        elseif (is_string($mArg))
         {
             $mArg = utf8_decode($mArg);
         }
@@ -285,19 +285,19 @@ 
      */
     public function process()
     {
-        if(($this->getOption('core.decode_utf8')))
+        if (($this->getOption('core.decode_utf8')))
         {
             $sFunction = '';
             
-            if(function_exists('iconv'))
+            if (function_exists('iconv'))
             {
                 $sFunction = "iconv";
             }
-            elseif(function_exists('mb_convert_encoding'))
+            elseif (function_exists('mb_convert_encoding'))
             {
                 $sFunction = "mb_convert_encoding";
             }
-            elseif($this->getOption('core.encoding') == "ISO-8859-1")
+            elseif ($this->getOption('core.encoding') == "ISO-8859-1")
             {
                 $sFunction = "utf8_decode";
             }

Braces +8 added lines, -16 removed lines

@@ -59,8 +59,7 @@ 
         {
             $this->nMethod = Jaxon::METHOD_POST;
             $this->aArgs = $_POST['jxnargs'];
-        }
-        elseif(isset($_GET['jxnargs']))
+        } elseif(isset($_GET['jxnargs']))
         {
             $this->nMethod = Jaxon::METHOD_GET;
             $this->aArgs = $_GET['jxnargs'];
@@ -167,8 +166,7 @@ 
         if($data !== null && $sArg != $data)
         {
             $sArg = $data;
-        }
-        else
+        } else
         {
             $sArg = $this->__convertValue($sArg);
         }
@@ -197,8 +195,7 @@ 
                 }
                 $this->__argumentDecodeUTF8_iconv($xArg);
             }
-        }
-        elseif(is_string($mArg))
+        } elseif(is_string($mArg))
         {
             $mArg = iconv("UTF-8", $this->getOption('core.encoding') . '//TRANSLIT', $mArg);
         }
@@ -227,8 +224,7 @@ 
                 }
                 $this->__argumentDecodeUTF8_mb_convert_encoding($xArg);
             }
-        }
-        elseif(is_string($mArg))
+        } elseif(is_string($mArg))
         {
             $mArg = mb_convert_encoding($mArg, $this->getOption('core.encoding'), "UTF-8");
         }
@@ -259,8 +255,7 @@ 
                 
                 $this->__argumentDecodeUTF8_utf8_decode($xArg);
             }
-        }
-        elseif(is_string($mArg))
+        } elseif(is_string($mArg))
         {
             $mArg = utf8_decode($mArg);
         }
@@ -292,16 +287,13 @@ 
             if(function_exists('iconv'))
             {
                 $sFunction = "iconv";
-            }
-            elseif(function_exists('mb_convert_encoding'))
+            } elseif(function_exists('mb_convert_encoding'))
             {
                 $sFunction = "mb_convert_encoding";
-            }
-            elseif($this->getOption('core.encoding') == "ISO-8859-1")
+            } elseif($this->getOption('core.encoding') == "ISO-8859-1")
             {
                 $sFunction = "utf8_decode";
-            }
-            else
+            } else
             {
                 throw new \Jaxon\Exception\Error($this->trans('errors.request.conversion'));
             }

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/Request.php

Spacing +18 added lines, -18 removed lines

@@ -70,9 +70,9 @@ 
      */
     public function hasPageNumber()
     {
-        foreach($this->aParameters as $xParameter)
+        foreach ($this->aParameters as $xParameter)
         {
-            if($xParameter->getType() == Jaxon::PAGE_NUMBER)
+            if ($xParameter->getType() == Jaxon::PAGE_NUMBER)
             {
                 return true;
             }
@@ -90,9 +90,9 @@ 
     public function setPageNumber($nPageNumber)
     {
         // Set the value of the Jaxon::PAGE_NUMBER parameter
-        foreach($this->aParameters as $xParameter)
+        foreach ($this->aParameters as $xParameter)
         {
-            if($xParameter->getType() == Jaxon::PAGE_NUMBER)
+            if ($xParameter->getType() == Jaxon::PAGE_NUMBER)
             {
                 $xParameter->setValue(intval($nPageNumber));
                 break;
@@ -112,7 +112,7 @@ 
     {
         $this->sCondition = '__confirm__';
         $this->aMessageArgs = func_get_args();
-        array_walk($this->aMessageArgs, function (&$xParameter) {
+        array_walk($this->aMessageArgs, function(&$xParameter) {
             $xParameter = Parameter::make($xParameter);
         });
         return $this;
@@ -133,7 +133,7 @@ 
         $this->sCondition = Parameter::make($sCondition)->getScript();
         $this->aMessageArgs = func_get_args();
         array_shift($this->aMessageArgs); // Remove the first entry (the condition) from the array
-        array_walk($this->aMessageArgs, function (&$xParameter) {
+        array_walk($this->aMessageArgs, function(&$xParameter) {
             $xParameter = Parameter::make($xParameter);
         });
         return $this;
@@ -154,7 +154,7 @@ 
         $this->sCondition = '!(' . Parameter::make($sCondition)->getScript() . ')';
         $this->aMessageArgs = func_get_args();
         array_shift($this->aMessageArgs); // Remove the first entry (the condition) from the array
-        array_walk($this->aMessageArgs, function (&$xParameter) {
+        array_walk($this->aMessageArgs, function(&$xParameter) {
             $xParameter = Parameter::make($xParameter);
         });
         return $this;
@@ -179,12 +179,12 @@ 
         // This array will avoid declaring many variables with the same value.
         // The array key is the variable value, while the array value is the variable name.
         $aVariables = array(); // Array of local variables.
-        foreach($this->aParameters as &$xParameter)
+        foreach ($this->aParameters as &$xParameter)
         {
             $sParameterStr = $xParameter->getScript();
-            if($xParameter instanceof \Jaxon\JQuery\Dom\Element)
+            if ($xParameter instanceof \Jaxon\JQuery\Dom\Element)
             {
-                if(!array_key_exists($sParameterStr, $aVariables))
+                if (!array_key_exists($sParameterStr, $aVariables))
                 {
                     // The value is not yet defined. A new variable is created.
                     $sVarName = "jxnVar$nVarId";
@@ -202,19 +202,19 @@ 
         }
 
         $sPhrase = '';
-        if(count($this->aMessageArgs) > 0)
+        if (count($this->aMessageArgs) > 0)
         {
             $sPhrase = array_shift($this->aMessageArgs); // The first array entry is the question.
             // $sPhrase = "'" . addslashes($sPhrase) . "'"; // Wrap the phrase with single quotes
-            if(count($this->aMessageArgs) > 0)
+            if (count($this->aMessageArgs) > 0)
             {
                 $nParamId = 1;
-                foreach($this->aMessageArgs as &$xParameter)
+                foreach ($this->aMessageArgs as &$xParameter)
                 {
                     $sParameterStr = $xParameter->getScript();
-                    if($xParameter instanceof \Jaxon\JQuery\Dom\Element)
+                    if ($xParameter instanceof \Jaxon\JQuery\Dom\Element)
                     {
-                        if(!array_key_exists($sParameterStr, $aVariables))
+                        if (!array_key_exists($sParameterStr, $aVariables))
                         {
                             // The value is not yet defined. A new variable is created.
                             $sVarName = "jxnVar$nVarId";
@@ -237,17 +237,17 @@ 
         }
 
         $sScript = $this->getOption('core.prefix.' . $this->sType) . parent::getScript();
-        if($this->sCondition == '__confirm__')
+        if ($this->sCondition == '__confirm__')
         {
             $xConfirm = $this->getPluginManager()->getConfirm();
             $sScript = $xConfirm->confirm($sPhrase, $sScript, '');
         }
-        elseif($this->sCondition !== null)
+        elseif ($this->sCondition !== null)
         {
             $xAlert = $this->getPluginManager()->getAlert();
             $xAlert->setReturn(true);
             $sScript = 'if(' . $this->sCondition . '){' . $sScript . ';}';
-            if(($sPhrase))
+            if (($sPhrase))
             {
                 $sScript .= 'else{' . $xAlert->warning($sPhrase) . ';}';
             }

Braces +3 added lines, -6 removed lines

@@ -191,8 +191,7 @@ 
                     $aVariables[$sParameterStr] = $sVarName;
                     $sVars .= "$sVarName=$xParameter;";
                     $nVarId++;
-                }
-                else
+                } else
                 {
                     // The value is already defined. The corresponding variable is assigned.
                     $sVarName = $aVariables[$sParameterStr];
@@ -221,8 +220,7 @@ 
                             $aVariables[$sParameterStr] = $sVarName;
                             $sVars .= "$sVarName=$xParameter;";
                             $nVarId++;
-                        }
-                        else
+                        } else
                         {
                             // The value is already defined. The corresponding variable is assigned.
                             $sVarName = $aVariables[$sParameterStr];
@@ -241,8 +239,7 @@ 
         {
             $xConfirm = $this->getPluginManager()->getConfirm();
             $sScript = $xConfirm->confirm($sPhrase, $sScript, '');
-        }
-        elseif($this->sCondition !== null)
+        } elseif($this->sCondition !== null)
         {
             $xAlert = $this->getPluginManager()->getAlert();
             $xAlert->setReturn(true);

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/UserFunction.php

Spacing +8 added lines, -8 removed lines

@@ -90,13 +90,13 @@ 
     {
         $this->aConfiguration = array();
         $this->sAlias = '';
-        if(is_array($sUserFunction))
+        if (is_array($sUserFunction))
         {
-            if(count($sUserFunction) != 2 && count($sUserFunction) != 3)
+            if (count($sUserFunction) != 2 && count($sUserFunction) != 3)
             {
                 throw new \Jaxon\Exception\Error($this->trans('errors.functions.invalid-declaration'));
             }
-            if(count($sUserFunction) == 3)
+            if (count($sUserFunction) == 3)
             {
                 $this->sAlias = $sUserFunction[0];
                 $this->sUserFunction = array_slice($sUserFunction, 1);
@@ -106,7 +106,7 @@ 
                 $this->sUserFunction = $sUserFunction;
             }
         }
-        elseif(is_string($sUserFunction))
+        elseif (is_string($sUserFunction))
         {
             $this->sUserFunction = $sUserFunction;
         }
@@ -124,7 +124,7 @@ 
     public function getName()
     {
         // Do not use sAlias here!
-        if(is_array($this->sUserFunction))
+        if (is_array($this->sUserFunction))
         {
             return $this->sUserFunction[1];
         }
@@ -141,7 +141,7 @@ 
      */
     public function configure($sName, $sValue)
     {
-        switch($sName)
+        switch ($sName)
         {
         case 'alias':
             $this->sAlias = $sValue;
@@ -195,12 +195,12 @@ 
      */
     public function call($aArgs = array())
     {
-        if(($this->sInclude))
+        if (($this->sInclude))
         {
             ob_start();
             require_once $this->sInclude;
             $sOutput = ob_get_clean();
-            if(($sOutput))
+            if (($sOutput))
             {
                 $sOutput = $this->trans('debug.function.include', array(
                     'file' => $this->sInclude,

Braces +3 added lines, -6 removed lines

@@ -100,17 +100,14 @@
             {
                 $this->sAlias = $sUserFunction[0];
                 $this->sUserFunction = array_slice($sUserFunction, 1);
-            }
-            else
+            } else
             {
                 $this->sUserFunction = $sUserFunction;
             }
-        }
-        elseif(is_string($sUserFunction))
+        } elseif(is_string($sUserFunction))
         {
             $this->sUserFunction = $sUserFunction;
-        }
-        else
+        } else
         {
             throw new \Jaxon\Exception\Error($this->trans('errors.functions.invalid-declaration'));
         }

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();
         }
@@ -167,7 +167,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 . $this->separator . $name;
         }
@@ -204,16 +204,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;
             }
@@ -234,37 +234,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 = $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();
         }
@@ -284,16 +284,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;
             }
@@ -343,7 +343,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);
@@ -236,31 +237,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 = $sValue;
+            if($sValue != '') {
+                            $this->classpath = $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;
         }
         
@@ -343,8 +348,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));