jaxon-php / jaxon-core

src/Plugin/Manager.php

Unused Use Statements -3 removed lines

@@ -22,15 +22,12 @@
 namespace Jaxon\Plugin;
 
 use Jaxon\Jaxon;
-use Jaxon\Plugin\Package;
-use Jaxon\Request\Support\CallableRepository;
 use Jaxon\Request\Plugin\CallableClass;
 use Jaxon\Request\Plugin\CallableDir;
 use Jaxon\Request\Plugin\CallableFunction;
 use Jaxon\Request\Plugin\FileUpload;
 use Jaxon\Response\Plugin\JQuery as JQueryPlugin;
 use Jaxon\Utils\Config\Config;
-
 use Closure;
 
 class Manager

Spacing +12 added lines, -12 removed lines

@@ -138,33 +138,33 @@ 
         $bIsAlert = ($xPlugin instanceof \Jaxon\Contracts\Dialogs\Alert);
         $bIsConfirm = ($xPlugin instanceof \Jaxon\Contracts\Dialogs\Confirm);
         $bIsListener = ($xPlugin instanceof \Jaxon\Contracts\Event\Listener);
-        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 && !$bIsListener)
+        elseif (!$bIsConfirm && !$bIsAlert && !$bIsListener)
         {
             $sErrorMessage = $this->trans('errors.register.invalid', ['name' => get_class($xPlugin)]);
             throw new \Jaxon\Exception\Error($sErrorMessage);
         }
         // 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($bIsListener)
+        if ($bIsListener)
         {
             $this->addEventListener($xPlugin);
         }
