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

Doc Comments +49 added lines, -49 removed lines

@@ -159,7 +159,7 @@ 
      * @param array         $aAttributes        Associative array of attributes that will describe the command
      * @param mixed            $mData                The data to be associated with this command
      *
-     * @return \Jaxon\Plugin\Response
+     * @return Response
      */
     public function addCommand($aAttributes, $mData)
     {
@@ -200,7 +200,7 @@ 
     /**
      * Clear all the commands already added to the response
      *
-     * @return \Jaxon\Plugin\Response
+     * @return Response
      */
     public function clearCommands()
     {
@@ -214,9 +214,9 @@ 
      *
      * @param \Jaxon\Plugin\Plugin  $xPlugin            The plugin object
      * @param array                 $aAttributes        The attributes for this response command
-     * @param mixed                 $mData              The data to be sent with this command
+     * @param string                 $mData              The data to be sent with this command
      *
-     * @return \Jaxon\Plugin\Response
+     * @return Response
      */
     public function addPluginCommand($xPlugin, $aAttributes, $mData)
     {
@@ -277,7 +277,7 @@ 
      * @param integer        $iCmdNumber            The number of commands to skip upon cancel
      * @param string        $sMessage            The message to display to the user
      *
-     * @return \Jaxon\Plugin\Response
+     * @return Response
      */
     public function confirmCommands($iCmdNumber, $sMessage)
     {
@@ -297,7 +297,7 @@ 
      * @param string        $sAttribute           The attribute to be assigned
      * @param string        $sData                The value to be assigned to the attribute
      *
-     * @return \Jaxon\Plugin\Response
+     * @return Response
      */
     public function assign($sTarget, $sAttribute, $sData)
     {
@@ -319,7 +319,7 @@ 
      * @param string        $sTarget              The id of the html element on the browser
      * @param string        $sData                The value to be assigned to the attribute
      *
-     * @return \Jaxon\Plugin\Response
+     * @return Response
      */
     public function html($sTarget, $sData)
     {
@@ -333,7 +333,7 @@ 
      * @param string        $sAttribute            The name of the attribute to be appended to
      * @param string        $sData                The data to be appended to the attribute
      *
-     * @return \Jaxon\Plugin\Response
+     * @return Response
      */
     public function append($sTarget, $sAttribute, $sData)
     {
@@ -354,7 +354,7 @@ 
      * @param string        $sAttribute            The name of the attribute to be prepended to
      * @param string        $sData                The value to be prepended to the attribute
      *
-     * @return \Jaxon\Plugin\Response
+     * @return Response
      */
     public function prepend($sTarget, $sAttribute, $sData)
     {
@@ -376,7 +376,7 @@ 
      * @param string        $sSearch            The needle to search for
      * @param string        $sData                The data to use in place of the needle
      *
-     * @return \Jaxon\Plugin\Response
+     * @return Response
      */
     public function replace($sTarget, $sAttribute, $sSearch, $sData)
     {
@@ -399,7 +399,7 @@ 
      * @param string        $sTarget            The id of the element to be updated.
      * @param string        $sAttribute            The attribute to be cleared
      *
-     * @return \Jaxon\Plugin\Response
+     * @return Response
      */
     public function clear($sTarget, $sAttribute)
     {
@@ -415,7 +415,7 @@ 
      * @param string        $sAttribute            The attribute to be updated
      * @param string        $sData                The value to assign
      *
-     * @return \Jaxon\Plugin\Response
+     * @return Response
      */
     public function contextAssign($sAttribute, $sData)
     {
@@ -437,7 +437,7 @@ 
      * @param string        $sAttribute            The attribute to be appended to
      * @param string        $sData                The value to append
      *
-     * @return \Jaxon\Plugin\Response
+     * @return Response
      */
     public function contextAppend($sAttribute, $sData)
     {
@@ -459,7 +459,7 @@ 
      * @param string        $sAttribute            The attribute to be updated
      * @param string        $sData                The value to be prepended
      *
-     * @return \Jaxon\Plugin\Response
+     * @return Response
      */
     public function contextPrepend($sAttribute, $sData)
     {
@@ -480,7 +480,7 @@ 
      *
      * @param string        $sAttribute            The attribute to be cleared
      *
-     * @return \Jaxon\Plugin\Response
+     * @return Response
      */
     public function contextClear($sAttribute)
     {
@@ -492,7 +492,7 @@ 
      *
      * @param string        $sMessage            The message to be displayed
      *
-     * @return \Jaxon\Plugin\Response
+     * @return Response
      */
     public function alert($sMessage)
     {
@@ -509,7 +509,7 @@ 
      *
      * @param string        $sMessage            The message to be displayed
      *
-     * @return \Jaxon\Plugin\Response
+     * @return Response
      */
     public function debug($sMessage)
     {
@@ -527,7 +527,7 @@ 
      * @param string        $sURL                The relative or fully qualified URL
      * @param integer        $iDelay                Number of seconds to delay before the redirect occurs
      *
-     * @return \Jaxon\Plugin\Response
+     * @return Response
      */
     public function redirect($sURL, $iDelay=0)
     {
@@ -580,7 +580,7 @@ 
      *
      * @param string        $sJS                The script to execute
      *
-     * @return \Jaxon\Plugin\Response
+     * @return Response
      */
     public function script($sJS)
     {
@@ -597,7 +597,7 @@ 
      *
      * @param string        $sFunc                The name of the function to call
      *
-     * @return \Jaxon\Plugin\Response
+     * @return Response
      */
     public function call($sFunc)
     {
@@ -617,7 +617,7 @@ 
      *
      * @param string        $sTarget            The id of the element to be removed
      *
-     * @return \Jaxon\Plugin\Response
+     * @return Response
      */
     public function remove($sTarget)
     {
@@ -637,7 +637,7 @@ 
      * @param string        $sTag                The tag name to be used for the new element
      * @param string        $sId                The id to assign to the new element
      *
-     * @return \Jaxon\Plugin\Response
+     * @return Response
      */
     public function create($sParent, $sTag, $sId)
     {
@@ -658,7 +658,7 @@ 
      * @param string        $sTag               The tag name to be used for the new element
      * @param string        $sId                The id to assign to the new element
      *
-     * @return \Jaxon\Plugin\Response
+     * @return Response
      */
     public function insert($sBefore, $sTag, $sId)
     {
@@ -679,7 +679,7 @@ 
      * @param string        $sTag               The tag name to be used for the new element
      * @param string        $sId                The id to assign to the new element
      *
-     * @return \Jaxon\Plugin\Response
+     * @return Response
      */
     public function insertAfter($sAfter, $sTag, $sId)
     {
@@ -701,7 +701,7 @@ 
      * @param string        $sName                The name of the new input element
      * @param string        $sId                The id of the new element
      *
-     * @return \Jaxon\Plugin\Response
+     * @return Response
      */
     public function createInput($sParent, $sType, $sName, $sId)
     {
@@ -724,7 +724,7 @@ 
      * @param string        $sName                The name of the new input element
      * @param string        $sId                The id of the new element
      *
-     * @return \Jaxon\Plugin\Response
+     * @return Response
      */
     public function insertInput($sBefore, $sType, $sName, $sId)
     {
@@ -747,7 +747,7 @@ 
      * @param string        $sName                The name of the new input element
      * @param string        $sId                The id of the new element
      *
-     * @return \Jaxon\Plugin\Response
+     * @return Response
      */
     public function insertInputAfter($sAfter, $sType, $sName, $sId)
     {
@@ -769,7 +769,7 @@ 
      * @param string        $sEvent                The name of the event
      * @param string        $sScript            The javascript to execute when the event is fired
      *
-     * @return \Jaxon\Plugin\Response
+     * @return Response
      */
     public function setEvent($sTarget, $sEvent, $sScript)
     {
@@ -789,7 +789,7 @@ 
      * @param string        $sTarget            The id of the element that contains the event
      * @param string        $sScript            The javascript to execute when the event is fired
      *
-     * @return \Jaxon\Plugin\Response
+     * @return Response
      */
     public function onClick($sTarget, $sScript)
     {
@@ -805,7 +805,7 @@ 
      * @param string        $sEvent              The name of the event
      * @param string        $sHandler            The name of the javascript function to call when the event is fired
      *
-     * @return \Jaxon\Plugin\Response
+     * @return Response
      */
     public function addHandler($sTarget, $sEvent, $sHandler)
     {
@@ -826,7 +826,7 @@ 
      * @param string        $sEvent              The name of the event
      * @param string        $sHandler            The name of the javascript function called when the event is fired
      *
-     * @return \Jaxon\Plugin\Response
+     * @return Response
      */
     public function removeHandler($sTarget, $sEvent, $sHandler)
     {
@@ -847,7 +847,7 @@ 
      * @param string        $sArgs                Comma separated list of parameter names
      * @param string        $sScript            The javascript code that will become the body of the function
      *
-     * @return \Jaxon\Plugin\Response
+     * @return Response
      */
     public function setFunction($sFunction, $sArgs, $sScript)
     {
@@ -874,7 +874,7 @@ 
      * @param string        $sReturnValueVar    The name of the variable that will retain the return value
      *                                             from the call to the original function
      *
-     * @return \Jaxon\Plugin\Response
+     * @return Response
      */
     public function wrapFunction($sFunction, $sArgs, $aScripts, $sReturnValueVar)
     {
@@ -895,7 +895,7 @@ 
      * @param string        $sFileName            The relative or fully qualified URI of the javascript file
      * @param string        $sType                Determines the script type. Defaults to 'text/javascript'
      *
-     * @return \Jaxon\Plugin\Response
+     * @return Response
      */
     public function includeScript($sFileName, $sType = null, $sId = null)
     {
@@ -916,7 +916,7 @@ 
      * @param string        $sFileName            The relative or fully qualified URI of the javascript file
      * @param string        $sType                Determines the script type. Defaults to 'text/javascript'
      *
-     * @return \Jaxon\Plugin\Response
+     * @return Response
      */
     public function includeScriptOnce($sFileName, $sType = null, $sId = null)
     {
@@ -939,7 +939,7 @@ 
      * @param string        $sFileName            The relative or fully qualified URI of the javascript file
      * @param string        $sUnload            Name of a javascript function to call prior to unlaoding the file
      *
-     * @return \Jaxon\Plugin\Response
+     * @return Response
      */
     public function removeScript($sFileName, $sUnload = '')
     {
@@ -960,7 +960,7 @@ 
      * @param string        $sFileName            The relative or fully qualified URI of the css file
      * @param string        $sMedia                The media type of the CSS file. Defaults to 'screen'
      *
-     * @return \Jaxon\Plugin\Response
+     * @return Response
      */
     public function includeCSS($sFileName, $sMedia = null)
     {
@@ -979,7 +979,7 @@ 
      *
      * @param string        $sFileName            The relative or fully qualified URI of the css file
      *
-     * @return \Jaxon\Plugin\Response
+     * @return Response
      */
     public function removeCSS($sFileName, $sMedia = null)
     {
@@ -1004,7 +1004,7 @@ 
      * @param integer        $iTimeout            The number of 1/10ths of a second to pause before timing out
      *                                             and continuing with the execution of the response commands
      *
-     * @return \Jaxon\Plugin\Response
+     * @return Response
      */
     public function waitForCSS($iTimeout = 600)
     {
@@ -1029,7 +1029,7 @@ 
      * @param integer        $tenths                The number of 1/10ths of a second to wait before timing out
      *                                             and continuing with the execution of the response commands.
      *
-     * @return \Jaxon\Plugin\Response
+     * @return Response
      */
     public function waitFor($script, $tenths)
     {
@@ -1050,7 +1050,7 @@ 
      *
      * @param integer        $tenths                The number of 1/10ths of a second to sleep
      *
-     * @return \Jaxon\Plugin\Response
+     * @return Response
      */
     public function sleep($tenths)
     {
@@ -1079,7 +1079,7 @@ 
      * @param string        $variable            The DOM element name (id or class)
      * @param string        $tag                The HTML tag of the new DOM element
      *
-     * @return \Jaxon\Plugin\Response
+     * @return Response
      */
     public function domCreateElement($variable, $tag)
     {
@@ -1099,7 +1099,7 @@ 
      * @param string        $key                The name of the attribute
      * @param string        $value                The value of the attribute
      *
-     * @return \Jaxon\Plugin\Response
+     * @return Response
      */
     public function domSetAttribute($variable, $key, $value)
     {
@@ -1120,7 +1120,7 @@ 
      * @param string        $skip                The ??
      * @param string        $remove                The ??
      *
-     * @return \Jaxon\Plugin\Response
+     * @return Response
      */
     public function domRemoveChildren($parent, $skip = null, $remove = null)
     {
@@ -1141,7 +1141,7 @@ 
      * @param string        $parent                The DOM parent element
      * @param string        $variable            The DOM element name (id or class)
      *
-     * @return \Jaxon\Plugin\Response
+     * @return Response
      */
     public function domAppendChild($parent, $variable)
     {
@@ -1160,7 +1160,7 @@ 
      * @param string        $target                The DOM target element
      * @param string        $variable            The DOM element name (id or class)
      *
-     * @return \Jaxon\Plugin\Response
+     * @return Response
      */
     public function domInsertBefore($target, $variable)
     {
@@ -1179,7 +1179,7 @@ 
      * @param string        $target                The DOM target element
      * @param string        $variable            The DOM element name (id or class)
      *
-     * @return \Jaxon\Plugin\Response
+     * @return Response
      */
     public function domInsertAfter($target, $variable)
     {
@@ -1198,7 +1198,7 @@ 
      * @param string        $parent                The DOM parent element
      * @param string        $text                The HTML text to append
      *
-     * @return \Jaxon\Plugin\Response
+     * @return Response
      */
     public function domAppendText($parent, $text)
     {
@@ -1239,7 +1239,7 @@ 
      *
      * @param mixed        $value                Any value
      *
-     * @return \Jaxon\Plugin\Response
+     * @return Response
      */
     public function setReturnValue($value)
     {

Spacing +36 added lines, -36 removed lines

@@ -96,7 +96,7 @@ 
     public function plugin($sName)
     {
         $xPlugin = $this->getPluginManager()->getResponsePlugin($sName);
-        if(!$xPlugin)
+        if (!$xPlugin)
         {
             return null;
         }
@@ -159,23 +159,23 @@ 
     public function addCommand($aAttributes, $mData)
     {
         /* merge commands if possible */
-        if(in_array($aAttributes['cmd'], ['js', 'ap']))
+        if (in_array($aAttributes['cmd'], ['js', 'ap']))
         {
-            if(($aLastCommand = array_pop($this->aCommands)))
+            if (($aLastCommand = array_pop($this->aCommands)))
             {
-                if($aLastCommand['cmd'] == $aAttributes['cmd'])
+                if ($aLastCommand['cmd'] == $aAttributes['cmd'])
                 {
-                    if($this->getOption('core.response.merge.js') &&
+                    if ($this->getOption('core.response.merge.js') &&
                             $aLastCommand['cmd'] == 'js')
                     {
-                        $mData = $aLastCommand['data'].'; '.$mData;
+                        $mData = $aLastCommand['data'] . '; ' . $mData;
                     }
-                    elseif($this->getOption('core.response.merge.ap') &&
+                    elseif ($this->getOption('core.response.merge.ap') &&
                             $aLastCommand['cmd'] == 'ap' &&
                             $aLastCommand['id'] == $aAttributes['id'] &&
                             $aLastCommand['prop'] == $aAttributes['prop'])
                     {
-                        $mData = $aLastCommand['data'].' '.$mData;
+                        $mData = $aLastCommand['data'] . ' ' . $mData;
                     }
                     else
                     {
@@ -233,26 +233,26 @@ 
     public function appendResponse($mCommands, $bBefore = false)
     {
         $aCommands = [];
-        if($mCommands instanceof Response)
+        if ($mCommands instanceof Response)
         {
             $this->returnValue = $mCommands->returnValue;
             $aCommands = $mCommands->aCommands;
         }
-        elseif(is_array($mCommands))
+        elseif (is_array($mCommands))
         {
             $aCommands = $mCommands;
         }
         else
         {
-            if(!empty($mCommands))
+            if (!empty($mCommands))
             {
                 throw new \Jaxon\Exception\Error($this->trans('errors.response.data.invalid'));
             }
         }
 
-        if(count($aCommands) > 0)
+        if (count($aCommands) > 0)
         {
-            if($bBefore)
+            if ($bBefore)
             {
                 $this->aCommands = array_merge($aCommands, $this->aCommands);
             }
@@ -524,33 +524,33 @@ 
      *
      * @return \Jaxon\Plugin\Response
      */
-    public function redirect($sURL, $iDelay=0)
+    public function redirect($sURL, $iDelay = 0)
     {
         // we need to parse the query part so that the values are rawurlencode()'ed
         // can't just use parse_url() cos we could be dealing with a relative URL which
         // parse_url() can't deal with.
         $queryStart = strpos($sURL, '?', strrpos($sURL, '/'));
-        if($queryStart !== false)
+        if ($queryStart !== false)
         {
             $queryStart++;
             $queryEnd = strpos($sURL, '#', $queryStart);
-            if($queryEnd === false)
+            if ($queryEnd === false)
                 $queryEnd = strlen($sURL);
-            $queryPart = substr($sURL, $queryStart, $queryEnd-$queryStart);
+            $queryPart = substr($sURL, $queryStart, $queryEnd - $queryStart);
             parse_str($queryPart, $queryParts);
             $newQueryPart = "";
-            if($queryParts)
+            if ($queryParts)
             {
                 $first = true;
-                foreach($queryParts as $key => $value)
+                foreach ($queryParts as $key => $value)
                 {
-                    if($first)
+                    if ($first)
                         $first = false;
                     else
                         $newQueryPart .= '&';
-                    $newQueryPart .= rawurlencode($key).'='.rawurlencode($value);
+                    $newQueryPart .= rawurlencode($key) . '=' . rawurlencode($value);
                 }
-            } elseif($_SERVER['QUERY_STRING']) {
+            } elseif ($_SERVER['QUERY_STRING']) {
                     //couldn't break up the query, but there's one there
                     //possibly "http://url/page.html?query1234" type of query?
                     //just encode it and hope it works
@@ -558,8 +558,8 @@ 
                 }
             $sURL = str_replace($queryPart, $newQueryPart, $sURL);
         }
-        if($iDelay)
-            $this->script('window.setTimeout("window.location = \'' . $sURL . '\';",' . ($iDelay*1000) . ');');
+        if ($iDelay)
+            $this->script('window.setTimeout("window.location = \'' . $sURL . '\';",' . ($iDelay * 1000) . ');');
         else
             $this->script('window.location = "' . $sURL . '";');
         return $this;
@@ -896,10 +896,10 @@ 
     {
         $command = ['cmd'  =>  'in'];
 
-        if(($sType))
+        if (($sType))
             $command['type'] = trim((string)$sType, " \t");
 
-        if(($sId))
+        if (($sId))
             $command['elm_id'] = trim((string)$sId, " \t");
 
         return $this->addCommand($command, trim((string)$sFileName, " \t"));
@@ -917,10 +917,10 @@ 
     {
         $command = ['cmd' => 'ino'];
 
-        if(($sType))
+        if (($sType))
             $command['type'] = trim((string)$sType, " \t");
 
-        if(($sId))
+        if (($sId))
             $command['elm_id'] = trim((string)$sId, " \t");
 
         return $this->addCommand($command, trim((string)$sFileName, " \t"));
@@ -961,7 +961,7 @@ 
     {
         $command = ['cmd' => 'css'];
 
-        if(($sMedia))
+        if (($sMedia))
             $command['media'] = trim((string)$sMedia, " \t");
 
         return $this->addCommand($command, trim((string)$sFileName, " \t"));
@@ -980,7 +980,7 @@ 
     {
         $command = ['cmd' => 'rcss'];
 
-        if(($sMedia))
+        if (($sMedia))
             $command['media'] = trim((string)$sMedia, " \t");
 
         return $this->addCommand($command, trim((string)$sFileName, " \t"));
@@ -1121,10 +1121,10 @@ 
     {
         $command = ['cmd' => 'DRC'];
 
-        if(($skip))
+        if (($skip))
             $command['skip'] = $skip;
 
-        if(($remove))
+        if (($remove))
             $command['remove'] = $remove;
 
         return $this->addCommand($command, $parent);
@@ -1249,7 +1249,7 @@ 
      */
     public function sendHeaders()
     {
-        if($this->getRequesthandler()->requestMethodIsGet())
+        if ($this->getRequesthandler()->requestMethodIsGet())
         {
             header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
             header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT");
@@ -1259,7 +1259,7 @@ 
 
         $sCharacterSet = '';
         $sCharacterEncoding = trim($this->getOption('core.encoding'));
-        if(($sCharacterEncoding) && strlen($sCharacterEncoding) > 0)
+        if (($sCharacterEncoding) && strlen($sCharacterEncoding) > 0)
         {
             $sCharacterSet = '; charset="' . trim($sCharacterEncoding) . '"';
         }
@@ -1276,13 +1276,13 @@ 
     {
         $response = [];
 
-        if(($this->returnValue))
+        if (($this->returnValue))
         {
             $response['jxnrv'] = $this->returnValue;
         }
         $response['jxnobj'] = [];
 
-        foreach($this->aCommands as $xCommand)
+        foreach ($this->aCommands as $xCommand)
         {
             $response['jxnobj'][] = $xCommand;
         }

Braces +43 added lines, -38 removed lines

@@ -169,20 +169,17 @@ 
                             $aLastCommand['cmd'] == 'js')
                     {
                         $mData = $aLastCommand['data'].'; '.$mData;
-                    }
-                    elseif($this->getOption('core.response.merge.ap') &&
+                    } elseif($this->getOption('core.response.merge.ap') &&
                             $aLastCommand['cmd'] == 'ap' &&
                             $aLastCommand['id'] == $aAttributes['id'] &&
                             $aLastCommand['prop'] == $aAttributes['prop'])
                     {
                         $mData = $aLastCommand['data'].' '.$mData;
-                    }
-                    else
+                    } else
                     {
                         $this->aCommands[] = $aLastCommand;
                     }
-                }
-                else
+                } else
                 {
                     $this->aCommands[] = $aLastCommand;
                 }
@@ -237,12 +234,10 @@ 
         {
             $this->returnValue = $mCommands->returnValue;
             $aCommands = $mCommands->aCommands;
-        }
-        elseif(is_array($mCommands))
+        } elseif(is_array($mCommands))
         {
             $aCommands = $mCommands;
-        }
-        else
+        } else
         {
             if(!empty($mCommands))
             {
@@ -255,8 +250,7 @@ 
             if($bBefore)
             {
                 $this->aCommands = array_merge($aCommands, $this->aCommands);
-            }
-            else
+            } else
             {
                 $this->aCommands = array_merge($this->aCommands, $aCommands);
             }
@@ -534,8 +528,9 @@ 
         {
             $queryStart++;
             $queryEnd = strpos($sURL, '#', $queryStart);
-            if($queryEnd === false)
-                $queryEnd = strlen($sURL);
+            if($queryEnd === false) {
+                            $queryEnd = strlen($sURL);
+            }
             $queryPart = substr($sURL, $queryStart, $queryEnd-$queryStart);
             parse_str($queryPart, $queryParts);
             $newQueryPart = "";
@@ -544,10 +539,11 @@ 
                 $first = true;
                 foreach($queryParts as $key => $value)
                 {
-                    if($first)
-                        $first = false;
-                    else
-                        $newQueryPart .= '&';
+                    if($first) {
+                                            $first = false;
+                    } else {
+                                            $newQueryPart .= '&';
+                    }
                     $newQueryPart .= rawurlencode($key).'='.rawurlencode($value);
                 }
             } elseif($_SERVER['QUERY_STRING']) {
@@ -558,10 +554,11 @@ 
                 }
             $sURL = str_replace($queryPart, $newQueryPart, $sURL);
         }
-        if($iDelay)
-            $this->script('window.setTimeout("window.location = \'' . $sURL . '\';",' . ($iDelay*1000) . ');');
-        else
-            $this->script('window.location = "' . $sURL . '";');
+        if($iDelay) {
+                    $this->script('window.setTimeout("window.location = \'' . $sURL . '\';",' . ($iDelay*1000) . ');');
+        } else {
+                    $this->script('window.location = "' . $sURL . '";');
+        }
         return $this;
     }
 
@@ -896,11 +893,13 @@ 
     {
         $command = ['cmd'  =>  'in'];
 
-        if(($sType))
-            $command['type'] = trim((string)$sType, " \t");
+        if(($sType)) {
+                    $command['type'] = trim((string)$sType, " \t");
+        }
 
-        if(($sId))
-            $command['elm_id'] = trim((string)$sId, " \t");
+        if(($sId)) {
+                    $command['elm_id'] = trim((string)$sId, " \t");
+        }
 
         return $this->addCommand($command, trim((string)$sFileName, " \t"));
     }
@@ -917,11 +916,13 @@ 
     {
         $command = ['cmd' => 'ino'];
 
-        if(($sType))
-            $command['type'] = trim((string)$sType, " \t");
+        if(($sType)) {
+                    $command['type'] = trim((string)$sType, " \t");
+        }
 
-        if(($sId))
-            $command['elm_id'] = trim((string)$sId, " \t");
+        if(($sId)) {
+                    $command['elm_id'] = trim((string)$sId, " \t");
+        }
 
         return $this->addCommand($command, trim((string)$sFileName, " \t"));
     }
@@ -961,8 +962,9 @@ 
     {
         $command = ['cmd' => 'css'];
 
-        if(($sMedia))
-            $command['media'] = trim((string)$sMedia, " \t");
+        if(($sMedia)) {
+                    $command['media'] = trim((string)$sMedia, " \t");
+        }
 
         return $this->addCommand($command, trim((string)$sFileName, " \t"));
     }
@@ -980,8 +982,9 @@ 
     {
         $command = ['cmd' => 'rcss'];
 
-        if(($sMedia))
-            $command['media'] = trim((string)$sMedia, " \t");
+        if(($sMedia)) {
+                    $command['media'] = trim((string)$sMedia, " \t");
+        }
 
         return $this->addCommand($command, trim((string)$sFileName, " \t"));
     }
@@ -1121,11 +1124,13 @@ 
     {
         $command = ['cmd' => 'DRC'];
 
-        if(($skip))
-            $command['skip'] = $skip;
+        if(($skip)) {
+                    $command['skip'] = $skip;
+        }
 
-        if(($remove))
-            $command['remove'] = $remove;
+        if(($remove)) {
+                    $command['remove'] = $remove;
+        }
 
         return $this->addCommand($command, $parent);
     }

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/App/Bootstrap.php

Doc Comments +4 added lines, -4 removed lines

@@ -72,7 +72,7 @@ 
      *
      * @var array       $aLibOptions    The library options
      *
-     * @return Boot
+     * @return Bootstrap
      */
     public function lib(array $aLibOptions)
     {
@@ -85,7 +85,7 @@ 
      *
      * @var array       $aAppOptions    The application options
      *
-     * @return Boot
+     * @return Bootstrap
      */
     public function app(array $aAppOptions)
     {
@@ -98,7 +98,7 @@ 
      *
      * @var string  $sUri   The ajax endpoint URI
      *
-     * @return Boot
+     * @return Bootstrap
      */
     public function uri($sUri)
     {
@@ -111,7 +111,7 @@ 
      *
      * @var
      *
-     * @return Boot
+     * @return Bootstrap
      */
     public function js($bExportJs, $sJsUri = '', $sJsDir = '', $bMinifyJs = false)
     {

Spacing +6 added lines, -6 removed lines

@@ -154,7 +154,7 @@ 
         $this->triggerEvent('pre.setup');
 
         // Add the view renderer
-        $view->addRenderer('jaxon', function () {
+        $view->addRenderer('jaxon', function() {
             return new View\View();
         });
 
@@ -181,24 +181,24 @@ 
         // Use the Composer autoloader. It's important to call this before triggers and callbacks.
         // $jaxon->useComposerAutoloader();
         // Jaxon library settings
-        if(!$jaxon->hasOption('js.app.export'))
+        if (!$jaxon->hasOption('js.app.export'))
         {
             $jaxon->setOption('js.app.export', $this->bExportJs);
         }
-        if(!$jaxon->hasOption('js.app.minify'))
+        if (!$jaxon->hasOption('js.app.minify'))
         {
             $jaxon->setOption('js.app.minify', $this->bMinifyJs);
         }
-        if(!$jaxon->hasOption('js.app.uri') && $this->sJsUri != '')
+        if (!$jaxon->hasOption('js.app.uri') && $this->sJsUri != '')
         {
             $jaxon->setOption('js.app.uri', $this->sJsUri);
         }
-        if(!$jaxon->hasOption('js.app.dir') && $this->sJsDir != '')
+        if (!$jaxon->hasOption('js.app.dir') && $this->sJsDir != '')
         {
             $jaxon->setOption('js.app.dir', $this->sJsDir);
         }
         // Set the request URI
-        if(!$jaxon->hasOption('core.request.uri') && $this->sUri != '')
+        if (!$jaxon->hasOption('core.request.uri') && $this->sUri != '')
         {
             $jaxon->setOption('core.request.uri', $this->sUri);
         }

src/Features/App.php

Doc Comments +6 added lines, -7 removed lines

@@ -7,9 +7,8 @@ 
     /**
      * Set the Jaxon application options.
      *
-     * @param Config        $xAppConfig        The config options
      *
-     * @return void
+     * @return \Jaxon\App\Bootstrap
      */
     protected function bootstrap()
     {
@@ -19,7 +18,7 @@ 
     /**
      * Get the Jaxon response.
      *
-     * @return Response
+     * @return \Jaxon\Response\Response
      */
     public function ajaxResponse()
     {
@@ -29,7 +28,7 @@ 
     /**
      * Get an instance of a registered class
      *
-     * @param string        $sClass             The class name
+     * @param string        $sClassName             The class name
      *
      * @return mixed
      */
@@ -41,7 +40,7 @@ 
     /**
      * Get a request to a registered class
      *
-     * @param string        $sClass             The class name
+     * @param string        $sClassName             The class name
      *
      * @return \Jaxon\Request\Factory\CallableClass\Request
      */
@@ -110,7 +109,7 @@ 
     /**
      * Get the view renderer
      *
-     * @return Jaxon\Utils\View\Renderer
+     * @return \Jaxon\Utils\View\Renderer
      */
     public function view()
     {
@@ -120,7 +119,7 @@ 
     /**
      * Get the session manager
      *
-     * @return Jaxon\Contracts\Session
+     * @return \Jaxon\Contracts\Session
      */
     public function session()
     {