jaxon-php / jaxon-core

src/DI/Container.php

Doc Comments +1 added lines, -1 removed lines

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

Spacing +21 added lines, -21 removed lines

@@ -30,7 +30,7 @@ 
 
     public static function getInstance()
     {
-        if(!self::$xInstance)
+        if (!self::$xInstance)
         {
             self::$xInstance = new Container();
         }
@@ -90,19 +90,19 @@ 
          * Managers
          */
         // Plugin Manager
-        $this->coreContainer['jaxon.core.plugin_manager'] = function ($c) {
+        $this->coreContainer['jaxon.core.plugin_manager'] = function($c) {
             return new \Jaxon\Plugin\Manager();
         };
         // Request Manager
-        $this->coreContainer['jaxon.core.request_manager'] = function ($c) {
+        $this->coreContainer['jaxon.core.request_manager'] = function($c) {
             return new \Jaxon\Request\Manager();
         };
         // Request Factory
-        $this->coreContainer['jaxon.core.request_factory'] = function ($c) {
+        $this->coreContainer['jaxon.core.request_factory'] = function($c) {
             return new \Jaxon\Factory\Request();
         };
         // Response Manager
-        $this->coreContainer['jaxon.core.response_manager'] = function ($c) {
+        $this->coreContainer['jaxon.core.response_manager'] = function($c) {
             return new \Jaxon\Response\Manager();
         };
 
@@ -110,35 +110,35 @@ 
          * Services
          */
         // Config manager
-        $this->coreContainer['jaxon.core.config'] = function ($c) {
+        $this->coreContainer['jaxon.core.config'] = function($c) {
             return new \Jaxon\Utils\Config\Config();
         };
         // Minifier
-        $this->coreContainer['jaxon.core.minifier'] = function ($c) {
+        $this->coreContainer['jaxon.core.minifier'] = function($c) {
             return new \Jaxon\Utils\Template\Minifier();
         };
         // Translator
-        $this->coreContainer['jaxon.core.translator'] = function ($c) {
+        $this->coreContainer['jaxon.core.translator'] = function($c) {
             return new \Jaxon\Utils\Translation\Translator($c['jaxon.core.translation_dir'], $c['jaxon.core.config']);
         };
         // Template engine
-        $this->coreContainer['jaxon.core.template'] = function ($c) {
+        $this->coreContainer['jaxon.core.template'] = function($c) {
             return new \Jaxon\Utils\Template\Template($c['jaxon.core.template_dir']);
         };
         // Validator
-        $this->coreContainer['jaxon.core.validator'] = function ($c) {
+        $this->coreContainer['jaxon.core.validator'] = function($c) {
             return new \Jaxon\Utils\Validation\Validator($c['jaxon.core.translator'], $c['jaxon.core.config']);
         };
         // Pagination Renderer
-        $this->coreContainer['jaxon.pagination.renderer'] = function ($c) {
+        $this->coreContainer['jaxon.pagination.renderer'] = function($c) {
             return new \Jaxon\Utils\Pagination\Renderer();
         };
         // Pagination Paginator
-        $this->coreContainer['jaxon.pagination.paginator'] = function ($c) {
+        $this->coreContainer['jaxon.pagination.paginator'] = function($c) {
             return new \Jaxon\Utils\Pagination\Paginator($c['jaxon.pagination.renderer']);
         };
         // Event Dispatcher
-        $this->coreContainer['jaxon.core.events'] = function ($c) {
+        $this->coreContainer['jaxon.core.events'] = function($c) {
             return new EventDispatcher();
         };
 
@@ -146,15 +146,15 @@ 
          * Core library objects
          */
         // Global Response
-        $this->coreContainer['jaxon.core.response'] = function ($c) {
+        $this->coreContainer['jaxon.core.response'] = function($c) {
             return new \Jaxon\Response\Response();
         };
         // Jaxon Core
-        $this->coreContainer['jaxon.core.jaxon'] = function ($c) {
+        $this->coreContainer['jaxon.core.jaxon'] = function($c) {
             return new \Jaxon\Jaxon();
         };
         // View Renderer Facade
-        $this->coreContainer['jaxon.sentry.view.renderer'] = function ($c) {
+        $this->coreContainer['jaxon.sentry.view.renderer'] = function($c) {
             $aRenderers = $c['jaxon.view.data.renderers'];
             $sDefaultNamespace = $c['jaxon.view.data.namespace.default'];
             return new \Jaxon\Sentry\View\Facade($aRenderers, $sDefaultNamespace);
@@ -168,7 +168,7 @@ 
      */
     public function get($sClass)
     {
-        if($this->sentryContainer != null && $this->sentryContainer->has($sClass))
+        if ($this->sentryContainer != null && $this->sentryContainer->has($sClass))
         {
             return $this->sentryContainer->get($sClass);
         }
@@ -443,14 +443,14 @@ 
         $this->coreContainer['jaxon.sentry.view.base.' . $sId] = $xClosure;
 
         // Return the initialized view renderer
-        $this->coreContainer['jaxon.sentry.view.' . $sId] = function ($c) use ($sId) {
+        $this->coreContainer['jaxon.sentry.view.' . $sId] = function($c) use ($sId) {
             // Get the defined renderer
             $renderer = $c['jaxon.sentry.view.base.' . $sId];
             // Init the renderer with the template namespaces
             $aNamespaces = $this->coreContainer['jaxon.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']);
                 }
@@ -468,7 +468,7 @@ 
      */
     public function getViewRenderer($sId = '')
     {
-        if(!$sId)
+        if (!$sId)
         {
             // Return the view renderer facade
             return $this->coreContainer['jaxon.sentry.view.renderer'];

src/Jaxon.php

Unused Use Statements -5 removed lines

@@ -25,14 +25,9 @@
 
 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 Jaxon\DI\Container;
 use Exception;
-use Closure;
 
 class Jaxon
 {

Doc Comments -8 removed lines

@@ -135,14 +135,6 @@
      *        Options include:
      *        - Jaxon::USER_FUNCTION: a function declared at global scope
      *        - Jaxon::CALLABLE_OBJECT: an object who's methods are to be registered
-     * @param mixed        $sFunction | $objObject
-     *        When registering a function, this is the name of the function
-     *        When registering a callable object, this is the object being registered
-     * @param mixed        $sIncludeFile | $aCallOptions
-     *        When registering a function, this is an (optional) array
-     *             of call options, or the (optional) include file
-     *        When registering a callable object, this is an (optional) array
-     *             of call options for the functions being registered
      *
      * @return mixed
      */

Spacing +15 added lines, -15 removed lines

@@ -211,16 +211,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";
         }
@@ -291,7 +291,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
@@ -300,7 +300,7 @@ 
         }
 
         // Check if there is a plugin to process this request
-        if(!$this->canProcessRequest())
+        if (!$this->canProcessRequest())
         {
             return;
         }
@@ -310,18 +310,18 @@ 
         $xResponseManager = $this->getResponseManager();
 
         // 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,
@@ -333,7 +333,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());
@@ -344,7 +344,7 @@ 
                     $aParams = array($e);
                 }
 
-                if(isset($this->aProcessingEvents[$sEvent]))
+                if (isset($this->aProcessingEvents[$sEvent]))
                 {
                     // Call the processing event
                     $this->aProcessingEvents[$sEvent]->call($aParams);
@@ -357,7 +357,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)
@@ -367,16 +367,16 @@ 
             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));
             }
             // If the called function returned no response, give the the global response instead
-            if($xResponseManager->hasNoResponse())
+            if ($xResponseManager->hasNoResponse())
             {
                 $xResponseManager->append($this->getResponse());
             }
@@ -384,7 +384,7 @@ 
 
         $xResponseManager->printDebug();
 
-        if(($this->getOption('core.process.exit')))
+        if (($this->getOption('core.process.exit')))
         {
             $xResponseManager->sendOutput();
             exit();

Braces +3 added lines, -6 removed lines

@@ -320,8 +320,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,
@@ -337,8 +336,7 @@ 
                 {
                     $sEvent = self::PROCESSING_EVENT_INVALID;
                     $aParams = array($e->getMessage());
-                }
-                else
+                } else
                 {
                     $sEvent = self::PROCESSING_EVENT_ERROR;
                     $aParams = array($e);
@@ -348,8 +346,7 @@ 
                 {
                     // Call the processing event
                     $this->aProcessingEvents[$sEvent]->call($aParams);
-                }
-                else
+                } else
                 {
                     // The exception is not to be processed here.
                     throw $e;

src/Traits/Autoload.php

Unused Use Statements -2 removed lines

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

src/Request/Support/UserFunction.php

Spacing +4 added lines, -4 removed lines

@@ -77,7 +77,7 @@ 
     public function getName()
     {
         // Do not use sAlias here!
-        if(is_array($this->sUserFunction))
+        if (is_array($this->sUserFunction))
         {
             return $this->sUserFunction[1];
         }
@@ -94,7 +94,7 @@ 
      */
     public function configure($sName, $sValue)
     {
-        switch($sName)
+        switch ($sName)
         {
         case 'class': // The user function is a method in the given class
             $this->sUserFunction = [$sValue, $this->sUserFunction];
@@ -151,12 +151,12 @@ 
      */
     public function call($aArgs = [])
     {
-        if(($this->sInclude))
+        if (($this->sInclude))
         {
             require_once $this->sInclude;
         }
         $response = call_user_func_array($this->sUserFunction, $aArgs);
-        if(($response))
+        if (($response))
         {
             $this->getResponseManager()->append($response);
         }

Doc Comments +4 added lines, -1 removed lines

@@ -62,6 +62,9 @@ 
      */
     private $aConfiguration;
 
+    /**
+     * @param string $sUserFunction
+     */
     public function __construct($sUserFunction)
     {
         $this->aConfiguration = [];
@@ -114,7 +117,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()
     {

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

Spacing +3 added lines, -3 removed lines

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

Braces +2 added lines, -4 removed lines

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

src/Utils/Template/Renderer.php

Spacing +1 added lines, -1 removed lines

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

src/Utils/Config/Config.php

Spacing +9 added lines, -10 removed lines

@@ -50,14 +50,14 @@ 
         $sPrefix = trim((string)$sPrefix);
         $nDepth = intval($nDepth);
         // Check the max depth
-        if($nDepth < 0 || $nDepth > 9)
+        if ($nDepth < 0 || $nDepth > 9)
         {
             throw new \Jaxon\Exception\Config\Data(jaxon_trans('config.errors.data.depth',
                 array('key' => $sPrefix, 'depth' => $nDepth)));
         }
-        foreach($aOptions as $sName => $xOption)
+        foreach ($aOptions as $sName => $xOption)
         {
-            if(is_int($sName))
+            if (is_int($sName))
             {
                 continue;
             }
@@ -67,7 +67,7 @@ 
             // Save the value of this option
             $this->aOptions[$sFullName] = $xOption;
             // Save the values of its sub-options
-            if(is_array($xOption))
+            if (is_array($xOption))
             {
                 // Recursively read the options in the array
                 $this->_setOptions($xOption, $sFullName, $nDepth + 1);
@@ -89,9 +89,9 @@ 
         $aKeys = explode('.', (string)$sKeys);
         foreach ($aKeys as $sKey)
         {
-            if(($sKey))
+            if (($sKey))
             {
-                if(!array_key_exists($sKey, $aOptions) || !is_array($aOptions[$sKey]))
+                if (!array_key_exists($sKey, $aOptions) || !is_array($aOptions[$sKey]))
                 {
                     return;
                 }
@@ -139,13 +139,12 @@ 
         $sPrefix = rtrim($sPrefix, '.') . '.';
         $sPrefixLen = strlen($sPrefix);
         $aOptions = [];
-        foreach($this->aOptions as $sName => $xValue)
+        foreach ($this->aOptions as $sName => $xValue)
         {
-            if(substr($sName, 0, $sPrefixLen) == $sPrefix)
+            if (substr($sName, 0, $sPrefixLen) == $sPrefix)
             {
                 $iNextDotPos = strpos($sName, '.', $sPrefixLen);
-                $sOptionName = $iNextDotPos === false ? substr($sName, $sPrefixLen) :
-                    substr($sName, $sPrefixLen, $iNextDotPos - $sPrefixLen);
+                $sOptionName = $iNextDotPos === false ? substr($sName, $sPrefixLen) : substr($sName, $sPrefixLen, $iNextDotPos - $sPrefixLen);
                 $aOptions[$sOptionName] = $sPrefix . $sOptionName;
             }
         }

src/Plugin/Manager.php

Braces +3 added lines, -6 removed lines

@@ -223,13 +223,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))));
         }
@@ -644,8 +642,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(

Spacing +39 added lines, -39 removed lines

@@ -219,32 +219,32 @@ 
     {
         $bIsAlert = ($xPlugin instanceof Dialogs\Interfaces\Alert);
         $bIsConfirm = ($xPlugin instanceof Dialogs\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);
         }
@@ -274,7 +274,7 @@ 
     private function generateHash()
     {
         $sHash = $this->getVersion();
-        foreach($this->aPlugins as $xPlugin)
+        foreach ($this->aPlugins as $xPlugin)
         {
             $sHash .= $xPlugin->generateHash();
         }
@@ -291,9 +291,9 @@ 
      */
     public function canProcessRequest()
     {
-        foreach($this->aRequestPlugins as $xPlugin)
+        foreach ($this->aRequestPlugins as $xPlugin)
         {
-            if($xPlugin->getName() != Jaxon::FILE_UPLOAD && $xPlugin->canProcessRequest())
+            if ($xPlugin->getName() != Jaxon::FILE_UPLOAD && $xPlugin->canProcessRequest())
             {
                 return true;
             }
@@ -312,12 +312,12 @@ 
     public function processRequest()
     {
         $xUploadPlugin = $this->getRequestPlugin(Jaxon::FILE_UPLOAD);
-        foreach($this->aRequestPlugins as $xPlugin)
+        foreach ($this->aRequestPlugins as $xPlugin)
         {
-            if($xPlugin->getName() != Jaxon::FILE_UPLOAD && $xPlugin->canProcessRequest())
+            if ($xPlugin->getName() != Jaxon::FILE_UPLOAD && $xPlugin->canProcessRequest())
             {
                 // Process uploaded files
-                if($xUploadPlugin != null)
+                if ($xUploadPlugin != null)
                 {
                     $xUploadPlugin->processRequest();
                 }
@@ -341,10 +341,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;
             }
@@ -359,7 +359,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/';
             return 'https://cdn.jsdelivr.net/gh/jaxon-php/jaxon-js@2.0/dist/';
@@ -382,7 +382,7 @@ 
         // The jsDelivr CDN only hosts minified files
         // if(($this->getOption('js.app.minify')) || substr($this->getJsLibUri(), 0, $nLen) == $jsDelivrUri)
         // Starting from version 2.0.0 of the js lib, the jsDelivr CDN also hosts non minified files.
-        if(($this->getOption('js.app.minify')))
+        if (($this->getOption('js.app.minify')))
         {
             return '.min.js';
         }
@@ -399,7 +399,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'))
         {
@@ -408,7 +408,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;
         }
@@ -422,7 +422,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'));
         }
@@ -444,7 +444,7 @@ 
 
         // 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;
@@ -460,17 +460,17 @@ 
             'sJsOptions' => $this->getOption('js.app.options'),
             'aUrls' => $aJsFiles,
         ));
-        foreach($this->aResponsePlugins as $xPlugin)
+        foreach ($this->aResponsePlugins as $xPlugin)
         {
-            if(($str = trim($xPlugin->getJs())))
+            if (($str = trim($xPlugin->getJs())))
             {
                 $sCode .= rtrim($str, " \n") . "\n";
             }
         }
-        foreach($this->aPackages as $sClass)
+        foreach ($this->aPackages as $sClass)
         {
             $xPackage = jaxon()->di()->get($sClass);
-            if(($str = trim($xPackage->js())))
+            if (($str = trim($xPackage->js())))
             {
                 $sCode .= rtrim($str, " \n") . "\n";
             }
@@ -489,17 +489,17 @@ 
         $this->setTemplateCacheDir();
 
         $sCode = '';
-        foreach($this->aResponsePlugins as $xPlugin)
+        foreach ($this->aResponsePlugins as $xPlugin)
         {
-            if(($str = trim($xPlugin->getCss())))
+            if (($str = trim($xPlugin->getCss())))
             {
                 $sCode .= rtrim($str, " \n") . "\n";
             }
         }
-        foreach($this->aPackages as $sClass)
+        foreach ($this->aPackages as $sClass)
         {
             $xPackage = jaxon()->di()->get($sClass);
-            if(($str = trim($xPackage->css())))
+            if (($str = trim($xPackage->css())))
             {
                 $sCode .= rtrim($str, " \n") . "\n";
             }
@@ -563,17 +563,17 @@ 
     private function getReadyScript()
     {
         $sPluginScript = '';
-        foreach($this->aResponsePlugins as $xPlugin)
+        foreach ($this->aResponsePlugins as $xPlugin)
         {
-            if(($str = trim($xPlugin->getScript())))
+            if (($str = trim($xPlugin->getScript())))
             {
                 $sPluginScript .= "\n" . trim($str, " \n");
             }
         }
-        foreach($this->aPackages as $sClass)
+        foreach ($this->aPackages as $sClass)
         {
             $xPackage = jaxon()->di()->get($sClass);
-            if(($str = trim($xPackage->ready())))
+            if (($str = trim($xPackage->ready())))
             {
                 $sPluginScript .= "\n" . trim($str, " \n");
             }
@@ -596,7 +596,7 @@ 
     {
         // 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");
         }
@@ -618,7 +618,7 @@ 
         // Set the template engine cache dir
         $this->setTemplateCacheDir();
 
-        if($this->canExportJavascript())
+        if ($this->canExportJavascript())
         {
             $sJsAppURI = rtrim($this->getOption('js.app.uri'), '/') . '/';
             $sJsAppDir = rtrim($this->getOption('js.app.dir'), '/') . '/';
@@ -627,13 +627,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, $this->getAllScripts());
             }
-            if(($this->getOption('js.app.minify')) && !is_file($sJsAppDir . $sMinFile))
+            if (($this->getOption('js.app.minify')) && !is_file($sJsAppDir . $sMinFile))
             {
-                if(($this->minify($sJsAppDir . $sOutFile, $sJsAppDir . $sMinFile)))
+                if (($this->minify($sJsAppDir . $sOutFile, $sJsAppDir . $sMinFile)))
                 {
                     $sOutFile = $sMinFile;
                 }
@@ -666,7 +666,7 @@ 
      */
     public function getResponsePlugin($sName)
     {
-        if(array_key_exists($sName, $this->aResponsePlugins))
+        if (array_key_exists($sName, $this->aResponsePlugins))
         {
             return $this->aResponsePlugins[$sName];
         }
@@ -682,7 +682,7 @@ 
      */
     public function getRequestPlugin($sName)
     {
-        if(array_key_exists($sName, $this->aRequestPlugins))
+        if (array_key_exists($sName, $this->aRequestPlugins))
         {
             return $this->aRequestPlugins[$sName];
         }

src/Plugin/Dialogs/Confirm.php

Spacing +1 added lines, -1 removed lines

@@ -22,7 +22,7 @@
      */
     public function confirm($question, $yesScript, $noScript)
     {
-        if(!$noScript)
+        if (!$noScript)
         {
             return 'if(confirm(' . $question . ')){' . $yesScript . ';}';
         }

Braces +1 added lines, -2 removed lines

@@ -25,8 +25,7 @@
         if(!$noScript)
         {
             return 'if(confirm(' . $question . ')){' . $yesScript . ';}';
-        }
-        else
+        } else
         {
             return 'if(confirm(' . $question . ')){' . $yesScript . ';}else{' . $noScript . ';}';
         }