jaxon-php / jaxon-core

src/Jaxon.php

Doc Comments +5 added lines, -14 removed lines

@@ -189,15 +189,6 @@ 
      *        - Jaxon::CALLABLE_OBJECT: an object who's methods are to be registered
      *        - Jaxon::BROWSER_EVENT: an event which will cause zero or more event handlers to be called
      *        - Jaxon::EVENT_HANDLER: register an event handler function.
-     * @param mixed        $sFunction | $objObject | $sEvent
-     *        When registering a function, this is the name of the function
-     *        When registering a callable object, this is the object being registered
-     *        When registering an event or event handler, this is the name of the event
-     * @param mixed        $sIncludeFile | $aCallOptions | $sEventHandler
-     *        When registering a function, this is the (optional) include file
-     *        When registering a callable object, this is an (optional) array
-     *             of call options for the functions being registered
-     *        When registering an event handler, this is the name of the function
      *
      * @return mixed
      */
@@ -473,7 +464,7 @@ 
      * @param string        $sLibKey            The key of the library options in the file
      * @param string|null   $sAppKey            The key of the application options in the file
      *
-     * @return array
+     * @return null|Utils\Config\Config
      */
     public function readPhpConfigFile($sConfigFile, $sLibKey = '', $sAppKey = null)
     {
@@ -487,7 +478,7 @@ 
      * @param string        $sLibKey            The key of the library options in the file
      * @param string|null   $sAppKey            The key of the application options in the file
      *
-     * @return array
+     * @return null|Utils\Config\Config
      */
     public function readYamlConfigFile($sConfigFile, $sLibKey = '', $sAppKey = null)
     {
@@ -501,7 +492,7 @@ 
      * @param string        $sLibKey            The key of the library options in the file
      * @param string|null   $sAppKey            The key of the application options in the file
      *
-     * @return array
+     * @return Utils\Config\Config|null
      */
     public function readJsonConfigFile($sConfigFile, $sLibKey = '', $sAppKey = null)
     {
@@ -515,7 +506,7 @@ 
      * @param string        $sLibKey            The key of the library options in the file
      * @param string|null   $sAppKey            The key of the application options in the file
      *
-     * @return array
+     * @return null|Utils\Config\Config
      */
     public function readConfigFile($sConfigFile, $sLibKey = '', $sAppKey = null)
     {
@@ -547,7 +538,7 @@ 
      * - 1000 thru 8999: User created plugins, typically, these plugins don't care about order
      * - 9000 thru 9999: Plugins that generally need to be last or near the end of the plugin list
      *
-     * @param Plugin         $xPlugin               An instance of a plugin
+     * @param Plugin\Plugin         $xPlugin               An instance of a plugin
      * @param integer        $nPriority             The plugin priority, used to order the plugins
      *
      * @return void

Unused Use Statements -4 removed lines

@@ -25,10 +25,6 @@
 
 namespace Jaxon;
 
-use Jaxon\Plugin\Manager as PluginManager;
-use Jaxon\Request\Manager as RequestManager;
-use Jaxon\Response\Manager as ResponseManager;
-
 use Jaxon\Utils\URI;
 use Exception;
 

Braces +6 added lines, -8 removed lines

@@ -212,8 +212,9 @@ 
             {
                 $sEvent = $aArgs[1];
                 $xUserFunction = $aArgs[2];
-                if(!is_a($xUserFunction, 'Request\\Support\\UserFunction'))
-                    $xUserFunction = new Request\Support\UserFunction($xUserFunction);
+                if(!is_a($xUserFunction, 'Request\\Support\\UserFunction')) {
+                                    $xUserFunction = new Request\Support\UserFunction($xUserFunction);
+                }
                 $this->aProcessingEvents[$sEvent] = $xUserFunction;
                 return true;
             }
@@ -324,8 +325,7 @@ 
             try
             {
                 $mResult = $this->getPluginManager()->processRequest();
-            }
-            catch(Exception $e)
+            } catch(Exception $e)
             {
                 // An exception was thrown while processing the request.
                 // The request missed the corresponding handler function,
@@ -342,8 +342,7 @@ 
                 {
                     $sEvent = self::PROCESSING_EVENT_INVALID;
                     $aParams = array($e->getMessage());
-                }
-                else
+                } else
                 {
                     $sEvent = self::PROCESSING_EVENT_ERROR;
                     $aParams = array($e);
@@ -353,8 +352,7 @@ 
                 {
                     // Call the processing event
                     $this->aProcessingEvents[$sEvent]->call($aParams);
-                }
-                else
+                } else
                 {
                     // The exception is not to be processed here.
                     throw $e;

Spacing +19 added lines, -19 removed lines

@@ -129,7 +129,7 @@ 
             'core.prefix.event'                 => 'jaxon_event_',
             // '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.debug.on'                     => false,
             'core.debug.verbose'                => false,
             'core.process.exit'                 => true,
@@ -206,13 +206,13 @@ 
         $aArgs = func_get_args();
         $nArgs = func_num_args();
 
-        if(self::PROCESSING_EVENT == $aArgs[0])
+        if (self::PROCESSING_EVENT == $aArgs[0])
         {
-            if($nArgs > 2)
+            if ($nArgs > 2)
             {
                 $sEvent = $aArgs[1];
                 $xUserFunction = $aArgs[2];
-                if(!is_a($xUserFunction, 'Request\\Support\\UserFunction'))
+                if (!is_a($xUserFunction, 'Request\\Support\\UserFunction'))
                     $xUserFunction = new Request\Support\UserFunction($xUserFunction);
                 $this->aProcessingEvents[$sEvent] = $xUserFunction;
                 return true;
@@ -296,7 +296,7 @@ 
     public function processRequest()
     {
         // Check to see if headers have already been sent out, in which case we can't do our job
-        if(headers_sent($filename, $linenumber))
+        if (headers_sent($filename, $linenumber))
         {
             echo $this->trans('errors.output.already-sent', array(
                 'location' => $filename . ':' . $linenumber
@@ -305,7 +305,7 @@ 
         }
 
         // Check if there is a plugin to process this request
-        if(!$this->canProcessRequest())
+        if (!$this->canProcessRequest())
         {
             return;
         }
@@ -314,18 +314,18 @@ 
         $mResult = true;
 
         // Handle before processing event
-        if(isset($this->aProcessingEvents[self::PROCESSING_EVENT_BEFORE]))
+        if (isset($this->aProcessingEvents[self::PROCESSING_EVENT_BEFORE]))
         {
             $this->aProcessingEvents[self::PROCESSING_EVENT_BEFORE]->call(array(&$bEndRequest));
         }
 
-        if(!$bEndRequest)
+        if (!$bEndRequest)
         {
             try
             {
                 $mResult = $this->getPluginManager()->processRequest();
             }
-            catch(Exception $e)
+            catch (Exception $e)
             {
                 // An exception was thrown while processing the request.
                 // The request missed the corresponding handler function,
@@ -338,7 +338,7 @@ 
                 $xResponseManager->debug($e->getMessage());
                 $mResult = false;
 
-                if($e instanceof \Jaxon\Exception\Error)
+                if ($e instanceof \Jaxon\Exception\Error)
                 {
                     $sEvent = self::PROCESSING_EVENT_INVALID;
                     $aParams = array($e->getMessage());
@@ -349,7 +349,7 @@ 
                     $aParams = array($e);
                 }
 
-                if(isset($this->aProcessingEvents[$sEvent]))
+                if (isset($this->aProcessingEvents[$sEvent]))
                 {
                     // Call the processing event
                     $this->aProcessingEvents[$sEvent]->call($aParams);
@@ -362,7 +362,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)
@@ -372,10 +372,10 @@ 
             error_reporting($er);
         }
 
-        if($mResult === true)
+        if ($mResult === true)
         {
             // Handle after processing event
-            if(isset($this->aProcessingEvents[self::PROCESSING_EVENT_AFTER]))
+            if (isset($this->aProcessingEvents[self::PROCESSING_EVENT_AFTER]))
             {
                 $bEndRequest = false;
                 $this->aProcessingEvents[self::PROCESSING_EVENT_AFTER]->call(array($bEndRequest));
@@ -384,7 +384,7 @@ 
 
         $this->getResponseManager()->printDebug();
 
-        if(($this->getOption('core.process.exit')))
+        if (($this->getOption('core.process.exit')))
         {
             $this->getResponseManager()->sendOutput();
             exit();
@@ -434,16 +434,16 @@ 
      */
     public function getScript($bIncludeJs = false, $bIncludeCss = false)
     {
-        if(!$this->getOption('core.request.uri'))
+        if (!$this->getOption('core.request.uri'))
         {
             $this->setOption('core.request.uri', URI::detect());
         }
         $sCode = '';
-        if(($bIncludeCss))
+        if (($bIncludeCss))
         {
             $sCode .= $this->getPluginManager()->getCss() . "\n";
         }
-        if(($bIncludeJs))
+        if (($bIncludeJs))
         {
             $sCode .= $this->getPluginManager()->getJs() . "\n";
         }
@@ -541,7 +541,7 @@ 
     public function readConfigFile($sConfigFile, $sLibKey = '', $sAppKey = null)
     {
         $sExt = pathinfo($sConfigFile, PATHINFO_EXTENSION);
-        switch($sExt)
+        switch ($sExt)
         {
         case 'php':
             return $this->readPhpConfigFile($sConfigFile, $sLibKey, $sAppKey);

src/Plugin/Manager.php

Unused Use Statements -2 removed lines

@@ -24,8 +24,6 @@
 use Jaxon\Jaxon;
 use RecursiveDirectoryIterator;
 use RecursiveIteratorIterator;
-use RegexIterator;
-use RecursiveRegexIterator;
 
 class Manager
 {

Spacing +55 added lines, -55 removed lines

@@ -262,32 +262,32 @@ 
     {
         $bIsAlert = ($xPlugin instanceof \Jaxon\Request\Interfaces\Alert);
         $bIsConfirm = ($xPlugin instanceof \Jaxon\Request\Interfaces\Confirm);
-        if($xPlugin instanceof Request)
+        if ($xPlugin instanceof Request)
         {
             // The name of a request plugin is used as key in the plugin table
             $this->aRequestPlugins[$xPlugin->getName()] = $xPlugin;
         }
-        elseif($xPlugin instanceof Response)
+        elseif ($xPlugin instanceof Response)
         {
             // The name of a response plugin is used as key in the plugin table
             $this->aResponsePlugins[$xPlugin->getName()] = $xPlugin;
         }
-        elseif(!$bIsConfirm && !$bIsAlert)
+        elseif (!$bIsConfirm && !$bIsAlert)
         {
             throw new \Jaxon\Exception\Error($this->trans('errors.register.invalid', array('name' => get_class($xPlugin))));
         }
         // This plugin implements the Alert interface
-        if($bIsAlert)
+        if ($bIsAlert)
         {
             $this->setAlert($xPlugin);
         }
         // This plugin implements the Confirm interface
-        if($bIsConfirm)
+        if ($bIsConfirm)
         {
             $this->setConfirm($xPlugin);
         }
         // Register the plugin as an event listener
-        if($xPlugin instanceof \Jaxon\Utils\Interfaces\EventListener)
+        if ($xPlugin instanceof \Jaxon\Utils\Interfaces\EventListener)
         {
             $this->addEventListener($xPlugin);
         }
@@ -303,7 +303,7 @@ 
     private function generateHash()
     {
         $sHash = $this->getVersion();
-        foreach($this->aPlugins as $xPlugin)
+        foreach ($this->aPlugins as $xPlugin)
         {
             $sHash .= $xPlugin->generateHash();
         }
@@ -320,9 +320,9 @@ 
      */
     public function canProcessRequest()
     {
-        foreach($this->aRequestPlugins as $xPlugin)
+        foreach ($this->aRequestPlugins as $xPlugin)
         {
-            if($xPlugin->canProcessRequest())
+            if ($xPlugin->canProcessRequest())
             {
                 return true;
             }
@@ -340,9 +340,9 @@ 
      */
     public function processRequest()
     {
-        foreach($this->aRequestPlugins as $xPlugin)
+        foreach ($this->aRequestPlugins as $xPlugin)
         {
-            if($xPlugin->canProcessRequest())
+            if ($xPlugin->canProcessRequest())
             {
                 return $xPlugin->processRequest();
             }
@@ -363,10 +363,10 @@ 
      */
     public function register($aArgs)
     {
-        foreach($this->aRequestPlugins as $xPlugin)
+        foreach ($this->aRequestPlugins as $xPlugin)
         {
             $mResult = $xPlugin->register($aArgs);
-            if($mResult instanceof \Jaxon\Request\Request || is_array($mResult) || $mResult === true)
+            if ($mResult instanceof \Jaxon\Request\Request || is_array($mResult) || $mResult === true)
             {
                 return $mResult;
             }
@@ -386,38 +386,38 @@ 
      */
     public function addClassDir($sDirectory, $sNamespace = null, $sSeparator = '.', array $aProtected = array())
     {
-        if(!is_dir(($sDirectory = trim($sDirectory))))
+        if (!is_dir(($sDirectory = trim($sDirectory))))
         {
             return false;
         }
         // Only '.' and '_' are allowed to be used as separator. Any other value is ignored and '.' is used instead.
-        if(($sSeparator = trim($sSeparator)) != '_')
+        if (($sSeparator = trim($sSeparator)) != '_')
         {
             $sSeparator = '.';
         }
-        if(!($sNamespace = trim($sNamespace)))
+        if (!($sNamespace = trim($sNamespace)))
         {
             $sNamespace = null;
         }
-        if(($sNamespace))
+        if (($sNamespace))
         {
             $sNamespace = trim($sNamespace, '\\');
             // If there is an autoloader, register the dir with PSR4 autoloading
-            if(($this->xAutoloader))
+            if (($this->xAutoloader))
             {
                 $this->xAutoloader->setPsr4($sNamespace . '\\', $sDirectory);
             }
         }
-        elseif(($this->xAutoloader))
+        elseif (($this->xAutoloader))
         {
             // If there is an autoloader, register the dir with classmap autoloading
             $itDir = new RecursiveDirectoryIterator($sDirectory);
             $itFile = new RecursiveIteratorIterator($itDir);
             // Iterate on dir content
-            foreach($itFile as $xFile)
+            foreach ($itFile as $xFile)
             {
                 // skip everything except PHP files
-                if(!$xFile->isFile() || $xFile->getExtension() != 'php')
+                if (!$xFile->isFile() || $xFile->getExtension() != 'php')
                 {
                     continue;
                 }
@@ -448,7 +448,7 @@ 
         $sClassPath = trim(substr($xFile->getPath(), strlen($sDirectory)), DIRECTORY_SEPARATOR);
         $sClassPath = str_replace(array(DIRECTORY_SEPARATOR), array($sSeparator), $sClassPath);
         $sClassName = $xFile->getBasename('.php');
-        if(($sNamespace))
+        if (($sNamespace))
         {
             $sNamespace = trim($sNamespace, '\\');
             $sClassPath = str_replace(array('\\'), array($sSeparator), $sNamespace) . $sSeparator . $sClassPath;
@@ -456,27 +456,27 @@ 
             $sClassName = '\\' . str_replace(array($sSeparator), array('\\'), $sClassPath) . '\\' . $sClassName;
         }
         // Require the file only if autoload is enabled but there is no autoloader
-        if(($this->bAutoloadEnabled) && !($this->xAutoloader))
+        if (($this->bAutoloadEnabled) && !($this->xAutoloader))
         {
             require_once($xFile->getPathname());
         }
         // Create and register an instance of the class
-        if(!array_key_exists('*', $aOptions) || !is_array($aOptions['*']))
+        if (!array_key_exists('*', $aOptions) || !is_array($aOptions['*']))
         {
             $aOptions['*'] = array();
         }
         $aOptions['*']['separator'] = $sSeparator;
-        if(($sNamespace))
+        if (($sNamespace))
         {
             $aOptions['*']['namespace'] = $sNamespace;
         }
-        if(($sClassPath))
+        if (($sClassPath))
         {
             $aOptions['*']['classpath'] = $sClassPath;
         }
         // Filter excluded methods
-        $aProtected = array_filter($aProtected, function ($sName) {return is_string($sName);});
-        if(count($aProtected) > 0)
+        $aProtected = array_filter($aProtected, function($sName) {return is_string($sName); });
+        if (count($aProtected) > 0)
         {
             $aOptions['*']['protected'] = $aProtected;
         }
@@ -490,15 +490,15 @@ 
      */
     public function registerClasses()
     {
-        foreach($this->aClassDirs as $sClassDir)
+        foreach ($this->aClassDirs as $sClassDir)
         {
             $itDir = new RecursiveDirectoryIterator($sClassDir['directory']);
             $itFile = new RecursiveIteratorIterator($itDir);
             // Iterate on dir content
-            foreach($itFile as $xFile)
+            foreach ($itFile as $xFile)
             {
                 // skip everything except PHP files
-                if(!$xFile->isFile() || $xFile->getExtension() != 'php')
+                if (!$xFile->isFile() || $xFile->getExtension() != 'php')
                 {
                     continue;
                 }
@@ -518,18 +518,18 @@ 
      */
     public function registerClass($sClassName, array $aOptions = array())
     {
-        if(!($sInitialClassName = trim($sClassName)))
+        if (!($sInitialClassName = trim($sClassName)))
         {
             return false;
         }
-        foreach($this->aClassDirs as $aClassDir)
+        foreach ($this->aClassDirs as $aClassDir)
         {
             // Get the separator
             $sSeparator = $aClassDir['separator'];
             // Replace / and \ with dots, and trim the string
             $sClassName = trim(str_replace(array('\\', '/'), array($sSeparator, $sSeparator), $sInitialClassName), $sSeparator);
             $sClassPath = '';
-            if(($nLastDotPosition = strrpos($sClassName, $sSeparator)) !== false)
+            if (($nLastDotPosition = strrpos($sClassName, $sSeparator)) !== false)
             {
                 $sClassPath = substr($sClassName, 0, $nLastDotPosition);
                 $sClassName = substr($sClassName, $nLastDotPosition + 1);
@@ -541,17 +541,17 @@ 
             $nLen = strlen($sNamespace);
             $bRegister = false;
             // Check if the class belongs to the namespace
-            if(($sNamespace) && substr($sClassPath, 0, $nLen) == str_replace(array('\\'), array($sSeparator), $sNamespace))
+            if (($sNamespace) && substr($sClassPath, 0, $nLen) == str_replace(array('\\'), array($sSeparator), $sNamespace))
             {
                 $sClassFile = $aClassDir['directory'] . DIRECTORY_SEPARATOR . substr($sClassFile, $nLen);
                 $bRegister = true;
             }
-            elseif(!($sNamespace))
+            elseif (!($sNamespace))
             {
                 $sClassFile = $aClassDir['directory'] . DIRECTORY_SEPARATOR . $sClassFile;
                 $bRegister = true;
             }
-            if($bRegister && is_file($sClassFile))
+            if ($bRegister && is_file($sClassFile))
             {
                 // Found the file in this directory
                 $xFileInfo = new \SplFileInfo($sClassFile);
@@ -575,7 +575,7 @@ 
     {
         $xObject = null; // The user registered object
         $xPlugin = $this->getRequestPlugin('CallableObject'); // The CallableObject plugin
-        if(($xPlugin))
+        if (($xPlugin))
         {
             $xObject = $xPlugin->getRegisteredObject($sClassName);
         }
@@ -589,7 +589,7 @@ 
      */
     private function getJsLibUri()
     {
-        if(!$this->hasOption('js.lib.uri'))
+        if (!$this->hasOption('js.lib.uri'))
         {
             return 'https://cdn.jsdelivr.net/jaxon/1.2.0/';
         }
@@ -609,7 +609,7 @@ 
         $jsDelivrUri = 'https://cdn.jsdelivr.net';
         $nLen = strlen($jsDelivrUri);
         // The jsDelivr CDN only hosts minified files
-        if(($this->getOption('js.app.minify')) || substr($this->getJsLibUri(), 0, $nLen) == $jsDelivrUri)
+        if (($this->getOption('js.app.minify')) || substr($this->getJsLibUri(), 0, $nLen) == $jsDelivrUri)
         {
             return '.min.js';
         }
@@ -626,7 +626,7 @@ 
         // Check config options
         // - The js.app.extern option must be set to true
         // - The js.app.uri and js.app.dir options must be set to non null values
-        if(!$this->getOption('js.app.extern') ||
+        if (!$this->getOption('js.app.extern') ||
             !$this->getOption('js.app.uri') ||
             !$this->getOption('js.app.dir'))
         {
@@ -635,7 +635,7 @@ 
         // Check dir access
         // - The js.app.dir must be writable
         $sJsAppDir = $this->getOption('js.app.dir');
-        if(!is_dir($sJsAppDir) || !is_writable($sJsAppDir))
+        if (!is_dir($sJsAppDir) || !is_writable($sJsAppDir))
         {
             return false;
         }
@@ -649,7 +649,7 @@ 
      */
     private function setTemplateCacheDir()
     {
-        if($this->hasOption('core.template.cache_dir'))
+        if ($this->hasOption('core.template.cache_dir'))
         {
             $this->setCacheDir($this->getOption('core.template.cache_dir'));
         }
@@ -671,11 +671,11 @@ 
 
         // Add component files to the javascript file array;
         $aJsFiles = array($sJsCoreUrl);
-        if($this->getOption('core.debug.on'))
+        if ($this->getOption('core.debug.on'))
         {
             $aJsFiles[] = $sJsDebugUrl;
             $aJsFiles[] = $sJsLanguageUrl;
-            if($this->getOption('core.debug.verbose'))
+            if ($this->getOption('core.debug.verbose'))
             {
                 $aJsFiles[] = $sJsVerboseUrl;
             }
@@ -687,7 +687,7 @@ 
             'sJsOptions' => $this->getOption('js.app.options'),
             'aUrls' => $aJsFiles,
         ));
-        foreach($this->aResponsePlugins as $xPlugin)
+        foreach ($this->aResponsePlugins as $xPlugin)
         {
             $sCode .= rtrim($xPlugin->getJs(), " \n") . "\n";
         }
@@ -705,7 +705,7 @@ 
         $this->setTemplateCacheDir();
 
         $sCode = '';
-        foreach($this->aResponsePlugins as $xPlugin)
+        foreach ($this->aResponsePlugins as $xPlugin)
         {
             $sCode .= rtrim($xPlugin->getCss(), " \n") . "\n";
         }
@@ -793,7 +793,7 @@ 
         ));
 
         $sPluginScript = '';
-        foreach($this->aResponsePlugins as $xPlugin)
+        foreach ($this->aResponsePlugins as $xPlugin)
         {
             $sPluginScript .= "\n" . trim($xPlugin->getScript(), " \n");
         }
@@ -825,11 +825,11 @@ 
 
         // Get the config and plugins scripts
         $sScript = $this->getConfigScript() . "\n" . $this->getReadyScript() . "\n";
-        foreach($this->aRequestPlugins as $xPlugin)
+        foreach ($this->aRequestPlugins as $xPlugin)
         {
             $sScript .= "\n" . trim($xPlugin->getScript(), " \n");
         }
-        if($this->canExportJavascript())
+        if ($this->canExportJavascript())
         {
             $sJsAppURI = rtrim($this->getOption('js.app.uri'), '/') . '/';
             $sJsAppDir = rtrim($this->getOption('js.app.dir'), '/') . '/';
@@ -838,13 +838,13 @@ 
             $sHash = $this->generateHash();
             $sOutFile = $sHash . '.js';
             $sMinFile = $sHash . '.min.js';
-            if(!is_file($sJsAppDir . $sOutFile))
+            if (!is_file($sJsAppDir . $sOutFile))
             {
                 file_put_contents($sJsAppDir . $sOutFile, $sScript);
             }
-            if(($this->getOption('js.app.minify')))
+            if (($this->getOption('js.app.minify')))
             {
-                if(($this->minify($sJsAppDir . $sOutFile, $sJsAppDir . $sMinFile)))
+                if (($this->minify($sJsAppDir . $sOutFile, $sJsAppDir . $sMinFile)))
                 {
                     $sOutFile = $sMinFile;
                 }
@@ -877,7 +877,7 @@ 
      */
     public function getResponsePlugin($sName)
     {
-        if(array_key_exists($sName, $this->aResponsePlugins))
+        if (array_key_exists($sName, $this->aResponsePlugins))
         {
             return $this->aResponsePlugins[$sName];
         }
@@ -893,7 +893,7 @@ 
      */
     public function getRequestPlugin($sName)
     {
-        if(array_key_exists($sName, $this->aRequestPlugins))
+        if (array_key_exists($sName, $this->aRequestPlugins))
         {
             return $this->aRequestPlugins[$sName];
         }

Braces +5 added lines, -10 removed lines

@@ -266,13 +266,11 @@ 
         {
             // The name of a request plugin is used as key in the plugin table
             $this->aRequestPlugins[$xPlugin->getName()] = $xPlugin;
-        }
-        elseif($xPlugin instanceof Response)
+        } elseif($xPlugin instanceof Response)
         {
             // The name of a response plugin is used as key in the plugin table
             $this->aResponsePlugins[$xPlugin->getName()] = $xPlugin;
-        }
-        elseif(!$bIsConfirm && !$bIsAlert)
+        } elseif(!$bIsConfirm && !$bIsAlert)
         {
             throw new \Jaxon\Exception\Error($this->trans('errors.register.invalid', array('name' => get_class($xPlugin))));
         }
@@ -407,8 +405,7 @@ 
             {
                 $this->xAutoloader->setPsr4($sNamespace . '\\', $sDirectory);
             }
-        }
-        elseif(($this->xAutoloader))
+        } elseif(($this->xAutoloader))
         {
             // If there is an autoloader, register the dir with classmap autoloading
             $itDir = new RecursiveDirectoryIterator($sDirectory);
@@ -545,8 +542,7 @@ 
             {
                 $sClassFile = $aClassDir['directory'] . DIRECTORY_SEPARATOR . substr($sClassFile, $nLen);
                 $bRegister = true;
-            }
-            elseif(!($sNamespace))
+            } elseif(!($sNamespace))
             {
                 $sClassFile = $aClassDir['directory'] . DIRECTORY_SEPARATOR . $sClassFile;
                 $bRegister = true;
@@ -855,8 +851,7 @@ 
                 'sJsOptions' => $this->getOption('js.app.options'),
                 'sUrl' => $sJsAppURI . $sOutFile,
             ));
-        }
-        else
+        } else
         {
             // The plugins scripts are wrapped with javascript tags
             $sScript = $this->render('jaxon::plugins/wrapper.js', array(

src/Request/Manager.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 +26 added lines, -26 removed lines

@@ -55,17 +55,17 @@ 
         $this->aArgs = array();
         $this->nMethod = Jaxon::METHOD_UNKNOWN;
         
-        if(isset($_POST['jxnargs']))
+        if (isset($_POST['jxnargs']))
         {
             $this->nMethod = Jaxon::METHOD_POST;
             $this->aArgs = $_POST['jxnargs'];
         }
-        elseif(isset($_GET['jxnargs']))
+        elseif (isset($_GET['jxnargs']))
         {
             $this->nMethod = Jaxon::METHOD_GET;
             $this->aArgs = $_GET['jxnargs'];
         }
-        if(get_magic_quotes_gpc() == 1)
+        if (get_magic_quotes_gpc() == 1)
         {
             array_walk($this->aArgs, array(&$this, '__argumentStripSlashes'));
         }
@@ -81,17 +81,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;
             }
@@ -109,7 +109,7 @@ 
      */
     private function __argumentStripSlashes(&$sArg)
     {
-        if(!is_string($sArg))
+        if (!is_string($sArg))
         {
             return '';
         }
@@ -157,14 +157,14 @@ 
      */
     private function __argumentDecode(&$sArg)
     {
-        if($sArg == '')
+        if ($sArg == '')
         {
             return '';
         }
 
         $data = json_decode($sArg, true);
 
-        if($data !== null && $sArg != $data)
+        if ($data !== null && $sArg != $data)
         {
             $sArg = $data;
         }
@@ -183,13 +183,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]);
@@ -198,7 +198,7 @@ 
                 $this->__argumentDecodeUTF8_iconv($xArg);
             }
         }
-        elseif(is_string($mArg))
+        elseif (is_string($mArg))
         {
             $mArg = iconv("UTF-8", $this->getOption('core.encoding') . '//TRANSLIT', $mArg);
         }
@@ -213,13 +213,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]);
@@ -228,7 +228,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");
         }
@@ -243,14 +243,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]);
@@ -260,7 +260,7 @@ 
                 $this->__argumentDecodeUTF8_utf8_decode($xArg);
             }
         }
-        elseif(is_string($mArg))
+        elseif (is_string($mArg))
         {
             $mArg = utf8_decode($mArg);
         }
@@ -285,19 +285,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 +8 added lines, -16 removed lines

@@ -59,8 +59,7 @@ 
         {
             $this->nMethod = Jaxon::METHOD_POST;
             $this->aArgs = $_POST['jxnargs'];
-        }
-        elseif(isset($_GET['jxnargs']))
+        } elseif(isset($_GET['jxnargs']))
         {
             $this->nMethod = Jaxon::METHOD_GET;
             $this->aArgs = $_GET['jxnargs'];
@@ -167,8 +166,7 @@ 
         if($data !== null && $sArg != $data)
         {
             $sArg = $data;
-        }
-        else
+        } else
         {
             $sArg = $this->__convertValue($sArg);
         }
@@ -197,8 +195,7 @@ 
                 }
                 $this->__argumentDecodeUTF8_iconv($xArg);
             }
-        }
-        elseif(is_string($mArg))
+        } elseif(is_string($mArg))
         {
             $mArg = iconv("UTF-8", $this->getOption('core.encoding') . '//TRANSLIT', $mArg);
         }
@@ -227,8 +224,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");
         }
@@ -259,8 +255,7 @@ 
                 
                 $this->__argumentDecodeUTF8_utf8_decode($xArg);
             }
-        }
-        elseif(is_string($mArg))
+        } elseif(is_string($mArg))
         {
             $mArg = utf8_decode($mArg);
         }
@@ -292,16 +287,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/UserFunction.php

Unused Use Statements -1 removed lines

@@ -23,7 +23,6 @@
 
 use Jaxon\Jaxon;
 use Jaxon\Plugin\Request as RequestPlugin;
-use Jaxon\Request\Manager as RequestManager;
 
 class UserFunction extends RequestPlugin
 {

Spacing +13 added lines, -13 removed lines

@@ -51,11 +51,11 @@ 
 
         $this->sRequestedFunction = null;
         
-        if(isset($_GET['jxnfun']))
+        if (isset($_GET['jxnfun']))
         {
             $this->sRequestedFunction = $_GET['jxnfun'];
         }
-        if(isset($_POST['jxnfun']))
+        if (isset($_POST['jxnfun']))
         {
             $this->sRequestedFunction = $_POST['jxnfun'];
         }
@@ -80,22 +80,22 @@ 
      */
     public function register($aArgs)
     {
-        if(count($aArgs) > 1)
+        if (count($aArgs) > 1)
         {
             $sType = $aArgs[0];
 
-            if($sType == Jaxon::USER_FUNCTION)
+            if ($sType == Jaxon::USER_FUNCTION)
             {
                 $xUserFunction = $aArgs[1];
 
-                if(!($xUserFunction instanceof \Jaxon\Request\Support\UserFunction))
+                if (!($xUserFunction instanceof \Jaxon\Request\Support\UserFunction))
                     $xUserFunction = new \Jaxon\Request\Support\UserFunction($xUserFunction);
 
-                if(count($aArgs) > 2)
+                if (count($aArgs) > 2)
                 {
-                    if(is_array($aArgs[2]))
+                    if (is_array($aArgs[2]))
                     {
-                        foreach($aArgs[2] as $sName => $sValue)
+                        foreach ($aArgs[2] as $sName => $sValue)
                         {
                             $xUserFunction->configure($sName, $sValue);
                         }
@@ -122,7 +122,7 @@ 
     public function generateHash()
     {
         $sHash = '';
-        foreach($this->aFunctions as $xFunction)
+        foreach ($this->aFunctions as $xFunction)
         {
             $sHash .= $xFunction->getName();
         }
@@ -137,7 +137,7 @@ 
     public function getScript()
     {
         $code = '';
-        foreach($this->aFunctions as $xFunction)
+        foreach ($this->aFunctions as $xFunction)
         {
             $code .= $xFunction->getScript();
         }
@@ -152,7 +152,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;
         }
@@ -166,12 +166,12 @@ 
      */
     public function processRequest()
     {
-        if(!$this->canProcessRequest())
+        if (!$this->canProcessRequest())
             return false;
 
         $aArgs = $this->getRequestManager()->process();
 
-        if(array_key_exists($this->sRequestedFunction, $this->aFunctions))
+        if (array_key_exists($this->sRequestedFunction, $this->aFunctions))
         {
             $this->aFunctions[$this->sRequestedFunction]->call($aArgs);
             return true;

Braces +7 added lines, -6 removed lines

@@ -88,8 +88,9 @@ 
             {
                 $xUserFunction = $aArgs[1];
 
-                if(!($xUserFunction instanceof \Jaxon\Request\Support\UserFunction))
-                    $xUserFunction = new \Jaxon\Request\Support\UserFunction($xUserFunction);
+                if(!($xUserFunction instanceof \Jaxon\Request\Support\UserFunction)) {
+                                    $xUserFunction = new \Jaxon\Request\Support\UserFunction($xUserFunction);
+                }
 
                 if(count($aArgs) > 2)
                 {
@@ -99,8 +100,7 @@ 
                         {
                             $xUserFunction->configure($sName, $sValue);
                         }
-                    }
-                    else
+                    } else
                     {
                         $xUserFunction->configure('include', $aArgs[2]);
                     }
@@ -166,8 +166,9 @@ 
      */
     public function processRequest()
     {
-        if(!$this->canProcessRequest())
-            return false;
+        if(!$this->canProcessRequest()) {
+                    return false;
+        }
 
         $aArgs = $this->getRequestManager()->process();
 

src/Request/Request.php

Unused Use Statements -1 removed lines

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

Spacing +18 added lines, -18 removed lines

@@ -70,9 +70,9 @@ 
      */
     public function hasPageNumber()
     {
-        foreach($this->aParameters as $xParameter)
+        foreach ($this->aParameters as $xParameter)
         {
-            if($xParameter->getType() == Jaxon::PAGE_NUMBER)
+            if ($xParameter->getType() == Jaxon::PAGE_NUMBER)
             {
                 return true;
             }
@@ -90,9 +90,9 @@ 
     public function setPageNumber($nPageNumber)
     {
         // Set the value of the Jaxon::PAGE_NUMBER parameter
-        foreach($this->aParameters as $xParameter)
+        foreach ($this->aParameters as $xParameter)
         {
-            if($xParameter->getType() == Jaxon::PAGE_NUMBER)
+            if ($xParameter->getType() == Jaxon::PAGE_NUMBER)
             {
                 $xParameter->setValue(intval($nPageNumber));
                 break;
@@ -112,7 +112,7 @@ 
     {
         $this->sCondition = '__confirm__';
         $this->aMessageArgs = func_get_args();
-        array_walk($this->aMessageArgs, function (&$xParameter) {
+        array_walk($this->aMessageArgs, function(&$xParameter) {
             $xParameter = Parameter::make($xParameter);
         });
         return $this;
@@ -133,7 +133,7 @@ 
         $this->sCondition = Parameter::make($sCondition)->getScript();
         $this->aMessageArgs = func_get_args();
         array_shift($this->aMessageArgs); // Remove the first entry (the condition) from the array
-        array_walk($this->aMessageArgs, function (&$xParameter) {
+        array_walk($this->aMessageArgs, function(&$xParameter) {
             $xParameter = Parameter::make($xParameter);
         });
         return $this;
@@ -154,7 +154,7 @@ 
         $this->sCondition = '!(' . Parameter::make($sCondition)->getScript() . ')';
         $this->aMessageArgs = func_get_args();
         array_shift($this->aMessageArgs); // Remove the first entry (the condition) from the array
-        array_walk($this->aMessageArgs, function (&$xParameter) {
+        array_walk($this->aMessageArgs, function(&$xParameter) {
             $xParameter = Parameter::make($xParameter);
         });
         return $this;
@@ -179,12 +179,12 @@ 
         // This array will avoid declaring many variables with the same value.
         // The array key is the variable value, while the array value is the variable name.
         $aVariables = array(); // Array of local variables.
-        foreach($this->aParameters as &$xParameter)
+        foreach ($this->aParameters as &$xParameter)
         {
             $sParameterStr = $xParameter->getScript();
-            if($xParameter instanceof \Jaxon\JQuery\Dom\Element)
+            if ($xParameter instanceof \Jaxon\JQuery\Dom\Element)
             {
-                if(!array_key_exists($sParameterStr, $aVariables))
+                if (!array_key_exists($sParameterStr, $aVariables))
                 {
                     // The value is not yet defined. A new variable is created.
                     $sVarName = "jxnVar$nVarId";
@@ -202,19 +202,19 @@ 
         }
 
         $sPhrase = '';
-        if(count($this->aMessageArgs) > 0)
+        if (count($this->aMessageArgs) > 0)
         {
             $sPhrase = array_shift($this->aMessageArgs); // The first array entry is the question.
             // $sPhrase = "'" . addslashes($sPhrase) . "'"; // Wrap the phrase with single quotes
-            if(count($this->aMessageArgs) > 0)
+            if (count($this->aMessageArgs) > 0)
             {
                 $nParamId = 1;
-                foreach($this->aMessageArgs as &$xParameter)
+                foreach ($this->aMessageArgs as &$xParameter)
                 {
                     $sParameterStr = $xParameter->getScript();
-                    if($xParameter instanceof \Jaxon\JQuery\Dom\Element)
+                    if ($xParameter instanceof \Jaxon\JQuery\Dom\Element)
                     {
-                        if(!array_key_exists($sParameterStr, $aVariables))
+                        if (!array_key_exists($sParameterStr, $aVariables))
                         {
                             // The value is not yet defined. A new variable is created.
                             $sVarName = "jxnVar$nVarId";
@@ -237,17 +237,17 @@ 
         }
 
         $sScript = $this->getOption('core.prefix.' . $this->sType) . parent::getScript();
-        if($this->sCondition == '__confirm__')
+        if ($this->sCondition == '__confirm__')
         {
             $xConfirm = $this->getPluginManager()->getConfirm();
             $sScript = $xConfirm->confirm($sPhrase, $sScript, '');
         }
-        elseif($this->sCondition !== null)
+        elseif ($this->sCondition !== null)
         {
             $xAlert = $this->getPluginManager()->getAlert();
             $xAlert->setReturn(true);
             $sScript = 'if(' . $this->sCondition . '){' . $sScript . ';}';
-            if(($sPhrase))
+            if (($sPhrase))
             {
                 $sScript .= 'else{' . $xAlert->warning($sPhrase) . ';}';
             }

Braces +3 added lines, -6 removed lines

@@ -191,8 +191,7 @@ 
                     $aVariables[$sParameterStr] = $sVarName;
                     $sVars .= "$sVarName=$xParameter;";
                     $nVarId++;
-                }
-                else
+                } else
                 {
                     // The value is already defined. The corresponding variable is assigned.
                     $sVarName = $aVariables[$sParameterStr];
@@ -221,8 +220,7 @@ 
                             $aVariables[$sParameterStr] = $sVarName;
                             $sVars .= "$sVarName=$xParameter;";
                             $nVarId++;
-                        }
-                        else
+                        } else
                         {
                             // The value is already defined. The corresponding variable is assigned.
                             $sVarName = $aVariables[$sParameterStr];
@@ -241,8 +239,7 @@ 
         {
             $xConfirm = $this->getPluginManager()->getConfirm();
             $sScript = $xConfirm->confirm($sPhrase, $sScript, '');
-        }
-        elseif($this->sCondition !== null)
+        } elseif($this->sCondition !== null)
         {
             $xAlert = $this->getPluginManager()->getAlert();
             $xAlert->setReturn(true);

src/Request/Support/UserFunction.php

Doc Comments +1 added lines, -1 removed lines

@@ -158,7 +158,7 @@
     /**
      * Constructs and returns a <Jaxon\Request\Request> object which is capable of generating the javascript call to invoke this jaxon enabled function
      *
-     * @return Jaxon\Request\Request
+     * @return Request
      */
     public function generateRequest()
     {

Spacing +8 added lines, -8 removed lines

@@ -90,13 +90,13 @@ 
     {
         $this->aConfiguration = array();
         $this->sAlias = '';
-        if(is_array($sUserFunction))
+        if (is_array($sUserFunction))
         {
-            if(count($sUserFunction) != 2 && count($sUserFunction) != 3)
+            if (count($sUserFunction) != 2 && count($sUserFunction) != 3)
             {
                 throw new \Jaxon\Exception\Error($this->trans('errors.functions.invalid-declaration'));
             }
-            if(count($sUserFunction) == 3)
+            if (count($sUserFunction) == 3)
             {
                 $this->sAlias = $sUserFunction[0];
                 $this->sUserFunction = array_slice($sUserFunction, 1);
@@ -106,7 +106,7 @@ 
                 $this->sUserFunction = $sUserFunction;
             }
         }
-        elseif(is_string($sUserFunction))
+        elseif (is_string($sUserFunction))
         {
             $this->sUserFunction = $sUserFunction;
         }
@@ -124,7 +124,7 @@ 
     public function getName()
     {
         // Do not use sAlias here!
-        if(is_array($this->sUserFunction))
+        if (is_array($this->sUserFunction))
         {
             return $this->sUserFunction[1];
         }
@@ -141,7 +141,7 @@ 
      */
     public function configure($sName, $sValue)
     {
-        switch($sName)
+        switch ($sName)
         {
         case 'alias':
             $this->sAlias = $sValue;
@@ -195,12 +195,12 @@ 
      */
     public function call($aArgs = array())
     {
-        if(($this->sInclude))
+        if (($this->sInclude))
         {
             ob_start();
             require_once $this->sInclude;
             $sOutput = ob_get_clean();
-            if(($sOutput))
+            if (($sOutput))
             {
                 $sOutput = $this->trans('debug.function.include', array(
                     'file' => $this->sInclude,

Braces +3 added lines, -6 removed lines

@@ -100,17 +100,14 @@
             {
                 $this->sAlias = $sUserFunction[0];
                 $this->sUserFunction = array_slice($sUserFunction, 1);
-            }
-            else
+            } else
             {
                 $this->sUserFunction = $sUserFunction;
             }
-        }
-        elseif(is_string($sUserFunction))
+        } elseif(is_string($sUserFunction))
         {
             $this->sUserFunction = $sUserFunction;
-        }
-        else
+        } else
         {
             throw new \Jaxon\Exception\Error($this->trans('errors.functions.invalid-declaration'));
         }

src/Request/Traits/Factory.php

Doc Comments -2 removed lines

@@ -89,7 +89,6 @@ 
      * Return the javascript call to an Jaxon object method
      *
      * @param string         $sMethod           The method (without class) name
-     * @param ...            $xParams           The parameters of the method
      *
      * @return object
      */
@@ -110,7 +109,6 @@ 
      * @param integer $nItemsPerPage the number of items per page
      * @param integer $nCurrentPage the current page
      * @param string  $sMethod the name of the method
-     * @param ... $parameters the parameters of the method
      *
      * @return string the pagination links
      */

Spacing +3 added lines, -3 removed lines

@@ -44,7 +44,7 @@ 
      */
     public function getJaxonClassName()
     {
-        if(!$this->xJaxonCallable)
+        if (!$this->xJaxonCallable)
         {
             // Make the Jaxon class name for a class without an associated callable
             // !! Warning !! This can happen only if this object is not registered with the Jaxon libary
@@ -62,7 +62,7 @@ 
      */
     public function getJaxonNamespace()
     {
-        if(!$this->xJaxonCallable)
+        if (!$this->xJaxonCallable)
         {
             // Return an empty string.
             return '';
@@ -77,7 +77,7 @@ 
      */
     public function getJaxonClassPath()
     {
-        if(!$this->xJaxonCallable)
+        if (!$this->xJaxonCallable)
         {
             // Return an empty string.
             return '';

src/Utils/Container.php

Doc Comments +1 added lines, -1 removed lines

@@ -201,7 +201,7 @@
     /**
      * Create a new the config manager
      *
-     * @return Jaxon\Utils\Config\Config            The config manager
+     * @return Config\Config            The config manager
      */
     public function newConfig()
     {

Spacing +22 added lines, -22 removed lines

@@ -27,7 +27,7 @@ 
 
     public static function getInstance()
     {
-        if(!self::$xInstance)
+        if (!self::$xInstance)
         {
             self::$xInstance = new Container();
         }
@@ -65,19 +65,19 @@ 
          * Managers
          */
         // Plugin Manager
-        $this->di['plugin_manager'] = function ($c) {
+        $this->di['plugin_manager'] = function($c) {
             return new \Jaxon\Plugin\Manager();
         };
         // Request Manager
-        $this->di['request_manager'] = function ($c) {
+        $this->di['request_manager'] = function($c) {
             return new \Jaxon\Request\Manager();
         };
         // Request Factory
-        $this->di['request_factory'] = function ($c) {
+        $this->di['request_factory'] = function($c) {
             return new \Jaxon\Request\Factory();
         };
         // Response Manager
-        $this->di['response_manager'] = function ($c) {
+        $this->di['response_manager'] = function($c) {
             return new \Jaxon\Response\Manager();
         };
 
@@ -85,35 +85,35 @@ 
          * Services
          */
         // Config manager
-        $this->di['config'] = function ($c) {
+        $this->di['config'] = function($c) {
             return new Config\Config();
         };
         // Minifier
-        $this->di['minifier'] = function ($c) {
+        $this->di['minifier'] = function($c) {
             return new Template\Minifier();
         };
         // Translator
-        $this->di['translator'] = function ($c) {
+        $this->di['translator'] = function($c) {
             return new Translation\Translator($c['translation_dir'], $c['config']);
         };
         // Template engine
-        $this->di['template'] = function ($c) {
+        $this->di['template'] = function($c) {
             return new Template\Template($c['template_dir']);
         };
         // Validator
-        $this->di['validator'] = function ($c) {
+        $this->di['validator'] = function($c) {
             return new Validation\Validator();
         };
         // Pagination Renderer
-        $this->di['pagination.renderer'] = function ($c) {
+        $this->di['pagination.renderer'] = function($c) {
             return new Pagination\Renderer();
         };
         // Pagination Paginator
-        $this->di['pagination.paginator'] = function ($c) {
+        $this->di['pagination.paginator'] = function($c) {
             return new Pagination\Paginator($c['pagination.renderer']);
         };
         // Event Dispatcher
-        $this->di['events'] = function ($c) {
+        $this->di['events'] = function($c) {
             return new EventDispatcher();
         };
 
@@ -121,27 +121,27 @@ 
          * Core library objects
          */
         // Global Response
-        $this->di['response'] = function ($c) {
+        $this->di['response'] = function($c) {
             return new \Jaxon\Response\Response();
         };
         // Jaxon Core
-        $this->di['jaxon'] = function ($c) {
+        $this->di['jaxon'] = function($c) {
             return new \Jaxon\Jaxon();
         };
         // Jaxon Sentry
-        $this->di['sentry'] = function ($c) {
+        $this->di['sentry'] = function($c) {
             // This class is not defined in this package
             $sClass = '\\Jaxon\\Sentry\\Sentry';
             return new $sClass;
         };
         // Armada
-        $this->di['armada'] = function ($c) {
+        $this->di['armada'] = function($c) {
             // This class is not defined in this package
             $sClass = '\\Jaxon\\Armada\\Armada';
             return new $sClass;
         };
         // View Renderer Facade
-        $this->di['sentry.view.renderer'] = function ($c) {
+        $this->di['sentry.view.renderer'] = function($c) {
             $aRenderers = $c['view.data.renderers'];
             $sDefaultNamespace = $c['view.data.namespace.default'];
             return new \Jaxon\Sentry\View\Facade($aRenderers, $sDefaultNamespace);
@@ -391,14 +391,14 @@ 
         $this->di['sentry.view.base.' . $sId] = $xClosure;
 
         // Return the initialized view renderer
-        $this->di['sentry.view.' . $sId] = function ($c) use ($sId) {
+        $this->di['sentry.view.' . $sId] = function($c) use ($sId) {
             // Get the defined renderer
             $renderer = $c['sentry.view.base.' . $sId];
             // Init the renderer with the template namespaces
             $aNamespaces = $this->di['view.data.namespaces'];
-            if(key_exists($sId, $aNamespaces))
+            if (key_exists($sId, $aNamespaces))
             {
-                foreach($aNamespaces[$sId] as $ns)
+                foreach ($aNamespaces[$sId] as $ns)
                 {
                     $renderer->addNamespace($ns['namespace'], $ns['directory'], $ns['extension']);
                 }
@@ -416,7 +416,7 @@ 
      */
     public function getViewRenderer($sId = '')
     {
-        if(!$sId)
+        if (!$sId)
         {
             // Return the view renderer facade
             return $this->di['sentry.view.renderer'];

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 +21 added lines, -21 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 < 3)
+        if ($maxPagesToShow < 3)
         {
             throw new \InvalidArgumentException('maxPagesToShow cannot be less than 3.');
         }
@@ -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(Jaxon::PAGE_NUMBER, 0);
         }
@@ -193,7 +193,7 @@ 
 
     public function getNextPage()
     {
-        if($this->currentPage < $this->numPages)
+        if ($this->currentPage < $this->numPages)
         {
             return $this->currentPage + 1;
         }
@@ -203,7 +203,7 @@ 
 
     public function getPrevPage()
     {
-        if($this->currentPage > 1)
+        if ($this->currentPage > 1)
         {
             return $this->currentPage - 1;
         }
@@ -213,7 +213,7 @@ 
 
     public function getNextCall()
     {
-        if(!$this->getNextPage())
+        if (!$this->getNextPage())
         {
             return null;
         }
@@ -226,7 +226,7 @@ 
      */
     public function getPrevCall()
     {
-        if(!$this->getPrevPage())
+        if (!$this->getPrevPage())
         {
             return null;
         }
@@ -254,14 +254,14 @@ 
     {
         $pages = array();
 
-        if($this->numPages <= 1)
+        if ($this->numPages <= 1)
         {
             return array();
         }
 
-        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, $i == $this->currentPage);
             }
@@ -269,9 +269,9 @@ 
         else
         {
             // Determine the sliding range, centered around the current page.
-            $numAdjacents = (int) floor(($this->maxPagesToShow - 3) / 2);
+            $numAdjacents = (int)floor(($this->maxPagesToShow - 3) / 2);
 
-            if($this->currentPage + $numAdjacents > $this->numPages)
+            if ($this->currentPage + $numAdjacents > $this->numPages)
             {
                 $slidingStart = $this->numPages - $this->maxPagesToShow + 2;
             }
@@ -279,28 +279,28 @@ 
             {
                 $slidingStart = $this->currentPage - $numAdjacents;
             }
-            if($slidingStart < 2)
+            if ($slidingStart < 2)
             {
                 $slidingStart = 2;
             }
 
             $slidingEnd = $slidingStart + $this->maxPagesToShow - 3;
-            if($slidingEnd >= $this->numPages)
+            if ($slidingEnd >= $this->numPages)
             {
                 $slidingEnd = $this->numPages - 1;
             }
 
             // Build the list of pages.
             $pages[] = $this->createPage(1, $this->currentPage == 1);
-            if($slidingStart > 2)
+            if ($slidingStart > 2)
             {
                 $pages[] = $this->createPageEllipsis();
             }
-            for($i = $slidingStart; $i <= $slidingEnd; $i++)
+            for ($i = $slidingStart; $i <= $slidingEnd; $i++)
             {
                 $pages[] = $this->createPage($i, $i == $this->currentPage);
             }
-            if($slidingEnd < $this->numPages - 1)
+            if ($slidingEnd < $this->numPages - 1)
             {
                 $pages[] = $this->createPageEllipsis();
             }
@@ -346,7 +346,7 @@ 
      */
     public function toHtml()
     {
-        if($this->getNumPages() <= 1)
+        if ($this->getNumPages() <= 1)
         {
             return '';
         }
@@ -369,7 +369,7 @@ 
     {
         $first = ($this->currentPage - 1) * $this->itemsPerPage + 1;
 
-        if($first > $this->totalItems)
+        if ($first > $this->totalItems)
         {
             return null;
         }
@@ -380,13 +380,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;
         }

Braces +2 added lines, -4 removed lines

@@ -265,8 +265,7 @@ 
             {
                 $pages[] = $this->createPage($i, $i == $this->currentPage);
             }
-        }
-        else
+        } else
         {
             // Determine the sliding range, centered around the current page.
             $numAdjacents = (int) floor(($this->maxPagesToShow - 3) / 2);
@@ -274,8 +273,7 @@ 
             if($this->currentPage + $numAdjacents > $this->numPages)
             {
                 $slidingStart = $this->numPages - $this->maxPagesToShow + 2;
-            }
-            else
+            } else
             {
                 $slidingStart = $this->currentPage - $numAdjacents;
             }