jaxon-php / jaxon-core

src/Utils/Pagination/Paginator.php

Doc Comments +1 added lines, -1 removed lines

@@ -161,7 +161,7 @@
     }
 
     /**
-     * @return string
+     * @return Request
      */
     public function getRequest()
     {

Spacing +20 added lines, -20 removed lines

@@ -65,7 +65,7 @@ 
 
     protected function updateNumPages()
     {
-        $this->numPages = ($this->itemsPerPage == 0 ? 0 : (int) ceil($this->totalItems/$this->itemsPerPage));
+        $this->numPages = ($this->itemsPerPage == 0 ? 0 : (int)ceil($this->totalItems / $this->itemsPerPage));
     }
 
     /**
@@ -74,7 +74,7 @@ 
      */
     public function setMaxPagesToShow($maxPagesToShow)
     {
-        if($maxPagesToShow < 4)
+        if ($maxPagesToShow < 4)
         {
             throw new \InvalidArgumentException('maxPagesToShow cannot be less than 4.');
         }
@@ -154,7 +154,7 @@ 
     {
         $this->request = $request;
         // Append the page number to the parameter list, if not yet given.
-        if(($this->request) && !$this->request->hasPageNumber())
+        if (($this->request) && !$this->request->hasPageNumber())
         {
             $this->request->addParameter(Parameter::PAGE_NUMBER, 0);
         }
@@ -197,7 +197,7 @@ 
 
     public function getNextPage()
     {
-        if($this->currentPage < $this->numPages)
+        if ($this->currentPage < $this->numPages)
         {
             return $this->currentPage + 1;
         }
@@ -207,7 +207,7 @@ 
 
     public function getPrevPage()
     {
-        if($this->currentPage > 1)
+        if ($this->currentPage > 1)
         {
             return $this->currentPage - 1;
         }
@@ -217,7 +217,7 @@ 
 
     public function getNextCall()
     {
-        if(!$this->getNextPage())
+        if (!$this->getNextPage())
         {
             return null;
         }
@@ -230,7 +230,7 @@ 
      */
     public function getPrevCall()
     {
-        if(!$this->getPrevPage())
+        if (!$this->getPrevPage())
         {
             return null;
         }
@@ -258,14 +258,14 @@ 
     {
         $pages = [];
 
-        if($this->numPages <= 1)
+        if ($this->numPages <= 1)
         {
             return [];
         }
 
-        if($this->numPages <= $this->maxPagesToShow)
+        if ($this->numPages <= $this->maxPagesToShow)
         {
-            for($i = 1; $i <= $this->numPages; $i++)
+            for ($i = 1; $i <= $this->numPages; $i++)
             {
                 $pages[] = $this->createPage($i);
             }
@@ -273,11 +273,11 @@ 
         else
         {
             // Determine the sliding range, centered around the current page.
-            $numAdjacents = (int) floor(($this->maxPagesToShow - 4) / 2);
+            $numAdjacents = (int)floor(($this->maxPagesToShow - 4) / 2);
 
             $slidingStart = 1;
             $slidingEndOffset = $numAdjacents + 3 - $this->currentPage;
-            if($slidingEndOffset < 0)
+            if ($slidingEndOffset < 0)
             {
                 $slidingStart = $this->currentPage - $numAdjacents;
                 $slidingEndOffset = 0;
@@ -285,23 +285,23 @@ 
 
             $slidingEnd = $this->numPages;
             $slidingStartOffset = $this->currentPage + $numAdjacents + 2 - $this->numPages;
-            if($slidingStartOffset < 0)
+            if ($slidingStartOffset < 0)
             {
                 $slidingEnd = $this->currentPage + $numAdjacents;
                 $slidingStartOffset = 0;
             }
 
             // Build the list of pages.
-            if($slidingStart > 1)
+            if ($slidingStart > 1)
             {
                 $pages[] = $this->createPage(1);
                 $pages[] = $this->createPageEllipsis();
             }
-            for($i = $slidingStart - $slidingStartOffset; $i <= $slidingEnd + $slidingEndOffset; $i++)
+            for ($i = $slidingStart - $slidingStartOffset; $i <= $slidingEnd + $slidingEndOffset; $i++)
             {
                 $pages[] = $this->createPage($i);
             }
-            if($slidingEnd < $this->numPages)
+            if ($slidingEnd < $this->numPages)
             {
                 $pages[] = $this->createPageEllipsis();
                 $pages[] = $this->createPage($this->numPages);
@@ -344,7 +344,7 @@ 
     {
         $first = ($this->currentPage - 1) * $this->itemsPerPage + 1;
 
-        if($first > $this->totalItems)
+        if ($first > $this->totalItems)
         {
             return null;
         }
@@ -355,13 +355,13 @@ 
     public function getCurrentPageLastItem()
     {
         $first = $this->getCurrentPageFirstItem();
-        if($first === null)
+        if ($first === null)
         {
             return null;
         }
 
         $last = $first + $this->itemsPerPage - 1;
-        if($last > $this->totalItems)
+        if ($last > $this->totalItems)
         {
             return $this->totalItems;
         }
@@ -398,7 +398,7 @@ 
      */
     public function render()
     {
-        if($this->getNumPages() <= 1)
+        if ($this->getNumPages() <= 1)
         {
             return '';
         }

Braces +1 added lines, -2 removed lines

@@ -269,8 +269,7 @@
             {
                 $pages[] = $this->createPage($i);
             }
-        }
-        else
+        } else
         {
             // Determine the sliding range, centered around the current page.
             $numAdjacents = (int) floor(($this->maxPagesToShow - 4) / 2);

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

src/Jaxon.php

Doc Comments +6 added lines, -6 removed lines

@@ -222,7 +222,7 @@ 
      *        When registering a callable class, this is the class name
      *        When registering a callable directory, this is the full path to the directory
      *        When registering an event, this is the event name
-     * @param array|string|Closure  $aOptions | $sIncludeFile | $sNamespace
+     * @param array|string|Closure  $xOptions | $sIncludeFile | $sNamespace
      *        When registering a function, this is an (optional) array
      *             of call options, or the (optional) include file
      *        When registering a callable class, this is an (optional) array
@@ -263,7 +263,7 @@ 
     /**
      * Get an instance of a registered class
      *
-     * @param string        $sClass             The class name
+     * @param string        $sClassName             The class name
      *
      * @return mixed
      */
@@ -276,7 +276,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
      */
@@ -358,7 +358,7 @@ 
      *
      * This function may exit after the request is processed, if the 'core.process.exit' option is set to true.
      *
-     * @return void
+     * @return boolean|null
      *
      * @see <Jaxon\Jaxon->canProcessRequest>
      */
@@ -432,7 +432,7 @@ 
     /**
      * Get the view renderer
      *
-     * @return Jaxon\Utils\View\Renderer
+     * @return Utils\View\Renderer
      */
     public function view()
     {
@@ -442,7 +442,7 @@ 
     /**
      * Get the session manager
      *
-     * @return Jaxon\Contracts\Session
+     * @return Contracts\Session
      */
     public function session()
     {

Spacing +5 added lines, -5 removed lines

@@ -82,7 +82,7 @@ 
      */
     public static function getInstance()
     {
-        if(self::$xInstance == null)
+        if (self::$xInstance == null)
         {
             self::$xInstance = new Jaxon();
         }
@@ -94,7 +94,7 @@ 
      */
     public function __construct()
     {
-        if(self::$xContainer == null)
+        if (self::$xContainer == null)
         {
             self::$xContainer = new Container();
         }
@@ -148,7 +148,7 @@ 
             'core.prefix.class'                 => 'Jaxon',
             // 'core.request.uri'               => '',
             'core.request.mode'                 => 'asynchronous',
-            'core.request.method'               => 'POST',    // W3C: Method is case sensitive
+            'core.request.method'               => 'POST', // W3C: Method is case sensitive
             'core.response.send'                => true,
             'core.response.merge.ap'            => true,
             'core.response.merge.js'            => true,
@@ -234,11 +234,11 @@ 
      */
     public function register($sType, $sCallable, $xOptions = [])
     {
-        if($sType == Jaxon::PROCESSING_EVENT)
+        if ($sType == Jaxon::PROCESSING_EVENT)
         {
             $sEvent = $sCallable;
             $xCallback = $xOptions;
-            switch($sEvent)
+            switch ($sEvent)
             {
             case Jaxon::PROCESSING_EVENT_BEFORE:
                 $this->callback()->before($xCallback);

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

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

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