jaxon-php / jaxon-core

src/Request/Handler.php

Doc Comments +1 added lines, -1 removed lines

@@ -152,7 +152,7 @@
      *
      * @param string        $sArg                The Jaxon request argument
      *
-     * @return mixed
+     * @return string|null
      */
     private function __argumentDecode(&$sArg)
     {

Switch Indentation +13 added lines, -13 removed lines

@@ -131,19 +131,19 @@
         $sValue = substr($sValue, 1);
         switch ($cType)
         {
-            case 'S':
-                $value = ($sValue === false ? '' : $sValue);
-                break;
-            case 'B':
-                $value = $this->__convertStringToBool($sValue);
-                break;
-            case 'N':
-                $value = ($sValue == floor($sValue) ? (int)$sValue : (float)$sValue);
-                break;
-            case '*':
-            default:
-                $value = null;
-                break;
+        case 'S':
+            $value = ($sValue === false ? '' : $sValue);
+            break;
+        case 'B':
+            $value = $this->__convertStringToBool($sValue);
+            break;
+        case 'N':
+            $value = ($sValue == floor($sValue) ? (int)$sValue : (float)$sValue);
+            break;
+        case '*':
+        default:
+            $value = null;
+            break;
         }
         return $value;
     }

Spacing +34 added lines, -34 removed lines

@@ -63,17 +63,17 @@ 
         $this->aArgs = [];
         $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'));
         }
@@ -89,17 +89,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;
             }
@@ -117,7 +117,7 @@ 
      */
     private function __argumentStripSlashes(&$sArg)
     {
-        if(!is_string($sArg))
+        if (!is_string($sArg))
         {
             return '';
         }
@@ -165,7 +165,7 @@ 
      */
     private function __argumentDecode(&$sArg)
     {
-        if($sArg == '')
+        if ($sArg == '')
         {
             return '';
         }
@@ -174,22 +174,22 @@ 
         $sType = 'multipart/form-data';
         $iLen = strlen($sType);
         $sContentType = '';
-        if(key_exists('CONTENT_TYPE', $_SERVER))
+        if (key_exists('CONTENT_TYPE', $_SERVER))
         {
             $sContentType = substr($_SERVER['CONTENT_TYPE'], 0, $iLen);
         }
-        elseif(key_exists('HTTP_CONTENT_TYPE', $_SERVER))
+        elseif (key_exists('HTTP_CONTENT_TYPE', $_SERVER))
         {
             $sContentType = substr($_SERVER['HTTP_CONTENT_TYPE'], 0, $iLen);
         }
-        if($sContentType == $sType)
+        if ($sContentType == $sType)
         {
             $sArg = urldecode($sArg);
         }
 
         $data = json_decode($sArg, true);
 
-        if($data !== null && $sArg != $data)
+        if ($data !== null && $sArg != $data)
         {
             $sArg = $data;
         }
@@ -208,13 +208,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]);
@@ -223,7 +223,7 @@ 
                 $this->__argumentDecodeUTF8_iconv($xArg);
             }
         }
-        elseif(is_string($mArg))
+        elseif (is_string($mArg))
         {
             $mArg = iconv("UTF-8", $this->getOption('core.encoding') . '//TRANSLIT', $mArg);
         }
@@ -238,13 +238,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]);
@@ -253,7 +253,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");
         }
@@ -268,14 +268,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]);
@@ -285,7 +285,7 @@ 
                 $this->__argumentDecodeUTF8_utf8_decode($xArg);
             }
         }
-        elseif(is_string($mArg))
+        elseif (is_string($mArg))
         {
             $mArg = utf8_decode($mArg);
         }
@@ -310,19 +310,19 @@ 
      */
     public function processArguments()
     {
-        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";
             }
