jaxon-php / jaxon-core

src/Jaxon.php

Braces +6 added lines, -8 removed lines

@@ -212,8 +212,9 @@ 
             {
                 $sEvent = $xArgs;
                 $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;
             }
             /*else
@@ -326,8 +327,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,
@@ -344,8 +344,7 @@ 
                 {
                     $sEvent = self::PROCESSING_EVENT_INVALID;
                     $aParams = array($e->getMessage());
-                }
-                else
+                } else
                 {
                     $sEvent = self::PROCESSING_EVENT_ERROR;
                     $aParams = array($e);
@@ -355,8 +354,7 @@ 
                 {
                     // Call the processing event
                     $this->aProcessingEvents[$sEvent]->call($aParams);
-                }
-                else
+                } else
                 {
                     // The exception is not to be processed here.
                     throw $e;

Doc Comments -9 removed lines

@@ -141,15 +141,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
      */

Unused Use Statements -5 removed lines

@@ -25,13 +25,8 @@
 
 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;
-use Closure;
 
 class Jaxon
 {

Spacing +17 added lines, -17 removed lines

@@ -158,13 +158,13 @@ 
         $aArgs = func_get_args();
         $nArgs = func_num_args();
 
-        if(self::PROCESSING_EVENT == $sType)
+        if (self::PROCESSING_EVENT == $sType)
         {
-            if($nArgs > 2)
+            if ($nArgs > 2)
             {
                 $sEvent = $xArgs;
                 $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;
             }
@@ -236,16 +236,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";
         }
@@ -316,7 +316,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
@@ -325,7 +325,7 @@ 
         }
 
         // Check if there is a plugin to process this request
-        if(!$this->canProcessRequest())
+        if (!$this->canProcessRequest())
         {
             return;
         }
@@ -334,18 +334,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,
@@ -358,7 +358,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());
@@ -369,7 +369,7 @@ 
                     $aParams = array($e);
                 }
 
-                if(isset($this->aProcessingEvents[$sEvent]))
+                if (isset($this->aProcessingEvents[$sEvent]))
                 {
                     // Call the processing event
                     $this->aProcessingEvents[$sEvent]->call($aParams);
@@ -382,7 +382,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)
@@ -392,10 +392,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));
@@ -404,7 +404,7 @@ 
 
         $this->getResponseManager()->printDebug();
 
