jaxon-php / jaxon-core

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

Spacing +13 added lines, -13 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,7 +224,7 @@ 
             }
 
             // Initialize the object
-            if($this->xRegisteredObject instanceof \Jaxon\CallableClass)
+            if ($this->xRegisteredObject instanceof \Jaxon\CallableClass)
             {
                 $this->xRegisteredObject->response = jaxon()->getResponse();
             }
@@ -254,7 +254,7 @@ 
      */
     public function call($sMethod, $aArgs)
     {
-        if(!$this->hasMethod($sMethod))
+        if (!$this->hasMethod($sMethod))
         {
             return;
         }

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();
             }

src/Request/Handler/Callback.php

Spacing +4 added lines, -4 removed lines

@@ -51,7 +51,7 @@ 
      */
     public function before($xCallable = null)
     {
-        if($xCallable === null)
+        if ($xCallable === null)
         {
             return $this->xBeforeCallback;
         }
@@ -67,7 +67,7 @@ 
      */
     public function after($xCallable = null)
     {
-        if($xCallable === null)
+        if ($xCallable === null)
         {
             return $this->xAfterCallback;
         }
@@ -83,7 +83,7 @@ 
      */
     public function invalid($xCallable = null)
     {
-        if($xCallable === null)
+        if ($xCallable === null)
         {
             return $this->xInvalidCallback;
         }
@@ -99,7 +99,7 @@ 
      */
     public function error($xCallable = null)
     {
-        if($xCallable === null)
+        if ($xCallable === null)
         {
             return $this->xErrorCallback;
         }

src/Request/Plugin/CallableDir.php

Spacing +8 added lines, -8 removed lines

@@ -68,47 +68,47 @@
     public function register($sType, $sDirectory, $aOptions)
     {
         $sType = trim($sType);
-        if($sType != $this->getName())
+        if ($sType != $this->getName())
         {
             return false;
         }
 
-        if(!is_string($sDirectory) || !is_dir($sDirectory))
+        if (!is_string($sDirectory) || !is_dir($sDirectory))
         {
             throw new \Jaxon\Exception\Error($this->trans('errors.objects.invalid-declaration'));
         }
-        if(is_string($aOptions))
+        if (is_string($aOptions))
         {
             $aOptions = ['namespace' => $aOptions];
         }
-        if(!is_array($aOptions))
+        if (!is_array($aOptions))
         {
             throw new \Jaxon\Exception\Error($this->trans('errors.objects.invalid-declaration'));
         }
 
         $sDirectory = rtrim(trim($sDirectory), '/\\');
-        if(!is_dir($sDirectory))
+        if (!is_dir($sDirectory))
         {
             return false;
         }
         $aOptions['directory'] = realpath($sDirectory);
 
         $sNamespace = key_exists('namespace', $aOptions) ? $aOptions['namespace'] : '';
-        if(!($sNamespace = trim($sNamespace, ' \\')))
+        if (!($sNamespace = trim($sNamespace, ' \\')))
         {
             $sNamespace = '';
         }
 
         // Change the keys in $aOptions to have "\" as separator
         $_aOptions = [];
-        foreach($aOptions as $sName => $aOption)
+        foreach ($aOptions as $sName => $aOption)
         {
             $sName = trim(str_replace('.', '\\', $sName), ' \\');
             $_aOptions[$sName] = $aOption;
         }
         $aOptions = $_aOptions;
 
-        if(($sNamespace))
+        if (($sNamespace))
         {
             $this->xRepository->addNamespace($sNamespace, $aOptions);
         }

Braces +1 added lines, -2 removed lines

@@ -111,8 +111,7 @@
         if(($sNamespace))
         {
             $this->xRepository->addNamespace($sNamespace, $aOptions);
-        }
-        else
+        } else
         {
             $this->xRepository->addDirectory($sDirectory, $aOptions);
         }

src/Request/Plugin/CallableClass.php

Spacing +22 added lines, -22 removed lines

@@ -64,19 +64,19 @@ 
     {
         $this->xRepository = $xRepository;
 
-        if(!empty($_GET['jxncls']))
+        if (!empty($_GET['jxncls']))
         {
             $this->sRequestedClass = trim($_GET['jxncls']);
         }
-        if(!empty($_GET['jxnmthd']))
+        if (!empty($_GET['jxnmthd']))
         {
             $this->sRequestedMethod = trim($_GET['jxnmthd']);
         }
-        if(!empty($_POST['jxncls']))
+        if (!empty($_POST['jxncls']))
         {
             $this->sRequestedClass = trim($_POST['jxncls']);
         }
-        if(!empty($_POST['jxnmthd']))
+        if (!empty($_POST['jxnmthd']))
         {
             $this->sRequestedMethod = trim($_POST['jxnmthd']);
         }
@@ -99,7 +99,7 @@ 
      */
     public function getTarget()
     {
-        if(!$this->sRequestedClass || !$this->sRequestedMethod)
+        if (!$this->sRequestedClass || !$this->sRequestedMethod)
         {
             return null;
         }
@@ -118,20 +118,20 @@ 
     public function register($sType, $sClassName, $aOptions)
     {
         $sType = trim($sType);
-        if($sType != $this->getName())
+        if ($sType != $this->getName())
         {
             return false;
         }
 
-        if(!is_string($sClassName))
+        if (!is_string($sClassName))
         {
             throw new \Jaxon\Exception\Error($this->trans('errors.objects.invalid-declaration'));
         }
-        if(is_string($aOptions))
+        if (is_string($aOptions))
         {
             $aOptions = ['include' => $aOptions];
         }
-        if(!is_array($aOptions))
+        if (!is_array($aOptions))
         {
             throw new \Jaxon\Exception\Error($this->trans('errors.objects.invalid-declaration'));
         }
@@ -154,11 +154,11 @@ 
         $aCallableObjects = $this->xRepository->getCallableObjects();
         $sHash = '';
 
-        foreach($aNamespaces as $sNamespace => $aOptions)
+        foreach ($aNamespaces as $sNamespace => $aOptions)
         {
             $sHash .= $sNamespace . $aOptions['separator'];
         }
-        foreach($aCallableObjects as $sClassName => $xCallableObject)
+        foreach ($aCallableObjects as $sClassName => $xCallableObject)
         {
             $sHash .= $sClassName . implode('|', $xCallableObject->getMethods());
         }
@@ -183,21 +183,21 @@ 
 
         $xCallableClass = new \ReflectionClass(UserCallableClass::class);
         $aCallableMethods = [];
-        foreach($xCallableClass->getMethods(\ReflectionMethod::IS_PUBLIC) as $xMethod)
+        foreach ($xCallableClass->getMethods(\ReflectionMethod::IS_PUBLIC) as $xMethod)
         {
             $aCallableMethods[] = $xMethod->getName();
         }
 
-        foreach(array_keys($aNamespaces) as $sNamespace)
+        foreach (array_keys($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;
@@ -206,17 +206,17 @@ 
             }
         }
 
-        foreach($aCallableObjects as $sClassName => $xCallableObject)
+        foreach ($aCallableObjects as $sClassName => $xCallableObject)
         {
             $aConfig = $aCallableOptions[$sClassName];
             $aCommonConfig = key_exists('*', $aConfig) ? $aConfig['*'] : [];
 
             $aProtectedMethods = is_subclass_of($sClassName, UserCallableClass::class) ? $aCallableMethods : [];
             $aMethods = [];
-            foreach($xCallableObject->getMethods() as $sMethodName)
+            foreach ($xCallableObject->getMethods() as $sMethodName)
             {
                 // Don't export methods of the CallableClass class
-                if(in_array($sMethodName, $aProtectedMethods))
+                if (in_array($sMethodName, $aProtectedMethods))
                 {
                     continue;
                 }
@@ -247,7 +247,7 @@ 
     public function canProcessRequest()
     {
         // Check the validity of the class name
-        if(($this->sRequestedClass !== null && !$this->validateClass($this->sRequestedClass)) ||
+        if (($this->sRequestedClass !== null && !$this->validateClass($this->sRequestedClass)) ||
             ($this->sRequestedMethod !== null && !$this->validateMethod($this->sRequestedMethod)))
         {
             $this->sRequestedClass = null;
@@ -263,14 +263,14 @@ 
      */
     public function processRequest()
     {
-        if(!$this->canProcessRequest())
+        if (!$this->canProcessRequest())
         {
             return false;
         }
 
         // Find the requested method
         $xCallableObject = $this->xRepository->getCallableObject($this->sRequestedClass);
-        if(!$xCallableObject || !$xCallableObject->hasMethod($this->sRequestedMethod))
+        if (!$xCallableObject || !$xCallableObject->hasMethod($this->sRequestedMethod))
         {
             // Unable to find the requested object or method
             throw new \Jaxon\Exception\Error($this->trans('errors.objects.invalid',
@@ -281,7 +281,7 @@ 
         $di = jaxon()->di();
         $aArgs = $di->getRequestHandler()->processArguments();
         $xResponse = $xCallableObject->call($this->sRequestedMethod, $aArgs);
-        if(($xResponse))
+        if (($xResponse))
         {
             $di->getResponseManager()->append($xResponse);
         }

src/Request/Handler.php

Spacing +19 added lines, -19 removed lines

@@ -146,7 +146,7 @@ 
     public function onBefore(&$bEndRequest)
     {
         // Call the user defined callback
-        if(($xCallback = $this->xCallbackManager->before()))
+        if (($xCallback = $this->xCallbackManager->before()))
         {
             call_user_func_array($xCallback, [$this->xTargetRequestPlugin->getTarget(), &$bEndRequest]);
         }
@@ -160,7 +160,7 @@ 
      */
     public function onAfter($bEndRequest)
     {
-        if(($xCallback = $this->xCallbackManager->after()))
+        if (($xCallback = $this->xCallbackManager->after()))
         {
             call_user_func_array($xCallback, [$this->xTargetRequestPlugin->getTarget(), $bEndRequest]);
         }
@@ -174,7 +174,7 @@ 
      */
     public function onInvalid($sMessage)
     {
-        if(($xCallback = $this->xCallbackManager->invalid()))
+        if (($xCallback = $this->xCallbackManager->invalid()))
         {
             call_user_func_array($xCallback, [$sMessage]);
         }
@@ -188,7 +188,7 @@ 
      */
     public function onError(Exception $xException)
     {
-        if(($xCallback = $this->xCallbackManager->error()))
+        if (($xCallback = $this->xCallbackManager->error()))
         {
             call_user_func_array($xCallback, [$xException]);
         }
@@ -209,15 +209,15 @@ 
     public function canProcessRequest()
     {
         // Return true if the request plugin was already found
-        if(($this->xTargetRequestPlugin))
+        if (($this->xTargetRequestPlugin))
         {
             return true;
         }
 
         // Find a plugin to process the request
-        foreach($this->xPluginManager->getRequestPlugins() as $xPlugin)
+        foreach ($this->xPluginManager->getRequestPlugins() as $xPlugin)
         {
-            if($xPlugin->getName() != Jaxon::FILE_UPLOAD && $xPlugin->canProcessRequest())
+            if ($xPlugin->getName() != Jaxon::FILE_UPLOAD && $xPlugin->canProcessRequest())
             {
                 $this->xTargetRequestPlugin = $xPlugin;
                 return true;
@@ -241,7 +241,7 @@ 
     public function processRequest()
     {
         // Check to see if headers have already been sent out, in which case we can't do our job
-        if(headers_sent($filename, $linenumber))
+        if (headers_sent($filename, $linenumber))
         {
             echo $this->trans('errors.output.already-sent', [
                 'location' => $filename . ':' . $linenumber
@@ -250,7 +250,7 @@ 
         }
 
         // Check if there is a plugin to process this request
-        if(!$this->canProcessRequest())
+        if (!$this->canProcessRequest())
         {
             return;
         }
@@ -258,12 +258,12 @@ 
         $bEndRequest = false;
 
         // Handle before processing event
-        if(($this->xTargetRequestPlugin))
+        if (($this->xTargetRequestPlugin))
         {
             $this->onBefore($bEndRequest);
         }
 
-        if(!$bEndRequest)
+        if (!$bEndRequest)
         {
             try
             {
@@ -271,12 +271,12 @@ 
                 $this->xUploadRequestPlugin->processRequest();
 
                 // Process the request
-                if(($this->xTargetRequestPlugin))
+                if (($this->xTargetRequestPlugin))
                 {
                     $this->xTargetRequestPlugin->processRequest();
                 }
             }
-            catch(Exception $e)
+            catch (Exception $e)
             {
                 // An exception was thrown while processing the request.
                 // The request missed the corresponding handler function,
@@ -284,7 +284,7 @@ 
 
                 $this->xResponseManager->error($e->getMessage());
 
-                if($e instanceof \Jaxon\Exception\Error)
+                if ($e instanceof \Jaxon\Exception\Error)
                 {
                     $this->onInvalid($e->getMessage());
                 }
@@ -296,7 +296,7 @@ 
         }
 
         // Clean the processing buffer
-        if(($this->getOption('core.process.clean')))
+        if (($this->getOption('core.process.clean')))
         {
             $er = error_reporting(0);
             while (ob_get_level() > 0)
@@ -306,26 +306,26 @@ 
             error_reporting($er);
         }
 
-        if(($this->xTargetRequestPlugin))
+        if (($this->xTargetRequestPlugin))
         {
             // Handle after processing event
             $this->onAfter($bEndRequest);
         }
 
         // If the called function returned no response, take the the global response
-        if(!$this->xResponseManager->getResponse())
+        if (!$this->xResponseManager->getResponse())
         {
             $this->xResponseManager->append(jaxon()->getResponse());
         }
 
         $this->xResponseManager->printDebug();
 
-        if(($this->getOption('core.response.send')))
+        if (($this->getOption('core.response.send')))
         {
             $this->xResponseManager->sendOutput();
         }
 
-        if(($this->getOption('core.process.exit')))
+        if (($this->getOption('core.process.exit')))
         {
             exit();
         }

Braces +3 added lines, -6 removed lines

@@ -191,8 +191,7 @@ 
         if(($xCallback = $this->xCallbackManager->error()))
         {
             call_user_func_array($xCallback, [$xException]);
-        }
-        else
+        } else
         {
             throw $xException;
         }
@@ -275,8 +274,7 @@ 
                 {
                     $this->xTargetRequestPlugin->processRequest();
                 }
-            }
-            catch(Exception $e)
+            } catch(Exception $e)
             {
                 // An exception was thrown while processing the request.
                 // The request missed the corresponding handler function,
@@ -287,8 +285,7 @@ 
                 if($e instanceof \Jaxon\Exception\Error)
                 {
                     $this->onInvalid($e->getMessage());
-                }
-                else
+                } else
                 {
                     $this->onError($e);
                 }