@@ -349,9 +349,9 @@ 
      */
     public function canProcessRequest()
     {
-        foreach($this->xPluginManager->getRequestPlugins() as $xPlugin)
+        foreach ($this->xPluginManager->getRequestPlugins() as $xPlugin)
         {
-            if($xPlugin->getName() != Jaxon::FILE_UPLOAD && $xPlugin->canProcessRequest())
+            if ($xPlugin->getName() != Jaxon::FILE_UPLOAD && $xPlugin->canProcessRequest())
             {
                 return true;
             }
@@ -369,13 +369,13 @@ 
      */
     public function processRequest()
     {
-        foreach($this->xPluginManager->getRequestPlugins() as $xPlugin)
+        foreach ($this->xPluginManager->getRequestPlugins() as $xPlugin)
         {
-            if($xPlugin->getName() != Jaxon::FILE_UPLOAD && $xPlugin->canProcessRequest())
+            if ($xPlugin->getName() != Jaxon::FILE_UPLOAD && $xPlugin->canProcessRequest())
             {
                 $xUploadPlugin = $this->xPluginManager->getRequestPlugin(Jaxon::FILE_UPLOAD);
                 // Process uploaded files
-                if($xUploadPlugin != null)
+                if ($xUploadPlugin != null)
                 {
                     $xUploadPlugin->processRequest();
                 }

Braces +9 added lines, -18 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'];
@@ -169,8 +168,7 @@ 
         if(key_exists('CONTENT_TYPE', $_SERVER))
         {
             $sContentType = substr($_SERVER['CONTENT_TYPE'], 0, $iLen);
-        }
-        elseif(key_exists('HTTP_CONTENT_TYPE', $_SERVER))
+        } elseif(key_exists('HTTP_CONTENT_TYPE', $_SERVER))
         {
             $sContentType = substr($_SERVER['HTTP_CONTENT_TYPE'], 0, $iLen);
         }
@@ -184,8 +182,7 @@ 
         if($data !== null && $sArg != $data)
         {
             $sArg = $data;
-        }
-        else
+        } else
         {
             $sArg = $this->__convertValue($sArg);
         }
@@ -214,8 +211,7 @@ 
                 }
                 $this->__argumentDecodeUTF8_iconv($xArg);
             }
-        }
-        elseif(is_string($mArg))
+        } elseif(is_string($mArg))
         {
             $mArg = iconv("UTF-8", $this->getOption('core.encoding') . '//TRANSLIT', $mArg);
         }
@@ -244,8 +240,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");
         }
@@ -276,8 +271,7 @@ 
                 
                 $this->__argumentDecodeUTF8_utf8_decode($xArg);
             }
-        }
-        elseif(is_string($mArg))
+        } elseif(is_string($mArg))
         {
             $mArg = utf8_decode($mArg);
         }
@@ -309,16 +303,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/Jaxon.php

Spacing +16 added lines, -16 removed lines

@@ -156,7 +156,7 @@ 
             'core.prefix.class'                 => 'Jaxon',
             // 'core.request.uri'               => '',
             'core.request.mode'                 => 'asynchronous',
-            'core.request.method'               => 'POST',    // W3C: Method is case sensitive
+            'core.request.method'               => 'POST', // W3C: Method is case sensitive
             'core.response.merge.ap'            => true,
             'core.response.merge.js'            => true,
             'core.debug.on'                     => false,
