jaxon-php / jaxon-core

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 +38 added lines, -38 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();
                 }
@@ -342,7 +342,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]));
         }
@@ -366,7 +366,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/';
@@ -389,7 +389,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';
         }
@@ -406,7 +406,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'))
         {
@@ -415,7 +415,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;
         }
@@ -429,7 +429,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'));
         }
@@ -451,7 +451,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;
@@ -467,17 +467,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";
             }
@@ -496,17 +496,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";
             }
@@ -570,17 +570,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");
             }
@@ -603,7 +603,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");
         }
@@ -625,7 +625,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'), '/') . '/';
@@ -634,13 +634,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;
                 }
@@ -673,7 +673,7 @@ 
      */
     public function getResponsePlugin($sName)
     {
-        if(array_key_exists($sName, $this->aResponsePlugins))
+        if (array_key_exists($sName, $this->aResponsePlugins))
         {
             return $this->aResponsePlugins[$sName];
         }
@@ -689,7 +689,7 @@ 
      */
     public function getRequestPlugin($sName)
     {
-        if(array_key_exists($sName, $this->aRequestPlugins))
+        if (array_key_exists($sName, $this->aRequestPlugins))
         {
             return $this->aRequestPlugins[$sName];
         }

src/Request/Support/UserFunction.php

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()
     {

Spacing +3 added lines, -3 removed lines

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

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 . ';}';
         }

src/Plugin/Dialogs/Alert.php

Spacing +1 added lines, -1 removed lines

@@ -26,7 +26,7 @@
      */
     protected function alert($message, $title)
     {
-        if($this->getReturn())
+        if ($this->getReturn())
         {
             return 'alert(' . $message . ')';
         }

src/Traits/Config.php

Spacing +2 added lines, -2 removed lines

@@ -42,7 +42,7 @@ 
             'core.prefix.class'                 => 'Jaxon',
             // '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.response.merge.ap'            => true,
             'core.response.merge.js'            => true,
             'core.debug.on'                     => false,
@@ -118,7 +118,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/DI/Container.php

Doc Comments +2 added lines, -2 removed lines

@@ -255,7 +255,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()
     {
@@ -347,7 +347,7 @@ 
     /**
      * Create a new Jaxon response object
      *
-     * @return Jaxon\Response\Response
+     * @return \Jaxon\Response\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\Request\Support\CallableRepository;
 
 class Container

Spacing +23 added lines, -23 removed lines

@@ -32,7 +32,7 @@ 
 
     public static function getInstance()
     {
-        if(!self::$xInstance)
+        if (!self::$xInstance)
         {
             self::$xInstance = new Container();
         }
@@ -92,27 +92,27 @@ 
          * Managers
          */
         // Callable objects repository
-        $this->coreContainer[CallableRepository::class] = function ($c) {
+        $this->coreContainer[CallableRepository::class] = function($c) {
             return new CallableRepository();
         };
         // 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($c[CallableRepository::class]);
         };
         // Parameter Factory
-        $this->coreContainer['jaxon.core.parameter_factory'] = function ($c) {
+        $this->coreContainer['jaxon.core.parameter_factory'] = function($c) {
             return new \Jaxon\Factory\Parameter();
         };
         // Response Manager
-        $this->coreContainer['jaxon.core.response_manager'] = function ($c) {
+        $this->coreContainer['jaxon.core.response_manager'] = function($c) {
             return new \Jaxon\Response\Manager();
         };
 
@@ -120,35 +120,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($c['jaxon.core.template']);
         };
         // 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();
         };
 
@@ -156,15 +156,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);
@@ -178,7 +178,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);
         }
@@ -463,14 +463,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']);
                 }
@@ -488,7 +488,7 @@ 
      */
     public function getViewRenderer($sId = '')
     {
-        if(!$sId)
+        if (!$sId)
         {
             // Return the view renderer facade
             return $this->coreContainer['jaxon.sentry.view.renderer'];

src/Request/Support/CallableObject.php

Braces +2 added lines, -4 removed lines

@@ -134,8 +134,7 @@ 
             if(is_array($sValue))
             {
                 $this->aProtectedMethods = array_merge($this->aProtectedMethods, $sValue);
-            }
-            elseif(is_string($sValue))
+            } elseif(is_string($sValue))
             {
                 $this->aProtectedMethods[] = $sValue;
             }
@@ -192,8 +191,7 @@ 
                     $parameterInstances[] = $di->get($parameter->getClass()->getName());
                 }
                 $this->registeredObject = $this->reflectionClass->newInstanceArgs($parameterInstances);
