jaxon-php / jaxon-core

src/Plugin/CodeGenerator.php

Braces +3 added lines, -6 removed lines

@@ -350,8 +350,7 @@ 
             if(($sFinalFile) && is_file($sJsAppDir . $sFinalFile . $sExtension))
             {
                 $sOutFile = $sFinalFile . $sExtension;
-            }
-            else
+            } else
             {
                 // The plugins scripts are written into the javascript app dir
                 $sHash = $this->generateHash();
@@ -366,8 +365,7 @@ 
                     if(is_file($sJsAppDir . $sMinFile))
                     {
                         $sOutFile = $sMinFile; // The file was already minified
-                    }
-                    elseif(($this->minify($sJsAppDir . $sOutFile, $sJsAppDir . $sMinFile)))
+                    } elseif(($this->minify($sJsAppDir . $sOutFile, $sJsAppDir . $sMinFile)))
                     {
                         $sOutFile = $sMinFile;
                     }
@@ -387,8 +385,7 @@ 
                 'sJsOptions' => $this->getOption('js.app.options', ''),
                 'sUrl' => $sJsAppURI . $sOutFile,
             ]);
-        }
-        else
+        } else
         {
             // The plugins scripts are wrapped with javascript tags
             $sScript .= $this->xTemplate->render('jaxon::plugins/wrapper.js', [

Spacing +23 added lines, -23 removed lines

@@ -101,7 +101,7 @@ 
      */
     private function getJsLibExt()
     {
-        if(($this->getOption('js.app.minify')))
+        if (($this->getOption('js.app.minify')))
         {
             return '.min.js';
         }
@@ -118,7 +118,7 @@ 
         // Check config options
         // - The js.app.export 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.export') ||
+        if (!$this->getOption('js.app.export') ||
             !$this->getOption('js.app.uri') ||
             !$this->getOption('js.app.dir'))
         {
@@ -127,7 +127,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;
         }
@@ -142,11 +142,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();
         }
@@ -160,25 +160,25 @@ 
      */
     private function makePluginsCode()
     {
-        if($this->sCssCode === null || $this->sJsCode === null || $this->sJsScript === null)
+        if ($this->sCssCode === null || $this->sJsCode === null || $this->sJsScript === null)
         {
             $this->sCssCode = '';
             $this->sJsCode = '';
             $this->sJsScript = '';
-            foreach($this->xPluginManager->getPlugins() as $xPlugin)
+            foreach ($this->xPluginManager->getPlugins() as $xPlugin)
             {
-                if($xPlugin instanceof Response)
+                if ($xPlugin instanceof Response)
                 {
-                    if(($sCssCode = trim($xPlugin->getCss())))
+                    if (($sCssCode = trim($xPlugin->getCss())))
                     {
                         $this->sCssCode .= rtrim($sCssCode, " \n") . "\n";
                     }
-                    if(($sJsCode = trim($xPlugin->getJs())))
+                    if (($sJsCode = trim($xPlugin->getJs())))
                     {
                         $this->sJsCode .= rtrim($sJsCode, " \n") . "\n";
                     }
                 }
-                if(($sJsScript = trim($xPlugin->getScript())))
+                if (($sJsScript = trim($xPlugin->getScript())))
                 {
                     $this->sJsScript .= trim($sJsScript, " \n") . "\n";
                 }
@@ -219,7 +219,7 @@ 
 
         // Add component files to the javascript file array;
         $aJsFiles = [$sJsCoreUrl];
-        if($this->getOption('core.debug.on'))
+        if ($this->getOption('core.debug.on'))
         {
             $aJsFiles[] = $sJsDebugUrl;
             $aJsFiles[] = $sJsLanguageUrl;
@@ -317,7 +317,7 @@ 
      */
     public function getScript($bIncludeJs = false, $bIncludeCss = false)
     {
-        if(!$this->getOption('core.request.uri'))
+        if (!$this->getOption('core.request.uri'))
         {
             $this->setOption('core.request.uri', URI::detect());
         }
@@ -326,16 +326,16 @@ 
         $this->makePluginsCode();
 
         $sScript = '';
-        if(($bIncludeCss))
+        if (($bIncludeCss))
         {
             $sScript .= $this->getCss() . "\n";
         }
-        if(($bIncludeJs))
+        if (($bIncludeJs))
         {
             $sScript .= $this->getJs() . "\n";
         }
 
-        if($this->canExportJavascript())
+        if ($this->canExportJavascript())
         {
             $sJsAppURI = rtrim($this->getOption('js.app.uri'), '/') . '/';
             $sJsAppDir = rtrim($this->getOption('js.app.dir'), '/') . '/';
@@ -343,7 +343,7 @@ 
             $sExtension = $this->getJsLibExt();
 
             // Check if the final file already exists
-            if(($sFinalFile) && is_file($sJsAppDir . $sFinalFile . $sExtension))
+            if (($sFinalFile) && is_file($sJsAppDir . $sFinalFile . $sExtension))
             {
                 $sOutFile = $sFinalFile . $sExtension;
             }
@@ -353,25 +353,25 @@ 
                 $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')))
+                if (($this->getOption('js.app.minify')))
                 {
-                    if(is_file($sJsAppDir . $sMinFile))
+                    if (is_file($sJsAppDir . $sMinFile))
                     {
                         $sOutFile = $sMinFile; // The file was already minified
                     }
-                    elseif(($this->minify($sJsAppDir . $sOutFile, $sJsAppDir . $sMinFile)))
+                    elseif (($this->minify($sJsAppDir . $sOutFile, $sJsAppDir . $sMinFile)))
                     {
                         $sOutFile = $sMinFile;
                     }
                 }
                 // Copy the file to its final location
-                if(($sFinalFile))
+                if (($sFinalFile))
                 {
-                    if(copy($sJsAppDir . $sOutFile, $sJsAppDir . $sFinalFile . $sExtension))
+                    if (copy($sJsAppDir . $sOutFile, $sJsAppDir . $sFinalFile . $sExtension))
                     {
                         $sOutFile = $sFinalFile . $sExtension;
                     }

src/Plugin/Manager.php

Spacing +12 added lines, -12 removed lines

@@ -138,33 +138,33 @@ 
         $bIsAlert = ($xPlugin instanceof \Jaxon\Contracts\Dialogs\Alert);
         $bIsConfirm = ($xPlugin instanceof \Jaxon\Contracts\Dialogs\Confirm);
         $bIsListener = ($xPlugin instanceof \Jaxon\Contracts\Event\Listener);
-        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 && !$bIsListener)
+        elseif (!$bIsConfirm && !$bIsAlert && !$bIsListener)
         {
             $sErrorMessage = $this->trans('errors.register.invalid', ['name' => get_class($xPlugin)]);
             throw new \Jaxon\Exception\Error($sErrorMessage);
         }
         // This plugin implements the Alert interface
-        if($bIsAlert)
+        if ($bIsAlert)
         {
             jaxon()->dialog()->setAlert($xPlugin);
         }
         // This plugin implements the Confirm interface
-        if($bIsConfirm)
+        if ($bIsConfirm)
         {
             jaxon()->dialog()->setConfirm($xPlugin);
         }
         // Register the plugin as an event listener
-        if($bIsListener)
+        if ($bIsListener)
         {
             $this->addEventListener($xPlugin);
         }
@@ -199,7 +199,7 @@ 
      */
     public function registerCallable($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,14 +220,14 @@ 
     private function registerCallablesFromConfig($xAppConfig, $sSection, $sCallableType)
     {
         $aConfig = $xAppConfig->getOption($sSection, []);
-        foreach($aConfig as $xKey => $xValue)
+        foreach ($aConfig as $xKey => $xValue)
         {
-            if(is_integer($xKey) && is_string($xValue))
+            if (is_integer($xKey) && is_string($xValue))
             {
                 // Register a function without options
                 $this->registerCallable($sCallableType, $xValue);
             }
-            elseif(is_string($xKey) && (is_array($xValue) || is_string($xValue)))
+            elseif (is_string($xKey) && (is_array($xValue) || is_string($xValue)))
             {
                 // Register a function with options
                 $this->registerCallable($sCallableType, $xKey, $xValue);
@@ -269,7 +269,7 @@ 
      */
     public function getResponsePlugin($sName)
     {
-        if(array_key_exists($sName, $this->aResponsePlugins))
+        if (array_key_exists($sName, $this->aResponsePlugins))
         {
             return $this->aResponsePlugins[$sName];
         }
@@ -285,7 +285,7 @@ 
      */
     public function getRequestPlugin($sName)
     {
-        if(array_key_exists($sName, $this->aRequestPlugins))
+        if (array_key_exists($sName, $this->aRequestPlugins))
         {
             return $this->aRequestPlugins[$sName];
         }

Braces +4 added lines, -8 removed lines

@@ -142,13 +142,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 && !$bIsListener)
+        } elseif(!$bIsConfirm && !$bIsAlert && !$bIsListener)
         {
             $sErrorMessage = $this->trans('errors.register.invalid', ['name' => get_class($xPlugin)]);
             throw new \Jaxon\Exception\Error($sErrorMessage);
@@ -226,13 +224,11 @@ 
             {
                 // Register a function without options
                 $this->registerCallable($sCallableType, $xValue);
-            }
-            elseif(is_string($xKey) && (is_array($xValue) || is_string($xValue)))
+            } elseif(is_string($xKey) && (is_array($xValue) || is_string($xValue)))
             {
                 // Register a function with options
                 $this->registerCallable($sCallableType, $xKey, $xValue);
-            }
-            else
+            } else
             {
                 continue;
                 // Todo: throw an exception

src/App/Bootstrap.php

Spacing +6 added lines, -6 removed lines

@@ -154,7 +154,7 @@ 
         $this->triggerEvent('pre.setup');
 
         // Add the view renderer
-        $view->addRenderer('jaxon', function () {
+        $view->addRenderer('jaxon', function() {
             return new View\View();
         });
 
@@ -181,24 +181,24 @@ 
         // Use the Composer autoloader. It's important to call this before triggers and callbacks.
         // $jaxon->useComposerAutoloader();
         // Jaxon library settings
-        if(!$jaxon->hasOption('js.app.export'))
+        if (!$jaxon->hasOption('js.app.export'))
         {
             $jaxon->setOption('js.app.export', $this->bExportJs);
         }
-        if(!$jaxon->hasOption('js.app.minify'))
+        if (!$jaxon->hasOption('js.app.minify'))
         {
             $jaxon->setOption('js.app.minify', $this->bMinifyJs);
         }
-        if(!$jaxon->hasOption('js.app.uri') && $this->sJsUri != '')
+        if (!$jaxon->hasOption('js.app.uri') && $this->sJsUri != '')
         {
             $jaxon->setOption('js.app.uri', $this->sJsUri);
         }
-        if(!$jaxon->hasOption('js.app.dir') && $this->sJsDir != '')
+        if (!$jaxon->hasOption('js.app.dir') && $this->sJsDir != '')
         {
             $jaxon->setOption('js.app.dir', $this->sJsDir);
         }
         // Set the request URI
-        if(!$jaxon->hasOption('core.request.uri') && $this->sUri != '')
+        if (!$jaxon->hasOption('core.request.uri') && $this->sUri != '')
         {
             $jaxon->setOption('core.request.uri', $this->sUri);
         }

src/CallableClass.php

Indentation +1 added lines, -1 removed lines

@@ -94,7 +94,7 @@
         return jaxon()->instance($name);
     }
 
-   /**
+    /**
      * Get the uploaded files
      *
      * @return array

Spacing +2 added lines, -2 removed lines

@@ -81,12 +81,12 @@
         $xCallableObject = jaxon()->di()->getCallableRepository()->getCallableObject(get_class($this));
         $cFirstChar = substr($name, 0, 1);
         // If the class name starts with a dot, then find the class in the same full namespace as the caller
-        if($cFirstChar == ':')
+        if ($cFirstChar == ':')
         {
             $name = $xCallableObject->getRootNamespace() . '\\' . str_replace('.', '\\', substr($name, 1));
         }
         // If the class name starts with a dot, then find the class in the same base namespace as the caller
-        elseif($cFirstChar == '.')
+        elseif ($cFirstChar == '.')
         {
             $name = $xCallableObject->getNamespace() . '\\' . str_replace('.', '\\', substr($name, 1));
         }

src/Request/Factory/Parameter.php

Spacing +6 added lines, -6 removed lines

@@ -105,19 +105,19 @@ 
      */
     public static function make($xValue)
     {
-        if($xValue instanceof Contracts\Parameter)
+        if ($xValue instanceof Contracts\Parameter)
         {
             return $xValue;
         }
-        elseif(is_numeric($xValue))
+        elseif (is_numeric($xValue))
         {
             return new Parameter(self::NUMERIC_VALUE, $xValue);
         }
-        elseif(is_string($xValue))
+        elseif (is_string($xValue))
         {
             return new Parameter(self::QUOTED_VALUE, $xValue);
         }
-        elseif(is_bool($xValue))
+        elseif (is_bool($xValue))
         {
             return new Parameter(self::BOOL_VALUE, $xValue);
         }
@@ -161,7 +161,7 @@ 
     public function getScript()
     {
         $sJsCode = '';
-        switch($this->sType)
+        switch ($this->sType)
         {
         case self::FORM_VALUES:
             $sJsCode = $this->getJsCall('getFormValues', $this->xValue);
@@ -188,7 +188,7 @@ 
             $sJsCode = (string)$this->xValue;
             break;
         case self::JS_VALUE:
-            if(is_array($this->xValue) || is_object($this->xValue))
+            if (is_array($this->xValue) || is_object($this->xValue))
             {
                 // Unable to use double quotes here because they cannot be handled on client side.
                 // So we are using simple quotes even if the Json standard recommends double quotes.

Braces +5 added lines, -10 removed lines

@@ -108,20 +108,16 @@ 
         if($xValue instanceof Contracts\Parameter)
         {
             return $xValue;
-        }
-        elseif(is_numeric($xValue))
+        } elseif(is_numeric($xValue))
         {
             return new Parameter(self::NUMERIC_VALUE, $xValue);
-        }
-        elseif(is_string($xValue))
+        } elseif(is_string($xValue))
         {
             return new Parameter(self::QUOTED_VALUE, $xValue);
-        }
-        elseif(is_bool($xValue))
+        } elseif(is_bool($xValue))
         {
             return new Parameter(self::BOOL_VALUE, $xValue);
-        }
-        else // if(is_array($xValue) || is_object($xValue))
+        } else // if(is_array($xValue) || is_object($xValue))
         {
             return new Parameter(self::JS_VALUE, $xValue);
         }
@@ -193,8 +189,7 @@ 
                 // Unable to use double quotes here because they cannot be handled on client side.
                 // So we are using simple quotes even if the Json standard recommends double quotes.
                 $sJsCode = str_replace(['"'], ["'"], json_encode($this->xValue, JSON_HEX_APOS | JSON_HEX_QUOT));
-            }
-            else
+            } else
             {
                 $sJsCode = (string)$this->xValue;
             }

src/Request/Factory/JsCall.php

Spacing +2 added lines, -2 removed lines

@@ -154,9 +154,9 @@
      */
     public function addParameters(array $aParameters)
     {
-        foreach($aParameters as $xParameter)
+        foreach ($aParameters as $xParameter)
         {
-            if($xParameter instanceof JsCall)
+            if ($xParameter instanceof JsCall)
             {
                 $this->addParameter(Parameter::JS_VALUE, 'function(){' . $xParameter->getScript() . ';}');
             }

Braces +1 added lines, -2 removed lines

@@ -159,8 +159,7 @@
             if($xParameter instanceof JsCall)
             {
                 $this->addParameter(Parameter::JS_VALUE, 'function(){' . $xParameter->getScript() . ';}');
-            }
-            else
+            } else
             {
                 $this->pushParameter(Parameter::make($xParameter));
             }

src/Request/Support/CallableFunction.php

Spacing +3 added lines, -3 removed lines

@@ -84,7 +84,7 @@ 
      */
     public function configure($sName, $sValue)
     {
-        switch($sName)
+        switch ($sName)
         {
         case 'class': // The user function is a method in the given class
             $this->xCallableFunction = [$sValue, $this->xCallableFunction];
@@ -139,13 +139,13 @@ 
      */
     public function call($aArgs = [])
     {
-        if(($this->sInclude))
+        if (($this->sInclude))
         {
             require_once $this->sInclude;
         }
 
         // If the function is an alias for a class method, then instanciate the class
-        if(is_array($this->xCallableFunction) && is_string($this->xCallableFunction[0]))
+        if (is_array($this->xCallableFunction) && is_string($this->xCallableFunction[0]))
         {
             $sClassName = $this->xCallableFunction[0];
             $this->xCallableFunction[0] = new $sClassName;

src/Request/Support/CallableRepository.php

Spacing +37 added lines, -37 removed lines

@@ -84,7 +84,7 @@ 
     {
         // Set the composer autoloader
         $sAutoloadFile = __DIR__ . '/../../../../../autoload.php';
-        if(file_exists($sAutoloadFile))
+        if (file_exists($sAutoloadFile))
         {
             $this->xAutoloader = require($sAutoloadFile);
         }
@@ -115,19 +115,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]);
         }
@@ -147,17 +147,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();
             }
@@ -178,26 +178,26 @@ 
     public function addNamespace($sNamespace, array $aOptions)
     {
         // Separator default value
-        if(!key_exists('separator', $aOptions))
+        if (!key_exists('separator', $aOptions))
         {
             $aOptions['separator'] = '.';
         }
         $aOptions['separator'] = trim($aOptions['separator']);
-        if(!in_array($aOptions['separator'], ['.', '_']))
+        if (!in_array($aOptions['separator'], ['.', '_']))
         {
             $aOptions['separator'] = '.';
         }
-        if($aOptions['separator'] == '_')
+        if ($aOptions['separator'] == '_')
         {
             $this->bUsingUnderscore = true;
         }
         // Set the autoload option default value
-        if(!key_exists('autoload', $aOptions))
+        if (!key_exists('autoload', $aOptions))
         {
             $aOptions['autoload'] = true;
         }
         // Register the dir with PSR4 autoloading
-        if(($aOptions['autoload']) && $this->xAutoloader != null)
+        if (($aOptions['autoload']) && $this->xAutoloader != null)
         {
             $this->xAutoloader->setPsr4($sNamespace . '\\', $aOptions['directory']);
         }
@@ -214,7 +214,7 @@ 
      */
     private function getOptionsFromClass($sClassName)
     {
-        if(!key_exists($sClassName, $this->aClassOptions))
+        if (!key_exists($sClassName, $this->aClassOptions))
         {
             return null; // Class not registered
         }
@@ -232,18 +232,18 @@ 
     private function getOptionsFromNamespace($sClassName, $sNamespace = null)
     {
         // Find the corresponding namespace
-        if($sNamespace === null)
+        if ($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
         }
@@ -251,7 +251,7 @@ 
         // Get the class options
         $aOptions = $this->aNamespaceOptions[$sNamespace];
         $aDefaultOptions = ['namespace' => $sNamespace];
-        if(key_exists('separator', $aOptions))
+        if (key_exists('separator', $aOptions))
         {
             $aDefaultOptions['separator'] = $aOptions['separator'];
         }
@@ -269,11 +269,11 @@ 
     protected function _getCallableObject($sClassName, array $aOptions)
     {
         // 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;
         }
@@ -281,13 +281,13 @@ 
         // Create the callable object
         $xCallableObject = new CallableObject($sClassName);
         $this->aCallableOptions[$sClassName] = [];
-        foreach($aOptions as $sName => $xValue)
+        foreach ($aOptions as $sName => $xValue)
         {
-            if(in_array($sName, ['separator', 'namespace', 'protected']))
+            if (in_array($sName, ['separator', 'namespace', '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;
@@ -324,22 +324,22 @@ 
         // at the beginning and the end of the class name.
         $sClassName = (string)$sClassName;
         $sClassName = trim(str_replace('.', '\\', $sClassName), '\\');
-        if($this->bUsingUnderscore)
+        if ($this->bUsingUnderscore)
         {
             $sClassName = trim(str_replace('_', '\\', $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;
         }
@@ -355,9 +355,9 @@ 
     public function createCallableObjects()
     {
         // Create callable objects for registered classes
-        foreach($this->aClassOptions as $sClassName => $aClassOptions)
+        foreach ($this->aClassOptions as $sClassName => $aClassOptions)
         {
-            if(!key_exists($sClassName, $this->aCallableObjects))
+            if (!key_exists($sClassName, $this->aCallableObjects))
             {
                 $this->_getCallableObject($sClassName, $aClassOptions);
             }
@@ -365,9 +365,9 @@ 
 
         // 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;
             }
@@ -378,10 +378,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;
                 }
@@ -390,7 +390,7 @@ 
                 $sClassPath = $sNamespace;
                 $sRelativePath = substr($xFile->getPath(), strlen($sDirectory));
                 $sRelativePath = trim(str_replace($sDS, '\\', $sRelativePath), '\\');
-                if($sRelativePath != '')
+                if ($sRelativePath != '')
                 {
                     $sClassPath .= '\\' . $sRelativePath;
                 }
@@ -398,10 +398,10 @@ 
                 $this->aNamespaces[$sClassPath] = ['separator' => $aOptions['separator']];
                 $sClassName = $sClassPath . '\\' . $xFile->getBasename('.php');
 
-                if(!key_exists($sClassName, $this->aCallableObjects))
+                if (!key_exists($sClassName, $this->aCallableObjects))
                 {
                     $aClassOptions = $this->getOptionsFromNamespace($sClassName, $sNamespace);
-                    if($aClassOptions !== null)
+                    if ($aClassOptions !== null)
                     {
                         $this->_getCallableObject($sClassName, $aClassOptions);
                     }

Braces +1 added lines, -2 removed lines

@@ -286,8 +286,7 @@
             if(in_array($sName, ['separator', 'namespace', '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;

src/Request/Support/CallableObject.php

Braces +2 added lines, -4 removed lines

@@ -159,8 +159,7 @@ 
             if(is_array($sValue))
             {
                 $this->aProtectedMethods = array_merge($this->aProtectedMethods, $sValue);
-            }
-            elseif(is_string($sValue))
+            } elseif(is_string($sValue))
             {
                 $this->aProtectedMethods[] = $sValue;
             }
@@ -217,8 +216,7 @@ 
                     $parameterInstances[] = $di->get($parameter->getClass()->getName());
                 }
                 $this->xRegisteredObject = $this->xReflectionClass->newInstanceArgs($parameterInstances);
-            }
-            else
+            } else
             {
                 $this->xRegisteredObject = $this->xReflectionClass->newInstance();
             }

Spacing +14 added lines, -14 removed lines

@@ -138,29 +138,29 @@ 
      */
     public function configure($sName, $sValue)
     {
-        switch($sName)
+        switch ($sName)
         {
         // Set the separator
         case 'separator':
-            if($sValue == '_' || $sValue == '.')
+            if ($sValue == '_' || $sValue == '.')
             {
                 $this->sSeparator = $sValue;
             }
             break;
         // Set the namespace
         case 'namespace':
-            if(is_string($sValue))
+            if (is_string($sValue))
             {
                 $this->sNamespace = $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;
             }
@@ -178,16 +178,16 @@ 
     public function getMethods()
     {
         $aMethods = [];
-        foreach($this->xReflectionClass->getMethods(\ReflectionMethod::IS_PUBLIC) as $xMethod)
+        foreach ($this->xReflectionClass->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;
             }
@@ -203,15 +203,15 @@ 
      */
     public function getRegisteredObject()
     {
-        if($this->xRegisteredObject == null)
+        if ($this->xRegisteredObject == null)
         {
             $di = jaxon()->di();
             // Use the Reflection class to get the parameters of the constructor
-            if(($constructor = $this->xReflectionClass->getConstructor()) != null)
+            if (($constructor = $this->xReflectionClass->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());
@@ -224,13 +224,13 @@ 
             }
 
             // Initialize the object
-            if($this->xRegisteredObject instanceof \Jaxon\CallableClass)
+            if ($this->xRegisteredObject instanceof \Jaxon\CallableClass)
             {
                 $this->xRegisteredObject->response = jaxon()->getResponse();
             }
 
             // Run the callback for class initialisation
-            if(($xCallback = $di->getRequestHandler()->getCallbackManager()->init()))
+            if (($xCallback = $di->getRequestHandler()->getCallbackManager()->init()))
             {
                 call_user_func_array($xCallback, [$this->xRegisteredObject]);
             }
@@ -260,7 +260,7 @@ 
      */
     public function call($sMethod, $aArgs)
     {
-        if(!$this->hasMethod($sMethod))
+        if (!$this->hasMethod($sMethod))
         {
             return;
         }