@@ -244,17 +244,17 @@ 
      */
     public function getScript($bIncludeJs = false, $bIncludeCss = false)
     {
-        if(!$this->getOption('core.request.uri'))
+        if (!$this->getOption('core.request.uri'))
         {
             $this->setOption('core.request.uri', URI::detect());
         }
         $sCode = '';
         $xCodeGenerator = $this->di()->getCodeGenerator();
-        if(($bIncludeCss))
+        if (($bIncludeCss))
         {
             $sCode .= $xCodeGenerator->getCss() . "\n";
         }
-        if(($bIncludeJs))
+        if (($bIncludeJs))
         {
             $sCode .= $xCodeGenerator->getJs() . "\n";
         }
@@ -325,7 +325,7 @@ 
     public function processRequest()
     {
         // Check to see if headers have already been sent out, in which case we can't do our job
-        if(headers_sent($filename, $linenumber))
+        if (headers_sent($filename, $linenumber))
         {
             echo $this->trans('errors.output.already-sent', array(
                 'location' => $filename . ':' . $linenumber
@@ -334,7 +334,7 @@ 
         }
 
         // Check if there is a plugin to process this request
-        if(!$this->canProcessRequest())
+        if (!$this->canProcessRequest())
         {
             return;
         }
@@ -344,18 +344,18 @@ 
         $xResponseManager = $this->getResponseManager();
 
         // Handle before processing event
-        if(isset($this->aProcessingEvents[self::PROCESSING_EVENT_BEFORE]))
+        if (isset($this->aProcessingEvents[self::PROCESSING_EVENT_BEFORE]))
         {
             $this->aProcessingEvents[self::PROCESSING_EVENT_BEFORE]->call(array(&$bEndRequest));
         }
 
-        if(!$bEndRequest)
+        if (!$bEndRequest)
         {
             try
             {
                 $mResult = $this->getRequestHandler()->processRequest();
             }
-            catch(Exception $e)
+            catch (Exception $e)
             {
                 // An exception was thrown while processing the request.
                 // The request missed the corresponding handler function,
@@ -367,7 +367,7 @@ 
                 $xResponseManager->debug($e->getMessage());
                 $mResult = false;
 
-                if($e instanceof \Jaxon\Exception\Error)
+                if ($e instanceof \Jaxon\Exception\Error)
                 {
                     $sEvent = self::PROCESSING_EVENT_INVALID;
                     $aParams = array($e->getMessage());
@@ -378,7 +378,7 @@ 
                     $aParams = array($e);
                 }
 
-                if(isset($this->aProcessingEvents[$sEvent]))
+                if (isset($this->aProcessingEvents[$sEvent]))
                 {
                     // Call the processing event
                     $this->aProcessingEvents[$sEvent]->call($aParams);
@@ -391,7 +391,7 @@ 
             }
         }
         // Clean the processing buffer
-        if(($this->getOption('core.process.clean')))
+        if (($this->getOption('core.process.clean')))
         {
             $er = error_reporting(0);
             while (ob_get_level() > 0)
@@ -401,16 +401,16 @@ 
             error_reporting($er);
         }
 
-        if($mResult === true)
+        if ($mResult === true)
         {
             // Handle after processing event
-            if(isset($this->aProcessingEvents[self::PROCESSING_EVENT_AFTER]))
+            if (isset($this->aProcessingEvents[self::PROCESSING_EVENT_AFTER]))
             {
                 $bEndRequest = false;
                 $this->aProcessingEvents[self::PROCESSING_EVENT_AFTER]->call(array($bEndRequest));
             }
             // If the called function returned no response, give the the global response instead
-            if($xResponseManager->hasNoResponse())
+            if ($xResponseManager->hasNoResponse())
             {
                 $xResponseManager->append($this->getResponse());
             }
@@ -418,7 +418,7 @@ 
 
         $xResponseManager->printDebug();
 
-        if(($this->getOption('core.process.exit')))
+        if (($this->getOption('core.process.exit')))
         {
             $xResponseManager->sendOutput();
             exit();

Braces +3 added lines, -6 removed lines

@@ -354,8 +354,7 @@ 
             try
             {
                 $mResult = $this->getRequestHandler()->processRequest();
-            }
-            catch(Exception $e)
+            } catch(Exception $e)
             {
                 // An exception was thrown while processing the request.
                 // The request missed the corresponding handler function,
@@ -371,8 +370,7 @@ 
                 {
                     $sEvent = self::PROCESSING_EVENT_INVALID;
                     $aParams = array($e->getMessage());
-                }
-                else
+                } else
                 {
                     $sEvent = self::PROCESSING_EVENT_ERROR;
                     $aParams = array($e);
@@ -382,8 +380,7 @@ 
                 {
                     // Call the processing event
                     $this->aProcessingEvents[$sEvent]->call($aParams);
-                }
-                else
+                } else
                 {
                     // The exception is not to be processed here.
                     throw $e;

src/Dialog/Confirm.php

Spacing +1 added lines, -1 removed lines

@@ -22,7 +22,7 @@
      */
     public function confirm($question, $yesScript, $noScript)
     {
-        if(!$noScript)
+        if (!$noScript)
         {
             return 'if(confirm(' . $question . ')){' . $yesScript . ';}';
         }

Braces +1 added lines, -2 removed lines

@@ -25,8 +25,7 @@
         if(!$noScript)
         {
             return 'if(confirm(' . $question . ')){' . $yesScript . ';}';
-        }
-        else
+        } else
         {
             return 'if(confirm(' . $question . ')){' . $yesScript . ';}else{' . $noScript . ';}';
         }

src/Plugin/Manager.php

Braces +7 added lines, -14 removed lines

@@ -136,13 +136,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', ['name' => get_class($xPlugin)]));
         }
@@ -226,13 +224,11 @@ 
             {
                 // Register a function without options
                 $this->register(Jaxon::USER_FUNCTION, $xValue);
-            }
-            elseif(is_string($xKey) && is_array($xValue))
+            } elseif(is_string($xKey) && is_array($xValue))
             {
                 // Register a function with options
                 $this->register(Jaxon::USER_FUNCTION, $xKey, $xValue);
-            }
-            else
+            } else
             {
                 continue;
                 // Todo: throw an exception
@@ -247,13 +243,11 @@ 
             {
                 // Register a class without options
                 $this->register(Jaxon::CALLABLE_CLASS, $xValue);
-            }
-            elseif(is_string($xKey) && is_array($xValue))
+            } elseif(is_string($xKey) && is_array($xValue))
             {
                 // Register a class with options
                 $this->register(Jaxon::CALLABLE_CLASS, $xKey, $xValue);
-            }
-            elseif(is_integer($xKey) && is_array($xValue))
+            } elseif(is_integer($xKey) && is_array($xValue))
             {
                 // The directory path is required
                 if(!key_exists('directory', $xValue))
@@ -280,8 +274,7 @@ 
                 }
                 // Register a class without options
                 $this->register(Jaxon::CALLABLE_DIR, $sDirectory, $aOptions);
-            }
-            else
+            } else
             {
                 continue;
                 // Todo: throw an exception

Spacing +20 added lines, -20 removed lines

@@ -132,32 +132,32 @@ 
     {
         $bIsAlert = ($xPlugin instanceof \Jaxon\Dialog\Interfaces\Alert);
         $bIsConfirm = ($xPlugin instanceof \Jaxon\Dialog\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', ['name' => get_class($xPlugin)]));
         }
         // This plugin implements the Alert interface
-        if($bIsAlert)
+        if ($bIsAlert)
         {
             jaxon()->dialog()->setAlert($xPlugin);
         }
         // This plugin implements the Confirm interface
-        if($bIsConfirm)
+        if ($bIsConfirm)
         {
             jaxon()->dialog()->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);
         }
@@ -192,7 +192,7 @@ 
      */
     public function register($sType, $sCallable, $aOptions = [])
     {
-        if(!key_exists($sType, $this->aRequestPlugins))
+        if (!key_exists($sType, $this->aRequestPlugins))
         {
             throw new \Jaxon\Exception\Error($this->trans('errors.register.plugin', ['name' => $sType]));
         }
@@ -220,14 +220,14 @@ 
     {
         // Register user functions
         $aFunctionsConfig = $xAppConfig->getOption('functions', []);
-        foreach($aFunctionsConfig as $xKey => $xValue)
+        foreach ($aFunctionsConfig as $xKey => $xValue)
         {
-            if(is_integer($xKey) && is_string($xValue))
+            if (is_integer($xKey) && is_string($xValue))
             {
                 // Register a function without options
                 $this->register(Jaxon::USER_FUNCTION, $xValue);
             }
-            elseif(is_string($xKey) && is_array($xValue))
+            elseif (is_string($xKey) && is_array($xValue))
             {
                 // Register a function with options
                 $this->register(Jaxon::USER_FUNCTION, $xKey, $xValue);
@@ -241,22 +241,22 @@ 
 
         // Register classes and directories
         $aClassesConfig = $xAppConfig->getOption('classes', []);
-        foreach($aClassesConfig as $xKey => $xValue)
+        foreach ($aClassesConfig as $xKey => $xValue)
         {
-            if(is_integer($xKey) && is_string($xValue))
+            if (is_integer($xKey) && is_string($xValue))
             {
                 // Register a class without options
                 $this->register(Jaxon::CALLABLE_CLASS, $xValue);
             }
-            elseif(is_string($xKey) && is_array($xValue))
+            elseif (is_string($xKey) && is_array($xValue))
             {
                 // Register a class with options
                 $this->register(Jaxon::CALLABLE_CLASS, $xKey, $xValue);
             }
-            elseif(is_integer($xKey) && is_array($xValue))
+            elseif (is_integer($xKey) && is_array($xValue))
             {
                 // The directory path is required
-                if(!key_exists('directory', $xValue))
+                if (!key_exists('directory', $xValue))
                 {
                     continue;
                     // Todo: throw an exception
@@ -264,17 +264,17 @@ 
                 // Registering a directory
                 $sDirectory = $xValue['directory'];
                 $aOptions = [];
-                if(key_exists('options', $xValue) &&
+                if (key_exists('options', $xValue) &&
                     (is_array($xValue['options']) || is_string($xValue['options'])))
                 {
                     $aOptions = $xValue['options'];
                 }
                 // Setup directory options
-                if(key_exists('namespace', $xValue))
+                if (key_exists('namespace', $xValue))
                 {
                     $aOptions['namespace'] = $xValue['namespace'];
                 }
-                if(key_exists('separator', $xValue))
+                if (key_exists('separator', $xValue))
                 {
                     $aOptions['separator'] = $xValue['separator'];
                 }
@@ -299,7 +299,7 @@ 
      */
     public function getResponsePlugin($sName)
     {
-        if(array_key_exists($sName, $this->aResponsePlugins))
+        if (array_key_exists($sName, $this->aResponsePlugins))
         {
             return $this->aResponsePlugins[$sName];
         }
@@ -315,7 +315,7 @@ 
      */
     public function getRequestPlugin($sName)
     {
-        if(array_key_exists($sName, $this->aRequestPlugins))
+        if (array_key_exists($sName, $this->aRequestPlugins))
         {
             return $this->aRequestPlugins[$sName];
         }

src/Request/Factory.php

Doc Comments -2 removed lines

@@ -96,7 +96,6 @@ 
      * Return the javascript call to a Jaxon function or object method
      *
      * @param string            $sFunction          The function or method (without class) name
-     * @param ...               $xParams            The parameters of the function or method
      *
      * @return Request
      */
@@ -125,7 +124,6 @@ 
      * Return the javascript call to a generic function
      *
      * @param string            $sFunction          The function or method (with class) name
-     * @param ...               $xParams            The parameters of the function or method
      *
      * @return Request
      */

Spacing +3 added lines, -3 removed lines

@@ -61,12 +61,12 @@ 
         $this->sPrefix = $this->getOption('core.prefix.function');
 
         $sClass = trim($sClass, '.\\ ');
-        if(!$sClass)
+        if (!$sClass)
         {
             return $this;
         }
 
-        if(!($xCallable = $this->xRepository->getCallableObject($sClass)))
+        if (!($xCallable = $this->xRepository->getCallableObject($sClass)))
         {
             // Todo: decide which of these values to return
             // return null;
@@ -107,7 +107,7 @@ 
         array_shift($aArguments);
 
         // Makes legacy code works
-        if(strpos($sFunction, '.') !== false)
+        if (strpos($sFunction, '.') !== false)
         {
             // If there is a dot in the name, then it is a call to a class
             $this->sPrefix = $this->getOption('core.prefix.class');

src/Request/Factory/Request.php

Unused Use Statements -1 removed lines

@@ -20,7 +20,6 @@
 
 namespace Jaxon\Request\Factory;
 
-use JsonSerializable;
 use Jaxon\Jaxon;
 
 class Request extends JsCall

Spacing +16 added lines, -16 removed lines

@@ -51,9 +51,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;
             }
@@ -71,9 +71,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;
@@ -91,7 +91,7 @@ 
      */
     private function setMessageArgs(array $aArgs)
     {
-        array_walk($aArgs, function (&$xParameter) {
+        array_walk($aArgs, function(&$xParameter) {
             $xParameter = Parameter::make($xParameter);
         });
         $this->aMessageArgs = $aArgs;
@@ -146,12 +146,12 @@ 
         // This array will avoid declaring multiple variables with the same value.
         // The array key is the variable value, while the array value is the variable name.
         $aVariables = []; // Array of local variables.
-        foreach($this->aParameters as &$xParameter)
+        foreach ($this->aParameters as &$xParameter)
         {
             $sParameterStr = $xParameter->getScript();
-            if($xParameter instanceof \Jaxon\Response\Plugin\JQuery\Dom\Element)
+            if ($xParameter instanceof \Jaxon\Response\Plugin\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";
@@ -169,19 +169,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\Response\Plugin\JQuery\Dom\Element)
+                    if ($xParameter instanceof \Jaxon\Response\Plugin\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";
@@ -205,14 +205,14 @@ 
 
         $sScript = parent::getScript();
         $xDialog = jaxon()->dialog();
-        if($this->sCondition == '__confirm__')
+        if ($this->sCondition == '__confirm__')
         {
             $sScript = $xDialog->confirm($sPhrase, $sScript, '');
         }
-        elseif($this->sCondition !== null)
+        elseif ($this->sCondition !== null)
         {
             $sScript = 'if(' . $this->sCondition . '){' . $sScript . ';}';
-            if(($sPhrase))
+            if (($sPhrase))
             {
                 $xDialog->getAlert()->setReturn(true);
                 $sScript .= 'else{' . $xDialog->warning($sPhrase) . ';}';

Braces +3 added lines, -6 removed lines

@@ -270,8 +270,7 @@ 
                     $aVariables[$sParameterStr] = $sVarName;
                     $sVars .= "$sVarName=$xParameter;";
                     $nVarId++;
-                }
-                else
+                } else
                 {
                     // The value is already defined. The corresponding variable is assigned.
                     $sVarName = $aVariables[$sParameterStr];
@@ -300,8 +299,7 @@ 
                             $aVariables[$sParameterStr] = $sVarName;
                             $sVars .= "$sVarName=$xParameter;";
                             $nVarId++;
-                        }
-                        else
+                        } else
                         {
                             // The value is already defined. The corresponding variable is assigned.
                             $sVarName = $aVariables[$sParameterStr];
@@ -320,8 +318,7 @@ 
         if($this->sCondition == '__confirm__')
         {
             $sScript = $xDialog->confirm($sPhrase, $sScript, '');
-        }
-        elseif($this->sCondition !== null)
+        } elseif($this->sCondition !== null)
         {
             $sScript = 'if(' . $this->sCondition . '){' . $sScript . ';}';
             if(($sPhrase))

src/Request/Plugin/CallableClass.php

Spacing +12 added lines, -12 removed lines

@@ -60,19 +60,19 @@ 
     {
         $this->xRepository = $xRepository;
 
-        if(!empty($_GET['jxncls']))
+        if (!empty($_GET['jxncls']))
         {
             $this->sRequestedClass = $_GET['jxncls'];
         }
-        if(!empty($_GET['jxnmthd']))
+        if (!empty($_GET['jxnmthd']))
         {
             $this->sRequestedMethod = $_GET['jxnmthd'];
         }
-        if(!empty($_POST['jxncls']))
+        if (!empty($_POST['jxncls']))
         {
             $this->sRequestedClass = $_POST['jxncls'];
         }
-        if(!empty($_POST['jxnmthd']))
+        if (!empty($_POST['jxnmthd']))
         {
             $this->sRequestedMethod = $_POST['jxnmthd'];
         }
@@ -99,20 +99,20 @@ 
      */
     public function register($sType, $sClassName, $aOptions)
     {
-        if($sType != $this->getName())
+        if ($sType != $this->getName())
         {
             return false;
         }
 
-        if(!is_string($sClassName))
+        if (!is_string($sClassName))
         {
             throw new \Jaxon\Exception\Error($this->trans('errors.objects.invalid-declaration'));
         }
-        if(is_string($aOptions))
+        if (is_string($aOptions))
         {
             $aOptions = ['include' => $aOptions];
         }
-        if(!is_array($aOptions))
+        if (!is_array($aOptions))
         {
             throw new \Jaxon\Exception\Error($this->trans('errors.objects.invalid-declaration'));
         }
@@ -150,7 +150,7 @@ 
     public function canProcessRequest()
     {
         // Check the validity of the class name
-        if(($this->sRequestedClass !== null && !$this->validateClass($this->sRequestedClass)) ||
+        if (($this->sRequestedClass !== null && !$this->validateClass($this->sRequestedClass)) ||
             ($this->sRequestedMethod !== null && !$this->validateMethod($this->sRequestedMethod)))
         {
             $this->sRequestedClass = null;
@@ -166,14 +166,14 @@ 
      */
     public function processRequest()
     {
-        if(!$this->canProcessRequest())
+        if (!$this->canProcessRequest())
         {
             return false;
         }
 
         // Find the requested method
         $xCallableObject = $this->xRepository->getCallableObject($this->sRequestedClass);
-        if(!$xCallableObject || !$xCallableObject->hasMethod($this->sRequestedMethod))
+        if (!$xCallableObject || !$xCallableObject->hasMethod($this->sRequestedMethod))
         {
             // Unable to find the requested object or method
             throw new \Jaxon\Exception\Error($this->trans('errors.objects.invalid',
@@ -184,7 +184,7 @@ 
         $jaxon = jaxon();
         $aArgs = $jaxon->getRequestHandler()->processArguments();
         $xResponse = $xCallableObject->call($this->sRequestedMethod, $aArgs);
-        if(($xResponse))
+        if (($xResponse))
         {
             $jaxon->getResponseManager()->append($xResponse);
         }

src/Request/Factory/Parameter.php

Spacing +8 added lines, -8 removed lines

@@ -84,19 +84,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);
         }
@@ -115,16 +115,16 @@ 
     {
         $sJsCode = '';
         $sQuoteCharacter = "'";
-        switch($this->sType)
+        switch ($this->sType)
         {
         case Jaxon::FORM_VALUES:
             $sJsCode = "jaxon.getFormValues(" . $sQuoteCharacter . $this->xValue . $sQuoteCharacter . ")";
             break;
         case Jaxon::INPUT_VALUE:
-            $sJsCode = "jaxon.$("  . $sQuoteCharacter . $this->xValue . $sQuoteCharacter  . ").value";
+            $sJsCode = "jaxon.$(" . $sQuoteCharacter . $this->xValue . $sQuoteCharacter . ").value";
             break;
         case Jaxon::CHECKED_VALUE:
-            $sJsCode = "jaxon.$("  . $sQuoteCharacter . $this->xValue  . $sQuoteCharacter . ").checked";
+            $sJsCode = "jaxon.$(" . $sQuoteCharacter . $this->xValue . $sQuoteCharacter . ").checked";
             break;
         case Jaxon::ELEMENT_INNERHTML:
             $sJsCode = "jaxon.$(" . $sQuoteCharacter . $this->xValue . $sQuoteCharacter . ").innerHTML";
@@ -142,7 +142,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/Factory/JsCall.php

Spacing +2 added lines, -2 removed lines

@@ -168,9 +168,9 @@
      */
     public function addParameters(array $aParameters)
     {
-        foreach($aParameters as $xParameter)
+        foreach ($aParameters as $xParameter)
         {
-            if($xParameter instanceof JsCall)
+            if ($xParameter instanceof JsCall)
             {
                 $this->addParameter(Jaxon::JS_VALUE, 'function(){' . $xParameter->getScript() . ';}');
             }

Braces +1 added lines, -2 removed lines

@@ -173,8 +173,7 @@
             if($xParameter instanceof JsCall)
             {
                 $this->addParameter(Jaxon::JS_VALUE, 'function(){' . $xParameter->getScript() . ';}');
-            }
-            else
+            } else
             {
                 $this->pushParameter(Parameter::make($xParameter));
             }