@@ -199,7 +199,7 @@ 
      */
     public function registerCallable($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 @@ 
     private function registerCallablesFromConfig($xAppConfig, $sSection, $sCallableType)
     {
         $aConfig = $xAppConfig->getOption($sSection, []);
-        foreach($aConfig as $xKey => $xValue)
+        foreach ($aConfig as $xKey => $xValue)
         {
-            if(is_integer($xKey) && is_string($xValue))
+            if (is_integer($xKey) && is_string($xValue))
             {
                 // Register a function without options
                 $this->registerCallable($sCallableType, $xValue);
             }
-            elseif(is_string($xKey) && (is_array($xValue) || is_string($xValue)))
+            elseif (is_string($xKey) && (is_array($xValue) || is_string($xValue)))
             {
                 // Register a function with options
                 $this->registerCallable($sCallableType, $xKey, $xValue);
@@ -269,7 +269,7 @@ 
      */
     public function getResponsePlugin($sName)
     {
-        if(array_key_exists($sName, $this->aResponsePlugins))
+        if (array_key_exists($sName, $this->aResponsePlugins))
         {
             return $this->aResponsePlugins[$sName];
         }
@@ -285,7 +285,7 @@ 
      */
     public function getRequestPlugin($sName)
     {
-        if(array_key_exists($sName, $this->aRequestPlugins))
+        if (array_key_exists($sName, $this->aRequestPlugins))
         {
             return $this->aRequestPlugins[$sName];
         }

Braces +4 added lines, -8 removed lines

@@ -142,13 +142,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 && !$bIsListener)
+        } elseif(!$bIsConfirm && !$bIsAlert && !$bIsListener)
         {
             $sErrorMessage = $this->trans('errors.register.invalid', ['name' => get_class($xPlugin)]);
             throw new \Jaxon\Exception\Error($sErrorMessage);
@@ -226,13 +224,11 @@ 
             {
                 // Register a function without options
                 $this->registerCallable($sCallableType, $xValue);
-            }
-            elseif(is_string($xKey) && (is_array($xValue) || is_string($xValue)))
+            } elseif(is_string($xKey) && (is_array($xValue) || is_string($xValue)))
             {
                 // Register a function with options
                 $this->registerCallable($sCallableType, $xKey, $xValue);
-            }
-            else
+            } else
             {
                 continue;
                 // Todo: throw an exception

src/Request/Factory/RequestFactory.php

Doc Comments +2 added lines, -4 removed lines

@@ -53,7 +53,7 @@ 
      *
      * @param string|null       $sClass              The callable class
      *
-     * @return Factory
+     * @return RequestFactory
      */
     public function setClassName($sClass)
     {
@@ -80,7 +80,7 @@ 
      *
      * @param CallableObject    $xCallable              The callable object
      *
-     * @return Factory
+     * @return RequestFactory
      */
     public function setCallable(CallableObject $xCallable)
     {
@@ -93,7 +93,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
      */
@@ -122,7 +121,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
      */

Unused Use Statements -1 removed lines

@@ -17,7 +17,6 @@
 
 use Jaxon\Request\Support\CallableObject;
 use Jaxon\Request\Support\CallableRepository;
-use Jaxon\Utils\Pagination\Paginator;
 
 // Extends Parameter for compatibility with older versions (see function rq())
 class RequestFactory

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

Doc Comments +3 added lines, -1 removed lines

@@ -140,6 +140,7 @@ 
      * This is the pre-request processing callback passed to the Jaxon library.
      *
      * @param  boolean  &$bEndRequest if set to true, the request processing is interrupted.
+     * @param boolean $bEndRequest
      *
      * @return Jaxon\Response\Response  the Jaxon response
      */
@@ -170,6 +171,7 @@ 
     /**
      * This callback is called whenever an invalid request is processed.
      *
+     * @param string $sMessage
      * @return Jaxon\Response\Response  the Jaxon response
      */
     public function onInvalid($sMessage)
@@ -236,7 +238,7 @@ 
      * Calls each of the request plugins to request that they process the current request.
      * If any plugin processes the request, it will return true.
      *
-     * @return boolean
+     * @return boolean|null
      */
     public function processRequest()
     {

Unused Use Statements -1 removed lines

@@ -24,7 +24,6 @@
 use Jaxon\Plugin\Manager as PluginManager;
 use Jaxon\Response\Manager as ResponseManager;
 use Jaxon\Request\Plugin\FileUpload;
-
 use Exception;
 
 class Handler

Spacing +19 added lines, -19 removed lines

@@ -146,7 +146,7 @@ 
     public function onBefore(&$bEndRequest)
     {
         // Call the user defined callback
-        if(($xCallback = $this->xCallbackManager->before()))
+        if (($xCallback = $this->xCallbackManager->before()))
         {
             call_user_func_array($xCallback, [$this->xTargetRequestPlugin->getTarget(), &$bEndRequest]);
         }
@@ -160,7 +160,7 @@ 
      */
     public function onAfter($bEndRequest)
     {
-        if(($xCallback = $this->xCallbackManager->after()))
+        if (($xCallback = $this->xCallbackManager->after()))
         {
             call_user_func_array($xCallback, [$this->xTargetRequestPlugin->getTarget(), $bEndRequest]);
         }
@@ -174,7 +174,7 @@ 
      */
     public function onInvalid($sMessage)
     {
-        if(($xCallback = $this->xCallbackManager->invalid()))
+        if (($xCallback = $this->xCallbackManager->invalid()))
         {
             call_user_func_array($xCallback, [$sMessage]);
         }
@@ -188,7 +188,7 @@ 
      */
     public function onError(Exception $xException)
     {
-        if(($xCallback = $this->xCallbackManager->error()))
+        if (($xCallback = $this->xCallbackManager->error()))
         {
             call_user_func_array($xCallback, [$xException]);
         }
@@ -209,15 +209,15 @@ 
     public function canProcessRequest()
     {
         // Return true if the request plugin was already found
-        if(($this->xTargetRequestPlugin))
+        if (($this->xTargetRequestPlugin))
         {
             return true;
         }
 
         // Find a plugin to process the request
-        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())
             {
                 $this->xTargetRequestPlugin = $xPlugin;
                 return true;
@@ -241,7 +241,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', [
                 'location' => $filename . ':' . $linenumber
@@ -250,7 +250,7 @@ 
         }
 
         // Check if there is a plugin to process this request
-        if(!$this->canProcessRequest())
+        if (!$this->canProcessRequest())
         {
             return;
         }
@@ -258,12 +258,12 @@ 
         $bEndRequest = false;
 
         // Handle before processing event
-        if(($this->xTargetRequestPlugin))
+        if (($this->xTargetRequestPlugin))
         {
             $this->onBefore($bEndRequest);
         }
 
-        if(!$bEndRequest)
+        if (!$bEndRequest)
         {
             try
             {
@@ -271,12 +271,12 @@ 
                 $this->xUploadRequestPlugin->processRequest();
 
                 // Process the request
-                if(($this->xTargetRequestPlugin))
+                if (($this->xTargetRequestPlugin))
                 {
                     $this->xTargetRequestPlugin->processRequest();
                 }
             }
-            catch(Exception $e)
+            catch (Exception $e)
             {
                 // An exception was thrown while processing the request.
                 // The request missed the corresponding handler function,
@@ -284,7 +284,7 @@ 
 
                 $this->xResponseManager->error($e->getMessage());
 
-                if($e instanceof \Jaxon\Exception\Error)
+                if ($e instanceof \Jaxon\Exception\Error)
                 {
                     $this->onInvalid($e->getMessage());
                 }
@@ -296,7 +296,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)
@@ -306,26 +306,26 @@ 
             error_reporting($er);
         }
 
-        if(($this->xTargetRequestPlugin))
+        if (($this->xTargetRequestPlugin))
         {
             // Handle after processing event
             $this->onAfter($bEndRequest);
         }
 
         // If the called function returned no response, take the the global response
-        if(!$this->xResponseManager->getResponse())
+        if (!$this->xResponseManager->getResponse())
         {
             $this->xResponseManager->append(jaxon()->getResponse());
         }
 
         $this->xResponseManager->printDebug();
 
-        if(($this->getOption('core.response.send')))
+        if (($this->getOption('core.response.send')))
         {
             $this->xResponseManager->sendOutput();
         }
 
-        if(($this->getOption('core.process.exit')))
+        if (($this->getOption('core.process.exit')))
         {
             exit();
         }

Braces +3 added lines, -6 removed lines

@@ -191,8 +191,7 @@ 
         if(($xCallback = $this->xCallbackManager->error()))
         {
             call_user_func_array($xCallback, [$xException]);
-        }
-        else
+        } else
         {
             throw $xException;
         }
@@ -275,8 +274,7 @@ 
                 {
                     $this->xTargetRequestPlugin->processRequest();
                 }
-            }
-            catch(Exception $e)
+            } catch(Exception $e)
             {
                 // An exception was thrown while processing the request.
                 // The request missed the corresponding handler function,
@@ -287,8 +285,7 @@ 
                 if($e instanceof \Jaxon\Exception\Error)
                 {
                     $this->onInvalid($e->getMessage());
-                }
-                else
+                } else
                 {
                     $this->onError($e);
                 }

src/Request/Handler/Argument.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 +29 added lines, -29 removed lines

@@ -58,17 +58,17 @@ 
         $this->aArgs = [];
         $this->nMethod = self::METHOD_UNKNOWN;
 
-        if(isset($_POST['jxnargs']))
+        if (isset($_POST['jxnargs']))
         {
             $this->nMethod = self::METHOD_POST;
             $this->aArgs = $_POST['jxnargs'];
         }
-        elseif(isset($_GET['jxnargs']))
+        elseif (isset($_GET['jxnargs']))
         {
             $this->nMethod = self::METHOD_GET;
             $this->aArgs = $_GET['jxnargs'];
         }
-        if(get_magic_quotes_gpc() == 1)
+        if (get_magic_quotes_gpc() == 1)
         {
             array_walk($this->aArgs, [&$this, '__argumentStripSlashes']);
         }
@@ -84,17 +84,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;
             }
@@ -112,7 +112,7 @@ 
      */
     private function __argumentStripSlashes(&$sArg)
     {
-        if(!is_string($sArg))
+        if (!is_string($sArg))
         {
             return '';
         }
@@ -160,7 +160,7 @@ 
      */
     private function __argumentDecode(&$sArg)
     {
-        if($sArg == '')
+        if ($sArg == '')
         {
             return '';
         }
@@ -169,22 +169,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;
         }
@@ -203,13 +203,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]);
@@ -218,7 +218,7 @@ 
                 $this->__argumentDecodeUTF8_iconv($xArg);
             }
         }
-        elseif(is_string($mArg))
+        elseif (is_string($mArg))
         {
             $mArg = iconv("UTF-8", $this->getOption('core.encoding') . '//TRANSLIT', $mArg);
         }
@@ -233,13 +233,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]);
@@ -248,7 +248,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");
         }
@@ -263,14 +263,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]);
@@ -280,7 +280,7 @@ 
                 $this->__argumentDecodeUTF8_utf8_decode($xArg);
             }
         }
