jaxon-php / jaxon-core

src/Request/Plugin/FileUpload.php

Indentation +1 added lines, -1 removed lines

@@ -217,7 +217,7 @@
             $aFiles[$sVarName] = [];
             foreach($aUserFiles as $aUserFile)
             {
-                 $aFiles[$sVarName][] = $aUserFile->toTempData();
+                    $aFiles[$sVarName][] = $aUserFile->toTempData();
             }
         }
         // Save upload data in a temp file

Unused Use Statements -1 removed lines

@@ -16,7 +16,6 @@
 use Jaxon\Plugin\Request as RequestPlugin;
 use Jaxon\Request\Support\UploadedFile;
 use Jaxon\Response\UploadResponse;
-
 use Exception;
 use Closure;
 

Spacing +31 added lines, -31 removed lines

@@ -68,11 +68,11 @@ 
     {
         $this->sUploadSubdir = uniqid() . DIRECTORY_SEPARATOR;
 
-        if(array_key_exists('jxnupl', $_POST))
+        if (array_key_exists('jxnupl', $_POST))
         {
             $this->sTempFile = $_POST['jxnupl'];
         }
-        elseif(array_key_exists('jxnupl', $_GET))
+        elseif (array_key_exists('jxnupl', $_GET))
         {
             $this->sTempFile = $_GET['jxnupl'];
         }
@@ -100,7 +100,7 @@ 
      */
     protected function filterFilename($sFilename, $sVarName)
     {
-        if(($this->cFileFilter))
+        if (($this->cFileFilter))
         {
             $cFileFilter = $this->cFileFilter;
             $sFilename = (string)$cFileFilter($sFilename, $sVarName);
@@ -122,12 +122,12 @@ 
         $sUploadDir = $this->getOption('upload.files.' . $sFieldId . '.dir', $sDefaultUploadDir);
         $sUploadDir = rtrim(trim($sUploadDir), '/\\') . DIRECTORY_SEPARATOR;
         // Verify that the upload dir exists and is writable
-        if(!is_writable($sUploadDir))
+        if (!is_writable($sUploadDir))
         {
             throw new \Jaxon\Exception\Error($this->trans('errors.upload.access'));
         }
         $sUploadDir .= $this->sUploadSubdir;
-        if(!file_exists($sUploadDir) && !@mkdir($sUploadDir))
+        if (!file_exists($sUploadDir) && !@mkdir($sUploadDir))
         {
             throw new \Jaxon\Exception\Error($this->trans('errors.upload.access'));
         }
@@ -145,12 +145,12 @@ 
         $sUploadDir = $this->getOption('upload.default.dir');
         $sUploadDir = rtrim(trim($sUploadDir), '/\\') . DIRECTORY_SEPARATOR;
         // Verify that the upload dir exists and is writable
-        if(!is_writable($sUploadDir))
+        if (!is_writable($sUploadDir))
         {
             throw new \Jaxon\Exception\Error($this->trans('errors.upload.access'));
         }
         $sUploadDir .= 'tmp' . DIRECTORY_SEPARATOR;
-        if(!file_exists($sUploadDir) && !@mkdir($sUploadDir))
+        if (!file_exists($sUploadDir) && !@mkdir($sUploadDir))
         {
             throw new \Jaxon\Exception\Error($this->trans('errors.upload.access'));
         }
@@ -168,7 +168,7 @@ 
         $sUploadDir = rtrim(trim($sUploadDir), '/\\') . DIRECTORY_SEPARATOR;
         $sUploadDir .= 'tmp' . DIRECTORY_SEPARATOR;
         $sUploadTempFile = $sUploadDir . $this->sTempFile . '.json';
-        if(!is_readable($sUploadTempFile))
+        if (!is_readable($sUploadTempFile))
         {
             throw new \Jaxon\Exception\Error($this->trans('errors.upload.access'));
         }
@@ -184,18 +184,18 @@ 
     {
         // Check validity of the uploaded files
         $aTempFiles = [];
-        foreach($_FILES as $sVarName => $aFile)
+        foreach ($_FILES as $sVarName => $aFile)
         {
-            if(is_array($aFile['name']))
+            if (is_array($aFile['name']))
             {
                 $nFileCount = count($aFile['name']);
-                for($i = 0; $i < $nFileCount; $i++)
+                for ($i = 0; $i < $nFileCount; $i++)
                 {
-                    if(!$aFile['name'][$i])
+                    if (!$aFile['name'][$i])
                     {
                         continue;
                     }
-                    if(!array_key_exists($sVarName, $aTempFiles))
+                    if (!array_key_exists($sVarName, $aTempFiles))
                     {
                         $aTempFiles[$sVarName] = [];
                     }
@@ -215,11 +215,11 @@ 
             }
             else
             {
-                if(!$aFile['name'])
+                if (!$aFile['name'])
                 {
                     continue;
                 }
-                if(!array_key_exists($sVarName, $aTempFiles))
+                if (!array_key_exists($sVarName, $aTempFiles))
                 {
                     $aTempFiles[$sVarName] = [];
                 }
@@ -239,17 +239,17 @@ 
         }
 
         // Check uploaded files validity
-        foreach($aTempFiles as $sVarName => $aFiles)
+        foreach ($aTempFiles as $sVarName => $aFiles)
         {
-            foreach($aFiles as $aFile)
+            foreach ($aFiles as $aFile)
             {
                 // Verify upload result
-                if($aFile['error'] != 0)
+                if ($aFile['error'] != 0)
                 {
                     throw new \Jaxon\Exception\Error($this->trans('errors.upload.failed', $aFile));
                 }
                 // Verify file validity (format, size)
-                if(!$this->validateUploadedFile($sVarName, $aFile))
+                if (!$this->validateUploadedFile($sVarName, $aFile))
                 {
                     throw new \Jaxon\Exception\Error($this->getValidatorMessage());
                 }
@@ -259,10 +259,10 @@ 
         }
 
         // Copy the uploaded files from the temp dir to the user dir
-        foreach($aTempFiles as $sVarName => $_aTempFiles)
+        foreach ($aTempFiles as $sVarName => $_aTempFiles)
         {
             $this->aUserFiles[$sVarName] = [];
-            foreach($_aTempFiles as $aFile)
+            foreach ($_aTempFiles as $aFile)
             {
                 // Get the path to the upload dir
                 $sUploadDir = $this->getUploadDir($sVarName);
@@ -284,10 +284,10 @@ 
     {
         // Convert uploaded file to an array
         $aFiles = [];
-        foreach($this->aUserFiles as $sVarName => $aUserFiles)
+        foreach ($this->aUserFiles as $sVarName => $aUserFiles)
         {
             $aFiles[$sVarName] = [];
-            foreach($aUserFiles as $aUserFile)
+            foreach ($aUserFiles as $aUserFile)
             {
                  $aFiles[$sVarName][] = $aUserFile->toTempData();
             }
@@ -308,10 +308,10 @@ 
         // Upload temp file
         $sUploadTempFile = $this->getUploadTempFile();
         $aFiles = json_decode(file_get_contents($sUploadTempFile), true);
-        foreach($aFiles as $sVarName => $aUserFiles)
+        foreach ($aFiles as $sVarName => $aUserFiles)
         {
             $this->aUserFiles[$sVarName] = [];
-            foreach($aUserFiles as $aUserFile)
+            foreach ($aUserFiles as $aUserFile)
             {
                 $this->aUserFiles[$sVarName][] = UploadedFile::fromTempData($aUserFile);
             }
@@ -378,7 +378,7 @@ 
      */
     public function noRequestPluginFound()
     {
-        if(count($_FILES) > 0)
+        if (count($_FILES) > 0)
         {
             $this->bRequestIsHttpUpload = true;
         }
@@ -401,17 +401,17 @@ 
      */
     public function processRequest()
     {
-        if(!$this->canProcessRequest())
+        if (!$this->canProcessRequest())
         {
             return false;
         }
 
-        if(count($_FILES) > 0)
+        if (count($_FILES) > 0)
         {
             // Ajax request with upload
             $this->readFromHttpData();
 
-            if($this->bRequestIsHttpUpload)
+            if ($this->bRequestIsHttpUpload)
             {
                 // Process an HTTP upload request
                 // This requires to set the response to be returned.
@@ -421,14 +421,14 @@ 
                     $this->saveToTempFile();
                     $xResponse->setUploadedFile($this->sTempFile);
                 }
-                catch(Exception $e)
+                catch (Exception $e)
                 {
                     $xResponse->setErrorMessage($e->getMessage());
                 }
                 jaxon()->di()->getResponseManager()->append($xResponse);
             }
         }
-        elseif(($this->sTempFile))
+        elseif (($this->sTempFile))
         {
             // Ajax request following and HTTP upload
             $this->readFromTempFile();

Braces +4 added lines, -8 removed lines

@@ -71,8 +71,7 @@ 
         if(array_key_exists('jxnupl', $_POST))
         {
             $this->sTempFile = $_POST['jxnupl'];
-        }
-        elseif(array_key_exists('jxnupl', $_GET))
+        } elseif(array_key_exists('jxnupl', $_GET))
         {
             $this->sTempFile = $_GET['jxnupl'];
         }
@@ -212,8 +211,7 @@ 
                         'extension' => pathinfo($aFile['name'][$i], PATHINFO_EXTENSION),
                     ];
                 }
-            }
-            else
+            } else
             {
                 if(!$aFile['name'])
                 {
@@ -420,15 +418,13 @@ 
                 {
                     $this->saveToTempFile();
                     $xResponse->setUploadedFile($this->sTempFile);
-                }
-                catch(Exception $e)
+                } catch(Exception $e)
                 {
                     $xResponse->setErrorMessage($e->getMessage());
                 }
                 jaxon()->di()->getResponseManager()->append($xResponse);
             }
-        }
-        elseif(($this->sTempFile))
+        } elseif(($this->sTempFile))
         {
             // Ajax request following and HTTP upload
             $this->readFromTempFile();

templates/plugins/config.js.php

Spacing +5 added lines, -5 removed lines

@@ -14,18 +14,18 @@
 jaxon.config.defaultMode = "<?php echo $this->sDefaultMode ?>";
 jaxon.config.defaultMethod = "<?php echo $this->sDefaultMethod ?>";
 jaxon.config.responseType = "<?php echo $this->sResponseType ?>";
-<?php if($this->nResponseQueueSize > 0): ?>
+<?php if ($this->nResponseQueueSize > 0): ?>
 jaxon.config.responseQueueSize = <?php echo $this->nResponseQueueSize ?>;
 <?php endif ?>
-<?php if(($this->bDebug)): ?>
-<?php if(($this->sDebugOutputID)): ?>
+<?php if (($this->bDebug)): ?>
+<?php if (($this->sDebugOutputID)): ?>
 jaxon.debug.outputID = "<?php echo $this->sDebugOutputID ?>";
 <?php endif ?>
-<?php if(($this->bVerboseDebug)): ?>
+<?php if (($this->bVerboseDebug)): ?>
 jaxon.debug.verbose.active = true;
 <?php endif ?>
 <?php endif ?>
-<?php if(($this->sCsrfMetaName)): ?>
+<?php if (($this->sCsrfMetaName)): ?>
 metaTags = document.getElementsByTagName('meta');
 for(i = 0; i < metaTags.length; i++)
 {

src/Response/Plugin/JQuery/Dom/Element.php

Spacing +3 added lines, -3 removed lines

@@ -58,11 +58,11 @@ 
         $this->aCalls = [];
 
         $jQueryNs = jaxon()->getOption('core.jquery.no_conflict', false) ? 'jQuery' : '$';
-        if(!$sSelector)
+        if (!$sSelector)
         {
             $this->sSelector = "$jQueryNs(this)"; // If an empty selector is given, use javascript "this" instead
         }
-        elseif(($sContext))
+        elseif (($sContext))
         {
             $this->sSelector = "$jQueryNs('" . $sSelector . "', $jQueryNs('" . $sContext . "'))";
         }
@@ -118,7 +118,7 @@ 
      */
     public function getScript()
     {
-        if(count($this->aCalls) == 0)
+        if (count($this->aCalls) == 0)
         {
             return $this->sSelector;
         }

Braces +2 added lines, -4 removed lines

@@ -57,12 +57,10 @@
         if(!$sSelector)
         {
             $this->sSelector = "$jQueryNs(this)"; // If an empty selector is given, use javascript "this" instead
-        }
-        elseif(($sContext))
+        } elseif(($sContext))
         {
             $this->sSelector = "$jQueryNs('" . $sSelector . "', $jQueryNs('" . $sContext . "'))";
-        }
-        else
+        } else
         {
             $this->sSelector = "$jQueryNs('" . $sSelector . "')";
         }

src/Utils/Template/Renderer.php

Spacing +1 added lines, -1 removed lines

@@ -27,7 +27,7 @@
     public function render($sPath, array $aVars = [])
     {
         // Make the template vars available as attributes
-        foreach($aVars as $sName => $xValue)
+        foreach ($aVars as $sName => $xValue)
         {
             $sName = (string)$sName;
             $this->$sName = $xValue;

src/Request/Factory/Request.php

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))

Doc Comments +2 added lines, -2 removed lines

@@ -239,7 +239,7 @@ 
      * @param integer       $nItemsPerPage          The number of items per page page
      * @param integer       $nItemsTotal            The total number of items
      *
-     * @return Paginator
+     * @return \Jaxon\Utils\Pagination\Paginator
      */
     public function pg($nCurrentPage, $nItemsPerPage, $nItemsTotal)
     {
@@ -254,7 +254,7 @@ 
      * @param integer       $nItemsPerPage          The number of items per page page
      * @param integer       $nItemsTotal            The total number of items
      *
-     * @return Paginator
+     * @return \Jaxon\Utils\Pagination\Paginator
      */
     public function paginate($nCurrentPage, $nItemsPerPage, $nItemsTotal)
     {

Unused Use Statements -1 removed lines

@@ -20,7 +20,6 @@
 
 namespace Jaxon\Request\Factory;
 
-use JsonSerializable;
 use Jaxon\Request\Factory\Parameter;
 use Jaxon\Response\Plugin\JQuery\Dom\Element as DomElement;
 

Spacing +16 added lines, -16 removed lines

@@ -52,9 +52,9 @@ 
      */
     public function hasPageNumber()
     {
-        foreach($this->aParameters as $xParameter)
+        foreach ($this->aParameters as $xParameter)
         {
-            if($xParameter->getType() == Parameter::PAGE_NUMBER)
+            if ($xParameter->getType() == Parameter::PAGE_NUMBER)
             {
                 return true;
             }
@@ -72,9 +72,9 @@ 
     public function setPageNumber($nPageNumber)
     {
         // Set the value of the Parameter::PAGE_NUMBER parameter
-        foreach($this->aParameters as $xParameter)
+        foreach ($this->aParameters as $xParameter)
         {
-            if($xParameter->getType() == Parameter::PAGE_NUMBER)
+            if ($xParameter->getType() == Parameter::PAGE_NUMBER)
             {
                 $xParameter->setValue(intval($nPageNumber));
                 break;
@@ -92,7 +92,7 @@ 
      */
     private function setMessageArgs(array $aArgs)
     {
-        array_walk($aArgs, function (&$xParameter) {
+        array_walk($aArgs, function(&$xParameter) {
             $xParameter = Parameter::make($xParameter);
         });
         $this->aMessageArgs = $aArgs;
@@ -147,12 +147,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 DomElement)
+            if ($xParameter instanceof DomElement)
             {
-                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";
@@ -170,19 +170,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 DomElement)
+                    if ($xParameter instanceof DomElement)
                     {
-                        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";
@@ -206,14 +206,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) . ';}';

src/App/App.php

Doc Comments +1 added lines, -1 removed lines

@@ -59,7 +59,7 @@
     /**
      * Process an incoming Jaxon request, and return the response.
      *
-     * @return void
+     * @return boolean|null
      */
     public function processRequest()
     {

Spacing +3 added lines, -3 removed lines

@@ -28,7 +28,7 @@ 
      */
     public function setup($sConfigFile)
     {
-        if(!file_exists($sConfigFile))
+        if (!file_exists($sConfigFile))
         {
             throw new Exception("Unable to find config file at $sConfigFile");
         }
@@ -38,13 +38,13 @@ 
         $aLibOptions = key_exists('lib', $aOptions) ? $aOptions['lib'] : [];
         $aAppOptions = key_exists('app', $aOptions) ? $aOptions['app'] : [];
 
-        if(!is_array($aLibOptions) || !is_array($aAppOptions))
+        if (!is_array($aLibOptions) || !is_array($aAppOptions))
         {
             throw new Exception("Unexpected content in config file at $sConfigFile");
         }
 
         // Set the session manager
-        jaxon()->di()->setSessionManager(function () {
+        jaxon()->di()->setSessionManager(function() {
             return new SessionManager();
         });
 

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/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);
         }