-            }
-            else
+            } else
             {
                 $this->registeredObject = $this->reflectionClass->newInstance();
             }

Spacing +11 added lines, -11 removed lines

@@ -120,22 +120,22 @@ 
      */
     public function configure($sName, $sValue)
     {
-        switch($sName)
+        switch ($sName)
         {
         // Set the separator
         case 'separator':
-            if($sValue == '_' || $sValue == '.')
+            if ($sValue == '_' || $sValue == '.')
             {
                 $this->separator = $sValue;
             }
             break;
         // Set the protected methods
         case 'protected':
-            if(is_array($sValue))
+            if (is_array($sValue))
             {
                 $this->aProtectedMethods = array_merge($this->aProtectedMethods, $sValue);
             }
-            elseif(is_string($sValue))
+            elseif (is_string($sValue))
             {
                 $this->aProtectedMethods[] = $sValue;
             }
@@ -153,16 +153,16 @@ 
     public function getMethods()
     {
         $aMethods = [];
-        foreach($this->reflectionClass->getMethods(\ReflectionMethod::IS_PUBLIC) as $xMethod)
+        foreach ($this->reflectionClass->getMethods(\ReflectionMethod::IS_PUBLIC) as $xMethod)
         {
             $sMethodName = $xMethod->getShortName();
             // Don't take magic __call, __construct, __destruct methods
-            if(strlen($sMethodName) > 2 && substr($sMethodName, 0, 2) == '__')
+            if (strlen($sMethodName) > 2 && substr($sMethodName, 0, 2) == '__')
             {
                 continue;
             }
             // Don't take excluded methods
-            if(in_array($sMethodName, $this->aProtectedMethods))
+            if (in_array($sMethodName, $this->aProtectedMethods))
             {
                 continue;
             }
@@ -178,15 +178,15 @@ 
      */
     public function getRegisteredObject()
     {
-        if($this->registeredObject == null)
+        if ($this->registeredObject == null)
         {
             $di = jaxon()->di();
             // Use the Reflection class to get the parameters of the constructor
-            if(($constructor = $this->reflectionClass->getConstructor()) != null)
+            if (($constructor = $this->reflectionClass->getConstructor()) != null)
             {
                 $parameters = $constructor->getParameters();
                 $parameterInstances = [];
-                foreach($parameters as $parameter)
+                foreach ($parameters as $parameter)
                 {
                     // Get the parameter instance from the DI
                     $parameterInstances[] = $di->get($parameter->getClass()->getName());
@@ -223,7 +223,7 @@ 
      */
     public function call($sMethod, $aArgs)
     {
-        if(!$this->hasMethod($sMethod))
+        if (!$this->hasMethod($sMethod))
         {
             return;
         }

src/Request/Support/CallableRepository.php

Braces +1 added lines, -2 removed lines

@@ -243,8 +243,7 @@
             if($sName == 'separator' || $sName == 'protected')
             {
                 $xCallableObject->configure($sName, $xValue);
-            }
-            elseif(is_array($xValue) && $sName != 'include')
+            } elseif(is_array($xValue) && $sName != 'include')
             {
                 // These options are to be included in javascript code.
                 $this->aCallableOptions[$sClassName][$sName] = $xValue;

Spacing +34 added lines, -34 removed lines

@@ -88,19 +88,19 @@ 
     private function getClassOptions($sClassName, array $aDirectoryOptions, array $aDefaultOptions = [])
     {
         $aOptions = $aDefaultOptions;
-        if(key_exists('separator', $aDirectoryOptions))
+        if (key_exists('separator', $aDirectoryOptions))
         {
             $aOptions['separator'] = $aDirectoryOptions['separator'];
         }
-        if(key_exists('protected', $aDirectoryOptions))
+        if (key_exists('protected', $aDirectoryOptions))
         {
             $aOptions['protected'] = $aDirectoryOptions['protected'];
         }
-        if(key_exists('*', $aDirectoryOptions))
+        if (key_exists('*', $aDirectoryOptions))
         {
             $aOptions = array_merge($aOptions, $aDirectoryOptions['*']);
         }
-        if(key_exists($sClassName, $aDirectoryOptions))
+        if (key_exists($sClassName, $aDirectoryOptions))
         {
             $aOptions = array_merge($aOptions, $aDirectoryOptions[$sClassName]);
         }
@@ -120,17 +120,17 @@ 
         $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;
             }
 
             $aClassOptions = [];
             // No more classmap autoloading. The file will be included when needed.
-            if(($aOptions['autoload']))
+            if (($aOptions['autoload']))
             {
                 $aClassOptions['include'] = $xFile->getPathname();
             }
@@ -162,7 +162,7 @@ 
      */
     private function getOptionsFromClass($sClassName)
     {
-        if(!key_exists($sClassName, $this->aClassOptions))
+        if (!key_exists($sClassName, $this->aClassOptions))
         {
             return null; // Class not registered
         }
@@ -180,15 +180,15 @@ 
     {
         // Find the corresponding namespace
         $sNamespace = null;
-        foreach(array_keys($this->aNamespaceOptions) as $_sNamespace)
+        foreach (array_keys($this->aNamespaceOptions) as $_sNamespace)
         {
-            if(substr($sClassName, 0, strlen($_sNamespace) + 1) == $_sNamespace . '\\')
+            if (substr($sClassName, 0, strlen($_sNamespace) + 1) == $_sNamespace . '\\')
             {
                 $sNamespace = $_sNamespace;
                 break;
             }
         }
-        if($sNamespace == null)
+        if ($sNamespace == null)
         {
             return null; // Class not registered
         }
@@ -210,27 +210,27 @@ 
         // at the beginning and the end of the class name.
         $sClassName = trim(str_replace(['.', '_'], ['\\', '\\'], (string)$sClassName), '\\');
 
-        if(key_exists($sClassName, $this->aCallableObjects))
+        if (key_exists($sClassName, $this->aCallableObjects))
         {
             return $this->aCallableObjects[$sClassName];
         }
 
         $aOptions = $this->getOptionsFromClass($sClassName);
-        if($aOptions === null)
+        if ($aOptions === null)
         {
             $aOptions = $this->getOptionsFromNamespace($sClassName);
         }
-        if($aOptions === null)
+        if ($aOptions === null)
         {
             return null;
         }
 
         // Make sure the registered class exists
-        if(key_exists('include', $aOptions))
+        if (key_exists('include', $aOptions))
         {
             require_once($aOptions['include']);
         }
-        if(!class_exists('\\' . $sClassName))
+        if (!class_exists('\\' . $sClassName))
         {
             return null;
         }
@@ -238,13 +238,13 @@ 
         // Create the callable object
         $xCallableObject = new \Jaxon\Request\Support\CallableObject($sClassName);
         $this->aCallableOptions[$sClassName] = [];
-        foreach($aOptions as $sName => $xValue)
+        foreach ($aOptions as $sName => $xValue)
         {
-            if($sName == 'separator' || $sName == 'protected')
+            if ($sName == 'separator' || $sName == 'protected')
             {
                 $xCallableObject->configure($sName, $xValue);
             }
-            elseif(is_array($xValue) && $sName != 'include')
+            elseif (is_array($xValue) && $sName != 'include')
             {
                 // These options are to be included in javascript code.
                 $this->aCallableOptions[$sClassName][$sName] = $xValue;
@@ -253,12 +253,12 @@ 
         $this->aCallableObjects[$sClassName] = $xCallableObject;
 
         // Register the request factory for this callable object
-        jaxon()->di()->set($sClassName . '_Factory_Rq', function ($di) use ($sClassName) {
+        jaxon()->di()->set($sClassName . '_Factory_Rq', function($di) use ($sClassName) {
             $xCallableObject = $this->aCallableObjects[$sClassName];
             return new \Jaxon\Factory\Request\Portable($xCallableObject);
         });
         // Register the paginator factory for this callable object
-        jaxon()->di()->set($sClassName . '_Factory_Pg', function ($di) use ($sClassName) {
+        jaxon()->di()->set($sClassName . '_Factory_Pg', function($di) use ($sClassName) {
             $xCallableObject = $this->aCallableObjects[$sClassName];
             return new \Jaxon\Factory\Request\Paginator($xCallableObject);
         });
@@ -274,16 +274,16 @@ 
     private function createCallableObjects()
     {
         // Create callable objects for registered classes
-        foreach(array_keys($this->aClassOptions) as $sClassName)
+        foreach (array_keys($this->aClassOptions) as $sClassName)
         {
             $this->getCallableObject($sClassName);
         }
 
         // Create callable objects for registered namespaces
         $sDS = DIRECTORY_SEPARATOR;
-        foreach($this->aNamespaceOptions as $sNamespace => $aOptions)
+        foreach ($this->aNamespaceOptions as $sNamespace => $aOptions)
         {
-            if(key_exists($sNamespace, $this->aNamespaces))
+            if (key_exists($sNamespace, $this->aNamespaces))
             {
                 continue;
             }
@@ -294,10 +294,10 @@ 
             $sDirectory = $aOptions['directory'];
             $itDir = new RecursiveDirectoryIterator($sDirectory);
             $itFile = new RecursiveIteratorIterator($itDir);
-            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;
                 }
@@ -306,7 +306,7 @@ 
                 $sClassPath = $sNamespace;
                 $sRelativePath = substr($xFile->getPath(), strlen($sDirectory));
                 $sRelativePath = trim(str_replace($sDS, '\\', $sRelativePath), '\\');
-                if($sRelativePath != '')
+                if ($sRelativePath != '')
                 {
                     $sClassPath .= '\\' . $sRelativePath;
                 }
@@ -342,11 +342,11 @@ 
         return $this->createCallableObjects();
 
         $sHash = '';
-        foreach($this->aNamespaces as $sNamespace => $aOptions)
+        foreach ($this->aNamespaces as $sNamespace => $aOptions)
         {
             $sHash .= $sNamespace . $aOptions['separator'];
         }
-        foreach($this->aCallableObjects as $sClassName => $xCallableObject)
+        foreach ($this->aCallableObjects as $sClassName => $xCallableObject)
         {
             $sHash .= $sClassName . implode('|', $xCallableObject->getMethods());
         }
@@ -367,16 +367,16 @@ 
 
         $aJsClasses = [];
         $sCode = '';
-        foreach(array_keys($this->aNamespaces) as $sNamespace)
+        foreach (array_keys($this->aNamespaces) as $sNamespace)
         {
             $offset = 0;
             $sJsNamespace = str_replace('\\', '.', $sNamespace);
             $sJsNamespace .= '.Null'; // This is a sentinel. The last token is not processed in the while loop.
-            while(($dotPosition = strpos($sJsNamespace, '.', $offset)) !== false)
+            while (($dotPosition = strpos($sJsNamespace, '.', $offset)) !== false)
             {
                 $sJsClass = substr($sJsNamespace, 0, $dotPosition);
                 // Generate code for this object
-                if(!key_exists($sJsClass, $aJsClasses))
+                if (!key_exists($sJsClass, $aJsClasses))
                 {
                     $sCode .= "$sPrefix$sJsClass = {};\n";
                     $aJsClasses[$sJsClass] = $sJsClass;
@@ -385,13 +385,13 @@ 
             }
         }
 
-        foreach($this->aCallableObjects as $sClassName => $xCallableObject)
+        foreach ($this->aCallableObjects as $sClassName => $xCallableObject)
         {
             $aConfig = $this->aCallableOptions[$sClassName];
             $aCommonConfig = key_exists('*', $aConfig) ? $aConfig['*'] : [];
 
             $aMethods = [];
-            foreach($xCallableObject->getMethods() as $sMethodName)
+            foreach ($xCallableObject->getMethods() as $sMethodName)
             {
                 // Specific options for this method
                 $aMethodConfig = key_exists($sMethodName, $aConfig) ?