-        elseif(is_string($mArg))
+        elseif (is_string($mArg))
         {
             $mArg = utf8_decode($mArg);
         }
@@ -305,19 +305,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 +9 added lines, -18 removed lines

@@ -62,8 +62,7 @@ 
         {
             $this->nMethod = self::METHOD_POST;
             $this->aArgs = $_POST['jxnargs'];
-        }
-        elseif(isset($_GET['jxnargs']))
+        } elseif(isset($_GET['jxnargs']))
         {
             $this->nMethod = self::METHOD_GET;
             $this->aArgs = $_GET['jxnargs'];
@@ -172,8 +171,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);
         }
@@ -187,8 +185,7 @@ 
         if($data !== null && $sArg != $data)
         {
             $sArg = $data;
-        }
-        else
+        } else
         {
             $sArg = $this->__convertValue($sArg);
         }
@@ -217,8 +214,7 @@ 
                 }
                 $this->__argumentDecodeUTF8_iconv($xArg);
             }
-        }
-        elseif(is_string($mArg))
+        } elseif(is_string($mArg))
         {
             $mArg = iconv("UTF-8", $this->getOption('core.encoding') . '//TRANSLIT', $mArg);
         }
@@ -247,8 +243,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");
         }
@@ -279,8 +274,7 @@ 
 
                 $this->__argumentDecodeUTF8_utf8_decode($xArg);
             }