-        if(($this->getOption('core.process.exit')))
+        if (($this->getOption('core.process.exit')))
         {
             $this->getResponseManager()->sendOutput();
             exit();

src/Traits/Autoload.php

Unused Use Statements -2 removed lines

@@ -19,8 +19,6 @@
 
 namespace Jaxon\Traits;
 
-use Jaxon\Utils\Container;
-
 trait Autoload
 {
     /**

src/Traits/Config.php

Doc Comments +4 added lines, -4 removed lines

@@ -69,7 +69,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|\Jaxon\Utils\Config\Config
      */
     public function readPhpConfigFile($sConfigFile, $sLibKey = '', $sAppKey = null)
     {
@@ -83,7 +83,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|\Jaxon\Utils\Config\Config
      */
     public function readYamlConfigFile($sConfigFile, $sLibKey = '', $sAppKey = null)
     {
@@ -97,7 +97,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 \Jaxon\Utils\Config\Config|null
      */
     public function readJsonConfigFile($sConfigFile, $sLibKey = '', $sAppKey = null)
     {
@@ -111,7 +111,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|\Jaxon\Utils\Config\Config
      */
     public function readConfigFile($sConfigFile, $sLibKey = '', $sAppKey = null)
     {

Spacing +2 added lines, -2 removed lines

@@ -43,7 +43,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,
@@ -116,7 +116,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/Traits/Plugin.php

Doc Comments +1 added lines, -1 removed lines

@@ -31,7 +31,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 \Jaxon\Plugin\Plugin         $xPlugin               An instance of a plugin
      * @param integer        $nPriority             The plugin priority, used to order the plugins
      *
      * @return void

Unused Use Statements -2 removed lines

@@ -19,8 +19,6 @@
 
 namespace Jaxon\Traits;
 
-use Jaxon\Utils\Container;
-
 trait Plugin
 {
     /**

src/Traits/Upload.php

Doc Comments +1 added lines, -1 removed lines

@@ -46,7 +46,7 @@
    /**
      * Check uploaded files validity and move them to the user dir
      *
-     * @return boolean
+     * @return null|boolean
      */
     public function saveUploadedFiles()
     {

Unused Use Statements -5 removed lines

@@ -19,11 +19,6 @@
 
 namespace Jaxon\Traits;
 
-use Jaxon\Plugin\Manager as PluginManager;
-use Jaxon\Request\Manager as RequestManager;
-use Jaxon\Response\Manager as ResponseManager;
-
-use Jaxon\Utils\URI;
 use Exception;
 use Closure;
 

Indentation +2 added lines, -2 removed lines

@@ -29,7 +29,7 @@ 
 
 trait Upload
 {
-   /**
+    /**
      * Check if uploaded files are available
      *
      * @return boolean
@@ -43,7 +43,7 @@ 
         return $xUploadPlugin->canProcessRequest();
     }
 
-   /**
+    /**
      * Check uploaded files validity and move them to the user dir
      *
      * @return boolean

Spacing +7 added lines, -7 removed lines

@@ -36,7 +36,7 @@ 
      */
     public function hasUploadedFiles()
     {
-        if(($xUploadPlugin = $this->getPluginManager()->getRequestPlugin(self::FILE_UPLOAD)) == null)
+        if (($xUploadPlugin = $this->getPluginManager()->getRequestPlugin(self::FILE_UPLOAD)) == null)
         {
             return false;
         }
@@ -52,11 +52,11 @@ 
     {
         try
         {
-            if(($xUploadPlugin = $this->getPluginManager()->getRequestPlugin(self::FILE_UPLOAD)) == null)
+            if (($xUploadPlugin = $this->getPluginManager()->getRequestPlugin(self::FILE_UPLOAD)) == null)
             {
                 throw new Exception($this->trans('errors.upload.plugin'));
             }
-            elseif(!$xUploadPlugin->canProcessRequest())
+            elseif (!$xUploadPlugin->canProcessRequest())
             {
                 throw new Exception($this->trans('errors.upload.request'));
             }
@@ -65,14 +65,14 @@ 
             $sResponse = '{"code": "success", "upl": "' . $sKey . '"}';
             $return = true;
         }
-        catch(Exception $e)
+        catch (Exception $e)
         {
             $sResponse = '{"code": "error", "msg": "' . addslashes($e->getMessage()) . '"}';
             $return = false;
         }
         // Send the response back to the browser
         echo '<script>var res = ', $sResponse, '; </script>';
-        if(($this->getOption('core.process.exit')))
+        if (($this->getOption('core.process.exit')))
         {
             exit();
         }
@@ -86,7 +86,7 @@ 
      */
     public function getUploadedFiles()
     {
-        if(($xUploadPlugin = $this->getPluginManager()->getRequestPlugin(self::FILE_UPLOAD)) == null)
+        if (($xUploadPlugin = $this->getPluginManager()->getRequestPlugin(self::FILE_UPLOAD)) == null)
         {
             return [];
         }
@@ -102,7 +102,7 @@ 
      */
     public function setUploadFileFilter(Closure $fFileFilter)
     {
-        if(($xUploadPlugin = $this->getPluginManager()->getRequestPlugin(self::FILE_UPLOAD)) == null)
+        if (($xUploadPlugin = $this->getPluginManager()->getRequestPlugin(self::FILE_UPLOAD)) == null)
         {
             return;
         }

Braces +2 added lines, -4 removed lines

@@ -55,8 +55,7 @@ 
             if(($xUploadPlugin = $this->getPluginManager()->getRequestPlugin(self::FILE_UPLOAD)) == null)
             {
                 throw new Exception($this->trans('errors.upload.plugin'));
-            }
-            elseif(!$xUploadPlugin->canProcessRequest())
+            } elseif(!$xUploadPlugin->canProcessRequest())
             {
                 throw new Exception($this->trans('errors.upload.request'));
             }
@@ -64,8 +63,7 @@ 
             $sKey = $xUploadPlugin->saveUploadedFiles();
             $sResponse = '{"code": "success", "upl": "' . $sKey . '"}';
             $return = true;
-        }
-        catch(Exception $e)
+        } catch(Exception $e)
         {
             $sResponse = '{"code": "error", "msg": "' . addslashes($e->getMessage()) . '"}';
             $return = false;