jaxon-php / jaxon-core

src/Config/Php.php

Spacing +2 added lines, -2 removed lines

@@ -26,12 +26,12 @@
     public static function read($sConfigFile)
     {
         $sConfigFile = realpath($sConfigFile);
-        if(!is_readable($sConfigFile))
+        if (!is_readable($sConfigFile))
         {
             throw new \Jaxon\Config\Exception\File(jaxon_trans('config.errors.file.access', array('path' => $sConfigFile)));
         }
         $aConfigOptions = include($sConfigFile);
-        if(!is_array($aConfigOptions))
+        if (!is_array($aConfigOptions))
         {
             throw new \Jaxon\Config\Exception\File(jaxon_trans('config.errors.file.content', array('path' => $sConfigFile)));
         }

src/Config/Config.php

Spacing +9 added lines, -10 removed lines

@@ -45,14 +45,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\Config\Exception\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;
             }
@@ -62,7 +62,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);
@@ -84,9 +84,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;
                 }
@@ -134,13 +134,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/Config/Yaml.php

Spacing +3 added lines, -3 removed lines

@@ -26,16 +26,16 @@
     public static function read($sConfigFile)
     {
         $sConfigFile = realpath($sConfigFile);
-        if(!extension_loaded('yaml'))
+        if (!extension_loaded('yaml'))
         {
             throw new \Jaxon\Config\Exception\Yaml(jaxon_trans('config.errors.yaml.install'));
         }
-        if(!is_readable($sConfigFile))
+        if (!is_readable($sConfigFile))
         {
             throw new \Jaxon\Config\Exception\File(jaxon_trans('config.errors.file.access', array('path' => $sConfigFile)));
         }
         $aConfigOptions = yaml_parse_file($sConfigFile);
-        if(!is_array($aConfigOptions))
+        if (!is_array($aConfigOptions))
         {
             throw new \Jaxon\Config\Exception\File(jaxon_trans('config.errors.file.content', array('path' => $sConfigFile)));
         }

src/Config/Reader.php

Spacing +1 added lines, -1 removed lines

@@ -24,7 +24,7 @@
     public function read($sConfigFile)
     {
         $sExt = pathinfo($sConfigFile, PATHINFO_EXTENSION);
-        switch($sExt)
+        switch ($sExt)
         {
         case 'php':
             $aConfigOptions = Php::read($sConfigFile);

src/Config/Json.php

Spacing +2 added lines, -2 removed lines

@@ -26,13 +26,13 @@
     public static function read($sConfigFile)
     {
         $sConfigFile = realpath($sConfigFile);
-        if(!is_readable($sConfigFile))
+        if (!is_readable($sConfigFile))
         {
             throw new \Jaxon\Config\Exception\File(jaxon_trans('config.errors.file.access', array('path' => $sConfigFile)));
         }
         $sFileContent = file_get_contents($sConfigFile);
         $aConfigOptions = json_decode($sFileContent, true);
-        if(!is_array($aConfigOptions))
+        if (!is_array($aConfigOptions))
         {
             throw new \Jaxon\Config\Exception\File(jaxon_trans('config.errors.file.content', array('path' => $sConfigFile)));
         }

src/Code/Generator.php

Doc Comments +1 added lines, -1 removed lines

@@ -61,7 +61,7 @@
     /**
      * The constructor
      *
-     * @param   Jaxon\Plugin\Manager    $xPluginManager
+     * @param   Manager    $xPluginManager
      */
     public function __construct(Manager $xPluginManager)
     {

Spacing +23 added lines, -23 removed lines

@@ -75,7 +75,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/';
@@ -98,7 +98,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';
         }
@@ -115,7 +115,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'))
         {
@@ -124,7 +124,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;
         }
@@ -138,7 +138,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'));
         }
@@ -152,11 +152,11 @@ 
     private function generateHash()
     {
         $sHash = jaxon()->getVersion();
-        foreach($this->xPluginManager->getRequestPlugins() as $xPlugin)
+        foreach ($this->xPluginManager->getRequestPlugins() as $xPlugin)
         {
             $sHash .= $xPlugin->generateHash();
         }
-        foreach($this->xPluginManager->getResponsePlugins() as $xPlugin)
+        foreach ($this->xPluginManager->getResponsePlugins() as $xPlugin)
         {
             $sHash .= $xPlugin->generateHash();
         }
@@ -170,49 +170,49 @@ 
      */
     private function makePluginsCode()
     {
-        if($this->sCssCode === null || $this->sJsCode === null || $this->sJsReady === null)
+        if ($this->sCssCode === null || $this->sJsCode === null || $this->sJsReady === null)
         {
             $this->sCssCode = '';
             $this->sJsCode = '';
             $this->sJsReady = '';
-            foreach($this->xPluginManager->getResponsePlugins() as $xPlugin)
+            foreach ($this->xPluginManager->getResponsePlugins() as $xPlugin)
             {
-                if(($str = trim($xPlugin->getCss())))
+                if (($str = trim($xPlugin->getCss())))
                 {
                     $this->sCssCode .= rtrim($str, " \n") . "\n";
                 }
-                if(($str = trim($xPlugin->getJs())))
+                if (($str = trim($xPlugin->getJs())))
                 {
                     $this->sJsCode .= rtrim($str, " \n") . "\n";
                 }
-                if(($str = trim($xPlugin->getScript())))
+                if (($str = trim($xPlugin->getScript())))
                 {
                     $this->sJsReady .= "\n" . trim($str, " \n");
                 }
             }
 
             $this->sJsReady = $this->render('jaxon::plugins/ready.js', ['sPluginScript' => $this->sJsReady]);
-            foreach($this->xPluginManager->getRequestPlugins() as $xPlugin)
+            foreach ($this->xPluginManager->getRequestPlugins() as $xPlugin)
             {
-                if(($str = trim($xPlugin->getScript())))
+                if (($str = trim($xPlugin->getScript())))
                 {
                     $this->sJsReady .= "\n" . trim($str, " \n");
                 }
             }
 
-            foreach($this->xPluginManager->getPackages() as $sClass)
+            foreach ($this->xPluginManager->getPackages() as $sClass)
             {
                 $xPackage = jaxon()->di()->get($sClass);
-                if(($str = trim($xPackage->css())))
+                if (($str = trim($xPackage->css())))
                 {
                     $this->sCssCode .= rtrim($str, " \n") . "\n";
                 }
-                if(($str = trim($xPackage->js())))
+                if (($str = trim($xPackage->js())))
                 {
                     $this->sJsCode .= rtrim($str, " \n") . "\n";
                 }
                 $xPackage = jaxon()->di()->get($sClass);
-                if(($str = trim($xPackage->ready())))
+                if (($str = trim($xPackage->ready())))
                 {
                     $this->sJsReady .= "\n" . trim($str, " \n");
                 }
@@ -236,7 +236,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;
@@ -331,7 +331,7 @@ 
         $this->setTemplateCacheDir();
         $this->makePluginsCode();
 
-        if($this->canExportJavascript())
+        if ($this->canExportJavascript())
         {
             $sJsAppURI = rtrim($this->getOption('js.app.uri'), '/') . '/';
             $sJsAppDir = rtrim($this->getOption('js.app.dir'), '/') . '/';
@@ -340,13 +340,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->_getScript());
             }
-            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;
                 }

Braces +1 added lines, -2 removed lines

@@ -357,8 +357,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/DI/Container.php

Doc Comments +3 added lines, -3 removed lines

@@ -303,7 +303,7 @@ 
     /**
      * Create a new the config manager
      *
-     * @return Jaxon\Config\Config            The config manager
+     * @return Config            The config manager
      */
     public function newConfig()
     {
@@ -373,7 +373,7 @@ 
     /**
      * Set the pagination renderer
      *
-     * @param Jaxon\Utils\Pagination\Renderer  $xRenderer    The pagination renderer
+     * @param PaginationRenderer  $xRenderer    The pagination renderer
      *
      * @return void
      */
@@ -405,7 +405,7 @@ 
     /**
      * Create a new Jaxon response object
      *
-     * @return Jaxon\Response\Response
+     * @return Response
      */
     public function newResponse()
     {

Unused Use Statements -1 removed lines

@@ -16,7 +16,6 @@
 
 use Lemon\Event\EventDispatcher;
 use Jaxon\Sentry\View\Renderer;
-
 use Jaxon\Jaxon;
 use Jaxon\Response\Response;
 use Jaxon\Config\Config;

Spacing +25 added lines, -25 removed lines

@@ -49,7 +49,7 @@ 
 
     public static function getInstance()
     {
-        if(!self::$xInstance)
+        if (!self::$xInstance)
         {
             self::$xInstance = new Container();
         }
@@ -109,15 +109,15 @@ 
          * Core library objects
          */
         // Jaxon Core
-        $this->coreContainer[Jaxon::class] = function ($c) {
+        $this->coreContainer[Jaxon::class] = function($c) {
             return new Jaxon();
         };
         // Global Response
-        $this->coreContainer[Response::class] = function ($c) {
+        $this->coreContainer[Response::class] = function($c) {
             return new Response();
         };
         // Dialog
-        $this->coreContainer[Dialog::class] = function ($c) {
+        $this->coreContainer[Dialog::class] = function($c) {
             return new Dialog();
         };
 
@@ -125,41 +125,41 @@ 
          * Managers
          */
         // Callable objects repository
-        $this->coreContainer[CallableRepository::class] = function ($c) {
+        $this->coreContainer[CallableRepository::class] = function($c) {
             return new CallableRepository();
         };
         // Plugin Manager
-        $this->coreContainer[PluginManager::class] = function ($c) {
+        $this->coreContainer[PluginManager::class] = function($c) {
             return new PluginManager();
         };
         // Request Manager
-        $this->coreContainer[RequestHandler::class] = function ($c) {
+        $this->coreContainer[RequestHandler::class] = function($c) {
             return new RequestHandler($c[PluginManager::class]);
         };
         // Request Factory
-        $this->coreContainer[RequestFactory::class] = function ($c) {
+        $this->coreContainer[RequestFactory::class] = function($c) {
             return new RequestFactory($c[CallableRepository::class]);
         };
         // Parameter Factory
-        $this->coreContainer[ParameterFactory::class] = function ($c) {
+        $this->coreContainer[ParameterFactory::class] = function($c) {
             return new ParameterFactory();
         };
         // Response Manager
-        $this->coreContainer[ResponseManager::class] = function ($c) {
+        $this->coreContainer[ResponseManager::class] = function($c) {
             return new ResponseManager();
         };
         // Code Generator
-        $this->coreContainer[CodeGenerator::class] = function ($c) {
+        $this->coreContainer[CodeGenerator::class] = function($c) {
             return new CodeGenerator($c[PluginManager::class]);
         };
 
         /*
          * Config
          */
-        $this->coreContainer[Config::class] = function ($c) {
+        $this->coreContainer[Config::class] = function($c) {
             return new Config();
         };
-        $this->coreContainer[ConfigReader::class] = function ($c) {
+        $this->coreContainer[ConfigReader::class] = function($c) {
             return new ConfigReader();
         };
 
@@ -167,31 +167,31 @@ 
          * Services
          */
         // Minifier
-        $this->coreContainer[Minifier::class] = function ($c) {
+        $this->coreContainer[Minifier::class] = function($c) {
             return new Minifier();
         };
         // Translator
-        $this->coreContainer[Translator::class] = function ($c) {
+        $this->coreContainer[Translator::class] = function($c) {
             return new Translator($c['jaxon.core.translation_dir'], $c[Config::class]);
         };
         // Template engine
-        $this->coreContainer[Template::class] = function ($c) {
+        $this->coreContainer[Template::class] = function($c) {
             return new Template($c['jaxon.core.template_dir']);
         };
         // Validator
-        $this->coreContainer[Validator::class] = function ($c) {
+        $this->coreContainer[Validator::class] = function($c) {
             return new Validator($c[Translator::class], $c[Config::class]);
         };
         // Pagination Renderer
-        $this->coreContainer[PaginationRenderer::class] = function ($c) {
+        $this->coreContainer[PaginationRenderer::class] = function($c) {
             return new PaginationRenderer($c[Template::class]);
         };
         // Pagination Paginator
-        $this->coreContainer[Paginator::class] = function ($c) {
+        $this->coreContainer[Paginator::class] = function($c) {
             return new Paginator($c[PaginationRenderer::class]);
         };
         // Event Dispatcher
-        $this->coreContainer[EventDispatcher::class] = function ($c) {
+        $this->coreContainer[EventDispatcher::class] = function($c) {
             return new EventDispatcher();
         };
 
@@ -210,7 +210,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);
         }
@@ -515,14 +515,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']);
                 }
@@ -540,7 +540,7 @@ 
      */
     public function getViewRenderer($sId = '')
     {
-        if(!$sId)
+        if (!$sId)
         {
             // Return the view renderer facade
             return $this->coreContainer[\Jaxon\Sentry\View\Facade::class];

src/Dialog/Dialog.php

Doc Comments +2 added lines, -2 removed lines

@@ -62,7 +62,7 @@ 
     /**
      * Set the javascript confirm function
      *
-     * @param Jaxon\Dialog\Interfaces\Confirm         $xConfirm     The javascript confirm function
+     * @param Interfaces\Confirm         $xConfirm     The javascript confirm function
      *
      * @return void
      */
@@ -104,7 +104,7 @@ 
     /**
      * Set the javascript alert function
      *
-     * @param Jaxon\Dialog\Interfaces\Alert           $xAlert       The javascript alert function
+     * @param Interfaces\Alert           $xAlert       The javascript alert function
      *
      * @return void
      */

Unused Use Statements -2 removed lines

@@ -12,8 +12,6 @@
 namespace Jaxon\Dialog;
 
 use Jaxon\Jaxon;
-use Jaxon\Plugin\Package;
-use Jaxon\Config\Config;
 
 class Dialog
 {

src/Plugin/Manager.php

Unused Use Statements -2 removed lines

@@ -22,9 +22,7 @@
 namespace Jaxon\Plugin;
 
 use Jaxon\Jaxon;
-use Jaxon\Plugin\Package;
 use Jaxon\Config\Config;
-
 use Closure;
 
 class Manager

Spacing +20 added lines, -20 removed lines

@@ -132,32 +132,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);
         }
@@ -192,7 +192,7 @@ 
      */
     public function register($sType, $sCallable, $aOptions = [])
     {
-        if(!key_exists($sType, $this->aRequestPlugins))
+        if (!key_exists($sType, $this->aRequestPlugins))
         {
             throw new \Jaxon\Exception\Error($this->trans('errors.register.plugin', ['name' => $sType]));
         }
@@ -220,15 +220,15 @@ 
     {
         // Register user functions
         $aFunctionsConfig = $xAppConfig->getOption('functions', []);
-        foreach($aFunctionsConfig as $xKey => $xValue)
+        foreach ($aFunctionsConfig as $xKey => $xValue)
         {
-            if(is_integer($xKey) && is_string($xValue))
+            if (is_integer($xKey) && is_string($xValue))
             {
                 $sFunction = $xValue;
                 // Register a function without options
                 $this->register(Jaxon::USER_FUNCTION, $sFunction);
             }
-            elseif(is_string($xKey) && is_array($xValue))
+            elseif (is_string($xKey) && is_array($xValue))
             {
                 $sFunction = $xKey;
                 $aOptions = $xValue;
@@ -244,25 +244,25 @@ 
 
         // Register classes and directories
         $aClassesConfig = $xAppConfig->getOption('classes', []);
-        foreach($aClassesConfig as $xKey => $xValue)
+        foreach ($aClassesConfig as $xKey => $xValue)
         {
-            if(is_integer($xKey) && is_string($xValue))
+            if (is_integer($xKey) && is_string($xValue))
             {
                 $sClass = $xValue;
                 // Register a class without options
                 $this->register(Jaxon::CALLABLE_CLASS, $sClass);
             }
-            elseif(is_string($xKey) && is_array($xValue))
+            elseif (is_string($xKey) && is_array($xValue))
             {
                 $sClass = $xKey;
                 $aOptions = $xValue;
                 // Register a class with options
                 $this->register(Jaxon::CALLABLE_CLASS, $sClass, $aOptions);
             }
-            elseif(is_integer($xKey) && is_array($xValue))
+            elseif (is_integer($xKey) && is_array($xValue))
             {
                 // The directory path is required
-                if(!key_exists('directory', $xValue))
+                if (!key_exists('directory', $xValue))
                 {
                     continue;
                     // Todo: throw an exception
@@ -270,17 +270,17 @@ 
                 // Registering a directory
                 $sDirectory = $xValue['directory'];
                 $aOptions = [];
-                if(key_exists('options', $xValue) &&
+                if (key_exists('options', $xValue) &&
                     is_array($xValue['options']) || is_string($xValue['options']))
                 {
                     $aOptions = $xValue['options'];
                 }
                 // Setup directory options
-                if(key_exists('namespace', $xValue))
+                if (key_exists('namespace', $xValue))
                 {
                     $aOptions['namespace'] = $xValue['namespace'];
                 }
-                if(key_exists('separator', $xValue))
+                if (key_exists('separator', $xValue))
                 {
                     $aOptions['separator'] = $xValue['separator'];
                 }
@@ -305,7 +305,7 @@ 
      */
     public function getResponsePlugin($sName)
     {
-        if(array_key_exists($sName, $this->aResponsePlugins))
+        if (array_key_exists($sName, $this->aResponsePlugins))
         {
             return $this->aResponsePlugins[$sName];
         }
@@ -321,7 +321,7 @@ 
      */
     public function getRequestPlugin($sName)
     {
-        if(array_key_exists($sName, $this->aRequestPlugins))
+        if (array_key_exists($sName, $this->aRequestPlugins))
         {
             return $this->aRequestPlugins[$sName];
         }

Braces +7 added lines, -14 removed lines

@@ -136,13 +136,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))));
         }
@@ -227,15 +225,13 @@ 
                 $sFunction = $xValue;
                 // Register a function without options
                 $this->register(Jaxon::USER_FUNCTION, $sFunction);
-            }
-            elseif(is_string($xKey) && is_array($xValue))
+            } elseif(is_string($xKey) && is_array($xValue))
             {
                 $sFunction = $xKey;
                 $aOptions = $xValue;
                 // Register a function with options
                 $this->register(Jaxon::USER_FUNCTION, $sFunction, $aOptions);
-            }
-            else
+            } else
             {
                 continue;
                 // Todo: throw an exception
@@ -251,15 +247,13 @@ 
                 $sClass = $xValue;
                 // Register a class without options
                 $this->register(Jaxon::CALLABLE_CLASS, $sClass);
-            }
-            elseif(is_string($xKey) && is_array($xValue))
+            } elseif(is_string($xKey) && is_array($xValue))
             {
                 $sClass = $xKey;
                 $aOptions = $xValue;
                 // Register a class with options
                 $this->register(Jaxon::CALLABLE_CLASS, $sClass, $aOptions);
-            }
-            elseif(is_integer($xKey) && is_array($xValue))
+            } elseif(is_integer($xKey) && is_array($xValue))
             {
                 // The directory path is required
                 if(!key_exists('directory', $xValue))
@@ -286,8 +280,7 @@ 
                 }
                 // Register a class without options
                 $this->register(Jaxon::CALLABLE_DIR, $sDirectory, $aOptions);
-            }
-            else
+            } else
             {
                 continue;
                 // Todo: throw an exception