-        }
-        elseif(is_string($mArg))
+        } elseif(is_string($mArg))
         {
             $mArg = utf8_decode($mArg);
         }
@@ -312,16 +306,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/Plugin/CallableFunction.php

Doc Comments +1 added lines, -1 removed lines

@@ -90,7 +90,7 @@
      * @param string        $sCallableFunction  The name of the function being registered
      * @param array|string  $aOptions       The associated options
      *
-     * @return \Jaxon\Request\Request
+     * @return boolean
      */
     public function register($sType, $sCallableFunction, $aOptions)
     {

Spacing +16 added lines, -16 removed lines

@@ -49,11 +49,11 @@ 
      */
     public function __construct()
     {
-        if(isset($_GET['jxnfun']))
+        if (isset($_GET['jxnfun']))
         {
             $this->sRequestedFunction = $_GET['jxnfun'];
         }
-        if(isset($_POST['jxnfun']))
+        if (isset($_POST['jxnfun']))
         {
             $this->sRequestedFunction = $_POST['jxnfun'];
         }
@@ -76,7 +76,7 @@ 
      */
     public function getTarget()
     {
-        if(!$this->sRequestedFunction)
+        if (!$this->sRequestedFunction)
         {
             return null;
         }
@@ -95,21 +95,21 @@ 
     public function register($sType, $sCallableFunction, $aOptions)
     {
         $sType = trim($sType);
-        if($sType != $this->getName())
+        if ($sType != $this->getName())
         {
             return false;
         }
 
-        if(!is_string($sCallableFunction))
+        if (!is_string($sCallableFunction))
         {
             throw new \Jaxon\Exception\Error($this->trans('errors.functions.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.functions.invalid-declaration'));
         }
@@ -117,9 +117,9 @@ 
         $sCallableFunction = trim($sCallableFunction);
         // Check if an alias is defined
         $sFunctionName = $sCallableFunction;
-        foreach($aOptions as $sName => $sValue)
+        foreach ($aOptions as $sName => $sValue)
         {
-            if($sName == 'alias')
+            if ($sName == 'alias')
             {
                 $sFunctionName = $sValue;
                 break;
@@ -127,11 +127,11 @@ 
         }
 
         $this->aFunctions[$sFunctionName] = $aOptions;
-        jaxon()->di()->set($sFunctionName, function () use ($sFunctionName, $sCallableFunction) {
+        jaxon()->di()->set($sFunctionName, function() use ($sFunctionName, $sCallableFunction) {
             $xCallableFunction = new \Jaxon\Request\Support\CallableFunction($sCallableFunction);
 
             $aOptions = $this->aFunctions[$sFunctionName];
-            foreach($aOptions as $sName => $sValue)
+            foreach ($aOptions as $sName => $sValue)
             {
                 $xCallableFunction->configure($sName, $sValue);
             }
@@ -161,7 +161,7 @@ 
     {
         $di = jaxon()->di();
         $code = '';
-        foreach(array_keys($this->aFunctions) as $sName)
+        foreach (array_keys($this->aFunctions) as $sName)
         {
             $xFunction = $di->get($sName);
             $code .= $xFunction->getScript();
@@ -177,7 +177,7 @@ 
     public function canProcessRequest()
     {
         // Check the validity of the function name
-        if(($this->sRequestedFunction) && !$this->validateFunction($this->sRequestedFunction))
+        if (($this->sRequestedFunction) && !$this->validateFunction($this->sRequestedFunction))
         {
             $this->sRequestedFunction = null;
         }
@@ -191,13 +191,13 @@ 
      */
     public function processRequest()
     {
-        if(!$this->canProcessRequest())
+        if (!$this->canProcessRequest())
         {
             return false;
         }
 
         // Security check: make sure the requested function was registered.
-        if(!key_exists($this->sRequestedFunction, $this->aFunctions))
+        if (!key_exists($this->sRequestedFunction, $this->aFunctions))
         {
             // Unable to find the requested function
             throw new \Jaxon\Exception\Error($this->trans('errors.functions.invalid',
@@ -208,7 +208,7 @@ 
         $xFunction = $di->get($this->sRequestedFunction);
         $aArgs = $di->getRequestHandler()->processArguments();
         $xResponse = $xFunction->call($aArgs);
-        if(($xResponse))
+        if (($xResponse))
         {
             $di->getResponseManager()->append($xResponse);
         }

src/Response/UploadResponse.php

Doc Comments +2 added lines

@@ -41,6 +41,7 @@ 
 
     /**
      * Set the path to the uploaded file
+     * @param string $sUploadedFile
      */
     public function setUploadedFile($sUploadedFile)
     {
@@ -49,6 +50,7 @@ 
 
     /**
      * Set the error message
+     * @param string $sErrorMessage
      */
     public function setErrorMessage($sErrorMessage)
     {

Spacing +2 added lines, -3 removed lines

@@ -86,7 +86,7 @@ 
     {
         $sCharacterSet = '';
         $sCharacterEncoding = trim($this->getOption('core.encoding'));
-        if(($sCharacterEncoding) && strlen($sCharacterEncoding) > 0)
+        if (($sCharacterEncoding) && strlen($sCharacterEncoding) > 0)
         {
             $sCharacterSet = '; charset="' . trim($sCharacterEncoding) . '"';
         }
@@ -102,8 +102,7 @@ 
     public function getOutput()
     {
         $aResponse = ($this->sUploadedFile) ?
-            ['code' => 'success', 'upl' => $this->sUploadedFile] :
-            ['code' => 'error', 'msg' => $this->sErrorMessage];
+            ['code' => 'success', 'upl' => $this->sUploadedFile] : ['code' => 'error', 'msg' => $this->sErrorMessage];
         return '<script>var res = ' . json_encode($aResponse) . '; </script>';
     }
 

src/Utils/View/Manager.php

Unused Use Statements -3 removed lines

@@ -3,9 +3,6 @@
 namespace Jaxon\Utils\View;
 
 use Jaxon\Utils\Config\Config;
-
-use stdClass;
-use Exception;
 use Closure;
 
 class Manager

Spacing +8 added lines, -8 removed lines

@@ -78,7 +78,7 @@ 
             'directory' => $sDirectory,
             'extension' => $sExtension,
         ];
-        if(key_exists($sRenderer, $this->aNamespaces))
+        if (key_exists($sRenderer, $this->aNamespaces))
         {
             $this->aNamespaces[$sRenderer][] = $aNamespace;
         }
@@ -99,12 +99,12 @@ 
     public function addNamespaces($xAppConfig)
     {
         $this->sDefaultNamespace = $xAppConfig->getOption('options.views.default', false);
-        if(is_array($namespaces = $xAppConfig->getOptionNames('views')))
+        if (is_array($namespaces = $xAppConfig->getOptionNames('views')))
         {
-            foreach($namespaces as $namespace => $option)
+            foreach ($namespaces as $namespace => $option)
             {
                 // If no default namespace is defined, use the first one as default.
-                if($this->sDefaultNamespace == false)
+                if ($this->sDefaultNamespace == false)
                 {
                     $this->sDefaultNamespace = $namespace;
                 }
@@ -126,7 +126,7 @@ 
      */
     public function getRenderer($sId = '')
     {
-        if(!$sId)
+        if (!$sId)
         {
             // Return the view renderer facade
             return jaxon()->di()->get(\Jaxon\Utils\View\Renderer::class);
@@ -149,14 +149,14 @@ 
         jaxon()->di()->set('jaxon.app.view.base.' . $sId, $xClosure);
 
         // Return the initialized view renderer
-        jaxon()->di()->set('jaxon.app.view.' . $sId, function ($c) use ($sId) {
+        jaxon()->di()->set('jaxon.app.view.' . $sId, function($c) use ($sId) {
             // Get the defined renderer
             $renderer = $c['jaxon.app.view.base.' . $sId];
 
             // Init the renderer with the template namespaces
-            if(key_exists($sId, $this->aNamespaces))
+            if (key_exists($sId, $this->aNamespaces))
             {
-                foreach($this->aNamespaces[$sId] as $ns)
+                foreach ($this->aNamespaces[$sId] as $ns)
                 {
                     $renderer->addNamespace($ns['namespace'], $ns['directory'], $ns['extension']);
                 }

Braces +1 added lines, -2 removed lines

@@ -81,8 +81,7 @@
         if(key_exists($sRenderer, $this->aNamespaces))
         {
             $this->aNamespaces[$sRenderer][] = $aNamespace;
-        }
-        else
+        } else
         {
             $this->aNamespaces[$sRenderer] = [$aNamespace];
         }

src/Utils/Session/Manager.php

Spacing +1 added lines, -1 removed lines

@@ -97,7 +97,7 @@
      */
     public function delete($sKey)
     {
-        if(key_exists($sKey, $_SESSION))
+        if (key_exists($sKey, $_SESSION))
         {
             unset($_SESSION[$sKey]);
         }

src/Utils/Pagination/Renderer.php

Spacing +4 added lines, -4 removed lines

@@ -46,7 +46,7 @@ 
      */
     protected function getPrevLink($xPaginator)
     {
-        if(!($sCall = $xPaginator->getPrevCall()))
+        if (!($sCall = $xPaginator->getPrevCall()))
         {
             return $this->xRenderer->render('pagination::links/disabled', ['text' => $xPaginator->getPreviousText()]);
         }
@@ -63,7 +63,7 @@ 
      */
     protected function getNextLink($xPaginator)
     {
-        if(!($sCall = $xPaginator->getNextCall()))
+        if (!($sCall = $xPaginator->getNextCall()))
         {
             return $this->xRenderer->render('pagination::links/disabled', ['text' => $xPaginator->getNextText()]);
         }
@@ -81,9 +81,9 @@ 
     protected function getLinks($xPaginator)
     {
         $sLinks = '';
-        foreach($xPaginator->getPages() as $page)
+        foreach ($xPaginator->getPages() as $page)
         {
-            if($page['call'])
+            if ($page['call'])
             {
                 $sTemplate = ($page['isCurrent'] ? 'pagination::links/current' : 'pagination::links/enabled');
                 $sLinks .= $this->xRenderer->render($sTemplate, ['call' => $page['call'], 'text' => $page['num']]);

Braces +1 added lines, -2 removed lines

@@ -87,8 +87,7 @@
             {
                 $sTemplate = ($page['isCurrent'] ? 'pagination::links/current' : 'pagination::links/enabled');
                 $sLinks .= $this->xRenderer->render($sTemplate, ['call' => $page['call'], 'text' => $page['num']]);
-            }
-            else
+            } else
             {
                 $sLinks .= $this->xRenderer->render('pagination::links/disabled', ['text' => $page['num']]);
             }