jaxon-php / jaxon-core

src/Request/Plugin/CallableObject.php

Spacing +53 added lines, -53 removed lines

@@ -91,19 +91,19 @@ 
         $this->sRequestedClass = null;
         $this->sRequestedMethod = null;
 
-        if(!empty($_GET['jxncls']))
+        if (!empty($_GET['jxncls']))
         {
             $this->sRequestedClass = $_GET['jxncls'];
         }
-        if(!empty($_GET['jxnmthd']))
+        if (!empty($_GET['jxnmthd']))
         {
             $this->sRequestedMethod = $_GET['jxnmthd'];
         }
-        if(!empty($_POST['jxncls']))
+        if (!empty($_POST['jxncls']))
         {
             $this->sRequestedClass = $_POST['jxncls'];
         }
-        if(!empty($_POST['jxnmthd']))
+        if (!empty($_POST['jxnmthd']))
         {
             $this->sRequestedMethod = $_POST['jxnmthd'];
         }
@@ -152,19 +152,19 @@ 
      */
     public function register($aArgs)
     {
-        if(count($aArgs) < 2)
+        if (count($aArgs) < 2)
         {
             return false;
         }
 
         $sType = $aArgs[0];
-        if($sType != Jaxon::CALLABLE_OBJECT)
+        if ($sType != Jaxon::CALLABLE_OBJECT)
         {
             return false;
         }
 
         $sCallableObject = $aArgs[1];
-        if(!is_string($sCallableObject) || !class_exists($sCallableObject))
+        if (!is_string($sCallableObject) || !class_exists($sCallableObject))
         {
             throw new \Jaxon\Exception\Error($this->trans('errors.objects.invalid-declaration'));
         }
@@ -172,31 +172,31 @@ 
         $this->aCallableObjects[] = $sCallableObject;
 
         $aOptions = count($aArgs) > 2 ? $aArgs[2] : [];
-        if(is_string($aOptions))
+        if (is_string($aOptions))
         {
             $aOptions = ['namespace' => $aOptions];
         }
-        if(!is_array($aOptions))
+        if (!is_array($aOptions))
         {
             throw new \Jaxon\Exception\Error($this->trans('errors.objects.invalid-declaration'));
         }
 
         // Save the classpath and the separator in this class
-        if(key_exists('*', $aOptions) && is_array($aOptions['*']))
+        if (key_exists('*', $aOptions) && is_array($aOptions['*']))
         {
             $_aOptions = $aOptions['*'];
             $sSeparator = '.';
-            if(key_exists('separator', $_aOptions))
+            if (key_exists('separator', $_aOptions))
             {
                 $sSeparator = trim($_aOptions['separator']);
             }
-            if(!in_array($sSeparator, ['.', '_']))
+            if (!in_array($sSeparator, ['.', '_']))
             {
                 $sSeparator = '.';
             }
             $_aOptions['separator'] = $sSeparator;
 
-            if(array_key_exists('classpath', $_aOptions))
+            if (array_key_exists('classpath', $_aOptions))
             {
                 $_aOptions['classpath'] = trim($_aOptions['classpath'], ' \\._');
                 // Save classpath with "\" in the parameters
@@ -209,9 +209,9 @@ 
         jaxon()->di()->set($sUserFunction, function() use($sCallableObject, $aOptions) {
             $xCallableObject = new \Jaxon\Request\Support\CallableObject($sCallableObject);
 
-            foreach($aOptions as $sMethod => $aValue)
+            foreach ($aOptions as $sMethod => $aValue)
             {
-                foreach($aValue as $sName => $sValue)
+                foreach ($aValue as $sName => $sValue)
                 {
                     $xCallableObject->configure($sMethod, $sName, $sValue);
                 }
@@ -235,37 +235,37 @@ 
      */
     public function addClassDir($sDirectory, $sNamespace = '', $sSeparator = '.', array $aProtected = [])
     {
-        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 = '';
         }
-        if(($sNamespace))
+        if (($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;
                 }
@@ -301,33 +301,33 @@ 
         $sClassPath = substr($xFile->getPath(), strlen($sDirectory));
         $sClassPath = str_replace($sDS, '\\', trim($sClassPath, $sDS));
         $sClassName = $xFile->getBasename('.php');
-        if(($sNamespace))
+        if (($sNamespace))
         {
             $sClassPath = ($sClassPath) ? $sNamespace . '\\' . $sClassPath : $sNamespace;
             $sClassName = '\\' . $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['*'] = [];
         }
         $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;
         }
@@ -346,13 +346,13 @@ 
         $sDS = DIRECTORY_SEPARATOR;
         // Change the keys in $aOptions to have "\" as separator
         $aNewOptions = [];
-        foreach($aOptions as $key => $aOption)
+        foreach ($aOptions as $key => $aOption)
         {
             $key = trim(str_replace(['.', '_'], ['\\', '\\'], $key), ' \\');
             $aNewOptions[$key] = $aOption;
         }
 
-        foreach($this->aClassDirs as $aClassDir)
+        foreach ($this->aClassDirs as $aClassDir)
         {
             // Get the directory
             $sDirectory = $aClassDir['directory'];
@@ -362,10 +362,10 @@ 
             $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;
                 }
@@ -374,17 +374,17 @@ 
                 $sClassPath = substr($xFile->getPath(), strlen($sDirectory));
                 $sClassPath = trim(str_replace($sDS, '\\', $sClassPath), '\\');
                 $sClassName = $xFile->getBasename('.php');
-                if(($sClassPath))
+                if (($sClassPath))
                 {
                     $sClassName = $sClassPath . '\\' . $sClassName;
                 }
-                if(($sNamespace))
+                if (($sNamespace))
                 {
                     $sClassName = $sNamespace . '\\' . $sClassName;
                 }
                 // Get the class options
                 $aClassOptions = [];
-                if(array_key_exists($sClassName, $aNewOptions))
+                if (array_key_exists($sClassName, $aNewOptions))
                 {
                     $aClassOptions = $aNewOptions[$sClassName];
                 }
@@ -405,7 +405,7 @@ 
      */
     public function registerClass($sClassName, array $aOptions = [])
     {
-        if(!($sClassName = trim($sClassName, ' \\._')))
+        if (!($sClassName = trim($sClassName, ' \\._')))
         {
             return false;
         }
@@ -414,7 +414,7 @@ 
         // Replace "." and "_" with antislashes, and set the class path.
         $sClassName = str_replace(['.', '_'], ['\\', '\\'], $sClassName);
         $sClassPath = '';
-        if(($nLastSlashPosition = strrpos($sClassName, '\\')) !== false)
+        if (($nLastSlashPosition = strrpos($sClassName, '\\')) !== false)
         {
             $sClassPath = substr($sClassName, 0, $nLastSlashPosition);
             $sClassName = substr($sClassName, $nLastSlashPosition + 1);
@@ -423,7 +423,7 @@ 
         $sPartPath = str_replace('\\', $sDS, $sClassPath) . $sDS . $sClassName . '.php';
 
         // Search for the class file in all directories.
-        foreach($this->aClassDirs as $aClassDir)
+        foreach ($this->aClassDirs as $aClassDir)
         {
             // Get the separator
             $sSeparator = $aClassDir['separator'];
@@ -432,15 +432,15 @@ 
             $nLen = strlen($sNamespace);
             $sFullPath = '';
             // Check if the class belongs to the namespace
-            if(($sNamespace) && substr($sClassPath, 0, $nLen) == $sNamespace)
+            if (($sNamespace) && substr($sClassPath, 0, $nLen) == $sNamespace)
             {
                 $sFullPath = $aClassDir['directory'] . $sDS . substr($sPartPath, $nLen + 1);
             }
-            elseif(!($sNamespace))
+            elseif (!($sNamespace))
             {
                 $sFullPath = $aClassDir['directory'] . $sDS . $sPartPath;
             }
-            if(($sFullPath) && is_file($sFullPath))
+            if (($sFullPath) && is_file($sFullPath))
             {
                 // Found the file in this directory
                 $xFileInfo = new \SplFileInfo($sFullPath);
@@ -462,7 +462,7 @@ 
     {
         $di = jaxon()->di();
         $sHash = '';
-        foreach($this->aCallableObjects as $sName)
+        foreach ($this->aCallableObjects as $sName)
         {
             $xCallableObject = $di->get($sName);
             $sHash .= $sName . implode('|', $xCallableObject->getMethods());
@@ -481,15 +481,15 @@ 
         // Generate code for javascript objects declaration
         $code = '';
         $classes = [];
-        foreach($this->aClassPaths as $sClassPath)
+        foreach ($this->aClassPaths as $sClassPath)
         {
             $offset = 0;
             $sClassPath .= '.Null'; // This is a sentinel. The last token is not processed in the while loop.
-            while(($dotPosition = strpos($sClassPath, '.', $offset)) !== false)
+            while (($dotPosition = strpos($sClassPath, '.', $offset)) !== false)
             {
                 $class = substr($sClassPath, 0, $dotPosition);
                 // Generate code for this object
-                if(!array_key_exists($class, $classes))
+                if (!array_key_exists($class, $classes))
                 {
                     $code .= "$sJaxonPrefix$class = {};\n";
                     $classes[$class] = $class;
@@ -499,7 +499,7 @@ 
         }
         // Generate code for javascript methods
         $di = jaxon()->di();
-        foreach($this->aCallableObjects as $sName)
+        foreach ($this->aCallableObjects as $sName)
         {
             $xCallableObject = $di->get($sName);
             $code .= $xCallableObject->getScript();
@@ -515,13 +515,13 @@ 
     public function canProcessRequest()
     {
         // Check the validity of the class name
-        if(($this->sRequestedClass) && !$this->validateClass($this->sRequestedClass))
+        if (($this->sRequestedClass) && !$this->validateClass($this->sRequestedClass))
         {
             $this->sRequestedClass = null;
             $this->sRequestedMethod = null;
         }
         // Check the validity of the method name
-        if(($this->sRequestedMethod) && !$this->validateMethod($this->sRequestedMethod))
+        if (($this->sRequestedMethod) && !$this->validateMethod($this->sRequestedMethod))
         {
             $this->sRequestedClass = null;
             $this->sRequestedMethod = null;
@@ -536,7 +536,7 @@ 
      */
     public function processRequest()
     {
-        if(!$this->canProcessRequest())
+        if (!$this->canProcessRequest())
         {
             return false;
         }
@@ -545,7 +545,7 @@ 
 
         // Find the requested method
         $xCallableObject = $this->getCallableObject($this->sRequestedClass);
-        if(!$xCallableObject || !$xCallableObject->hasMethod($this->sRequestedMethod))
+        if (!$xCallableObject || !$xCallableObject->hasMethod($this->sRequestedMethod))
         {
             // Unable to find the requested object or method
             throw new \Jaxon\Exception\Error($this->trans('errors.objects.invalid',
@@ -570,7 +570,7 @@ 
         // at the beginning and the end of the class name.
         $sClassName = trim(str_replace(['.', '_'], ['\\', '\\'], (string)$sClassName), '\\');
         // Register an instance of the requested class, if it isn't yet
-        if(!key_exists($sClassName, $this->aCallableObjects))
+        if (!key_exists($sClassName, $this->aCallableObjects))
         {
             $this->getPluginManager()->registerClass($sClassName);
         }

Braces +2 added lines, -4 removed lines

@@ -255,8 +255,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);
@@ -435,8 +434,7 @@ 
             if(($sNamespace) && substr($sClassPath, 0, $nLen) == $sNamespace)
             {
                 $sFullPath = $aClassDir['directory'] . $sDS . substr($sPartPath, $nLen + 1);
-            }
-            elseif(!($sNamespace))
+            } elseif(!($sNamespace))
             {
                 $sFullPath = $aClassDir['directory'] . $sDS . $sPartPath;
             }

src/Request/Plugin/UserFunction.php

Spacing +14 added lines, -14 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,39 +80,39 @@ 
      */
     public function register($aArgs)
     {
-        if(count($aArgs) < 2)
+        if (count($aArgs) < 2)
         {
             return false;
         }
 
         $sType = $aArgs[0];
-        if($sType != Jaxon::USER_FUNCTION)
+        if ($sType != Jaxon::USER_FUNCTION)
         {
             return false;
         }
 
         $sUserFunction = $aArgs[1];
-        if(!is_string($sUserFunction))
+        if (!is_string($sUserFunction))
         {
             throw new \Jaxon\Exception\Error($this->trans('errors.functions.invalid-declaration'));
         }
         $this->aFunctions[] = $sUserFunction;
 
         $aOptions = count($aArgs) > 2 ? $aArgs[2] : [];
-        if(is_string($aOptions))
+        if (is_string($aOptions))
         {
             $aOptions = ['include' => $aOptions];
         }
-        if(!is_array($aOptions))
+        if (!is_array($aOptions))
         {
             throw new \Jaxon\Exception\Error($this->trans('errors.functions.invalid-declaration'));
         }
 
         // Check if an alias is defined
         $sFunctionName = $sUserFunction;
-        foreach($aOptions as $sName => $sValue)
+        foreach ($aOptions as $sName => $sValue)
         {
-            if($sName == 'alias')
+            if ($sName == 'alias')
             {
                 $sFunctionName = $sValue;
                 break;
@@ -122,7 +122,7 @@ 
         jaxon()->di()->set($sFunctionName, function() use($sUserFunction, $aOptions) {
             $xUserFunction = new \Jaxon\Request\Support\UserFunction($sUserFunction);
 
-            foreach($aOptions as $sName => $sValue)
+            foreach ($aOptions as $sName => $sValue)
             {
                 $xUserFunction->configure($sName, $sValue);
             }
@@ -152,7 +152,7 @@ 
     {
         $di = jaxon()->di();
         $code = '';
-        foreach($this->aFunctions as $sName)
+        foreach ($this->aFunctions as $sName)
         {
             $xFunction = $di->get($sName);
             $code .= $xFunction->getScript();
@@ -168,7 +168,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;
         }
@@ -182,12 +182,12 @@ 
      */
     public function processRequest()
     {
-        if(!$this->canProcessRequest())
+        if (!$this->canProcessRequest())
         {
             return false;
         }
 
-        if(!key_exists($this->sRequestedFunction, $this->aFunctions))
+        if (!key_exists($this->sRequestedFunction, $this->aFunctions))
         {
             // Unable to find the requested function
             throw new \Jaxon\Exception\Error($this->trans('errors.functions.invalid',

src/Plugin/Manager.php

Spacing +39 added lines, -39 removed lines

@@ -219,32 +219,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);
         }
@@ -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];
         }

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(