jaxon-php / jaxon-core

src/Plugin/Manager/PluginManager.php

Spacing +9 added lines, -9 removed lines

@@ -124,28 +124,28 @@ 
     {
         $bIsUsed = false;
         $aInterfaces = class_implements($sClassName);
-        if(in_array(CodeGeneratorInterface::class, $aInterfaces))
+        if (in_array(CodeGeneratorInterface::class, $aInterfaces))
         {
             $this->xCodeGenerator->addCodeGenerator($sClassName, $nPriority);
             $bIsUsed = true;
         }
-        if(in_array(CallableRegistryInterface::class, $aInterfaces))
+        if (in_array(CallableRegistryInterface::class, $aInterfaces))
         {
             $this->aRegistryPlugins[$sPluginName] = $sClassName;
             $bIsUsed = true;
         }
-        if(in_array(RequestHandlerInterface::class, $aInterfaces))
+        if (in_array(RequestHandlerInterface::class, $aInterfaces))
         {
             $this->aRequestHandlers[$sPluginName] = $sClassName;
             $bIsUsed = true;
         }
-        if(in_array(ResponsePluginInterface::class, $aInterfaces))
+        if (in_array(ResponsePluginInterface::class, $aInterfaces))
         {
             $this->aResponsePlugins[$sPluginName] = $sClassName;
             $bIsUsed = true;
         }
 
-        if(!$bIsUsed)
+        if (!$bIsUsed)
         {
             // The class is invalid.
             $sMessage = $this->xTranslator->trans('errors.register.invalid', ['name' => $sClassName]);
@@ -153,7 +153,7 @@ 
         }
 
         // Register the plugin in the DI container, if necessary
-        if(!$this->di->has($sClassName))
+        if (!$this->di->has($sClassName))
         {
             $this->di->auto($sClassName);
         }
@@ -169,12 +169,12 @@ 
      */
     public function getResponsePlugin(string $sName, ?ResponseInterface $xResponse = null): ?ResponsePlugin
     {
-        if(!isset($this->aResponsePlugins[$sName]))
+        if (!isset($this->aResponsePlugins[$sName]))
         {
             return null;
         }
         $xPlugin = $this->di->g($this->aResponsePlugins[$sName]);
-        if(($xResponse))
+        if (($xResponse))
         {
             $xPlugin->setResponse($xResponse);
         }
@@ -195,7 +195,7 @@ 
      */
     public function registerCallable(string $sType, string $sCallable, $xOptions = [])
     {
-        if(isset($this->aRegistryPlugins[$sType]) &&
+        if (isset($this->aRegistryPlugins[$sType]) &&
             ($xPlugin = $this->di->g($this->aRegistryPlugins[$sType])))
         {
             $xPlugin->register($sType, $sCallable, $xPlugin->checkOptions($sCallable, $xOptions));

src/Plugin/Request/CallableClass/CallableObject.php

Spacing +2 added lines, -2 removed lines

@@ -298,11 +298,11 @@
         $sMethod = $this->xTarget->getMethodName();
         // The hooks defined at method level are merged with those defined at class level.
         $aMethods = array_merge($aHookMethods['*'] ?? [], $aHookMethods[$sMethod] ?? []);
-        foreach($aMethods as $xKey => $xValue)
+        foreach ($aMethods as $xKey => $xValue)
         {
             $sHookName = $xValue;
             $aHookArgs = [];
-            if(is_string($xKey))
+            if (is_string($xKey))
             {
                 $sHookName = $xKey;
                 $aHookArgs = is_array($xValue) ? $xValue : [$xValue];

src/Plugin/Request/CallableClass/CallableRepository.php

Spacing +19 added lines, -19 removed lines

@@ -110,7 +110,7 @@ 
 
         // The methods of the CallableClass class must not be exported
         $xCallableClass = new ReflectionClass(CallableClass::class);
-        foreach($xCallableClass->getMethods(ReflectionMethod::IS_PUBLIC) as $xMethod)
+        foreach ($xCallableClass->getMethods(ReflectionMethod::IS_PUBLIC) as $xMethod)
         {
             $this->aProtectedMethods[] = $xMethod->getName();
         }
@@ -181,15 +181,15 @@ 
      */
     public function makeClassOptions(string $sClassName, array $aClassOptions, array $aDirectoryOptions): array
     {
-        foreach($this->aDefaultClassOptions as $sOption => $xValue)
+        foreach ($this->aDefaultClassOptions as $sOption => $xValue)
         {
-            if(!isset($aClassOptions[$sOption]))
+            if (!isset($aClassOptions[$sOption]))
             {
                 $aClassOptions[$sOption] = $xValue;
             }
         }
-        $aClassOptions['excluded'] = (bool)($aClassOptions['excluded'] ?? false); // Convert to bool.
-        if(is_string($aClassOptions['protected']))
+        $aClassOptions['excluded'] = (bool) ($aClassOptions['excluded'] ?? false); // Convert to bool.
+        if (is_string($aClassOptions['protected']))
         {
             $aClassOptions['protected'] = [$aClassOptions['protected']]; // Convert to array.
         }
@@ -200,25 +200,25 @@ 
             $aDirectoryOptions['classes']['*'] ?? [], // Options for all classes
             $aDirectoryOptions['classes'][$sClassName] ?? [], // Options for this specific class
         ];
-        foreach($aOptionGroups as $aOptionGroup)
+        foreach ($aOptionGroups as $aOptionGroup)
         {
-            if(isset($aOptionGroup['separator']))
+            if (isset($aOptionGroup['separator']))
             {
-                $aClassOptions['separator'] = (string)$aOptionGroup['separator'];
+                $aClassOptions['separator'] = (string) $aOptionGroup['separator'];
             }
-            if(isset($aOptionGroup['excluded']))
+            if (isset($aOptionGroup['excluded']))
             {
-                $aClassOptions['excluded'] = (bool)$aOptionGroup['excluded'];
+                $aClassOptions['excluded'] = (bool) $aOptionGroup['excluded'];
             }
-            if(isset($aOptionGroup['protected']))
+            if (isset($aOptionGroup['protected']))
             {
-                if(is_string($aOptionGroup['protected']))
+                if (is_string($aOptionGroup['protected']))
                 {
                     $aOptionGroup['protected'] = [$aOptionGroup['protected']]; // Convert to array.
                 }
                 $aClassOptions['protected'] = array_merge($aClassOptions['protected'], $aOptionGroup['protected']);
             }
-            if(isset($aOptionGroup['functions']))
+            if (isset($aOptionGroup['functions']))
             {
                 $aClassOptions['functions'] = array_merge($aClassOptions['functions'], $aOptionGroup['functions']);
             }
@@ -264,10 +264,10 @@ 
     private function getNamespaceClassOptions(string $sClassName)
     {
         // Find the corresponding namespace
-        foreach($this->aNamespaceOptions as $sNamespace => $aOptions)
+        foreach ($this->aNamespaceOptions as $sNamespace => $aOptions)
         {
             // Check if the namespace matches the class.
-            if(strncmp($sClassName, $sNamespace . '\\', strlen($sNamespace) + 1) === 0)
+            if (strncmp($sClassName, $sNamespace . '\\', strlen($sNamespace) + 1) === 0)
             {
                 // Save the class options
                 $this->aClasses[$sClassName] = $this->makeClassOptions($sClassName,
@@ -288,17 +288,17 @@ 
     public function getClassOptions(string $sClassName): array
     {
         // Find options for a class registered with namespace.
-        if(!isset($this->aClasses[$sClassName]))
+        if (!isset($this->aClasses[$sClassName]))
         {
             $this->getNamespaceClassOptions($sClassName);
-            if(!isset($this->aClasses[$sClassName]))
+            if (!isset($this->aClasses[$sClassName]))
             {
                 // Find options for a class registered without namespace.
                 // We then need to parse all classes to be able to find one.
                 $this->di->getCallableRegistry()->parseDirectories();
             }
         }
-        if(isset($this->aClasses[$sClassName]))
+        if (isset($this->aClasses[$sClassName]))
         {
             return $this->aClasses[$sClassName];
         }
@@ -327,7 +327,7 @@ 
     public function getCallableObjects(): array
     {
         $aCallableObjects = [];
-        foreach($this->aClasses as $sClassName => $aOptions)
+        foreach ($this->aClasses as $sClassName => $aOptions)
         {
             $this->di->registerCallableClass($sClassName, $aOptions);
             $aCallableObjects[$sClassName] = $this->di->getCallableObject($sClassName);

src/Request/Handler/RequestHandler.php

Spacing +13 added lines, -13 removed lines

@@ -108,7 +108,7 @@ 
         $this->xUploadHandler = $this->di->getUploadHandler();
 
         // Return true if the request plugin was already found
-        if($this->xRequestPlugin !== null)
+        if ($this->xRequestPlugin !== null)
         {
             return true;
         }
@@ -116,9 +116,9 @@ 
         // The HTTP request
         $xRequest = $this->di->getRequest();
         // Find a plugin to process the request
-        foreach($this->xPluginManager->getRequestHandlers() as $sClassName)
+        foreach ($this->xPluginManager->getRequestHandlers() as $sClassName)
         {
-            if($sClassName::canProcessRequest($xRequest))
+            if ($sClassName::canProcessRequest($xRequest))
             {
                 $this->xRequestPlugin = $this->di->g($sClassName);
                 $this->xRequestPlugin->setTarget($xRequest);
@@ -127,7 +127,7 @@ 
         }
 
         // Check if the upload plugin is enabled
-        if($this->xUploadHandler === null)
+        if ($this->xUploadHandler === null)
         {
             return false;
         }
@@ -149,15 +149,15 @@ 
         // The HTTP request
         $xRequest = $this->di->getRequest();
         // Process uploaded files, if the upload plugin is enabled
-        if($this->xUploadHandler !== null && $this->xUploadHandler->canProcessRequest($xRequest))
+        if ($this->xUploadHandler !== null && $this->xUploadHandler->canProcessRequest($xRequest))
         {
             $this->xUploadHandler->processRequest($xRequest);
         }
         // Process the request
-        if(($this->xRequestPlugin))
+        if (($this->xRequestPlugin))
         {
             $xResponse = $this->xRequestPlugin->processRequest();
-            if(($xResponse))
+            if (($xResponse))
             {
                 $this->xResponseManager->append($xResponse);
             }
@@ -178,7 +178,7 @@ 
     public function processRequest()
     {
         // Check if there is a plugin to process this request
-        if(!$this->canProcessRequest())
+        if (!$this->canProcessRequest())
         {
             return;
         }
@@ -187,11 +187,11 @@ 
         {
             $bEndRequest = false;
             // Handle before processing event
-            if(($this->xRequestPlugin))
+            if (($this->xRequestPlugin))
             {
                 $this->xCallbackManager->onBefore($this->xRequestPlugin->getTarget(), $bEndRequest);
             }
-            if($bEndRequest)
+            if ($bEndRequest)
             {
                 return;
             }
@@ -199,7 +199,7 @@ 
             $this->_processRequest();
 
             // Handle after processing event
-            if(($this->xRequestPlugin))
+            if (($this->xRequestPlugin))
             {
                 $this->xCallbackManager->onAfter($this->xRequestPlugin->getTarget(), $bEndRequest);
             }
@@ -207,12 +207,12 @@ 
         // An exception was thrown while processing the request.
         // The request missed the corresponding handler function,
         // or an error occurred while attempting to execute the handler.
-        catch(RequestException $e)
+        catch (RequestException $e)
         {
             $this->xResponseManager->error($e->getMessage());
             $this->xCallbackManager->onInvalid($e);
         }
-        catch(Exception $e)
+        catch (Exception $e)
         {
             $this->xResponseManager->error($e->getMessage());
             $this->xCallbackManager->onError($e);

Braces +1 added lines, -2 removed lines

@@ -211,8 +211,7 @@
         {
             $this->xResponseManager->error($e->getMessage());
             $this->xCallbackManager->onInvalid($e);
-        }
-        catch(Exception $e)
+        } catch(Exception $e)
         {
             $this->xResponseManager->error($e->getMessage());
             $this->xCallbackManager->onError($e);

src/Request/Handler/CallbackManager.php

Spacing +10 added lines, -10 removed lines

@@ -99,7 +99,7 @@ 
      */
     public function popBootCallbacks(): array
     {
-        if(empty($this->aBootCallbacks))
+        if (empty($this->aBootCallbacks))
         {
             return [];
         }
@@ -118,9 +118,9 @@ 
     private function getExceptionCallbacks(Exception $xException): array
     {
         $aExceptionCallbacks = [];
-        foreach($this->aExceptionCallbacks as $sExClass => $aCallbacks)
+        foreach ($this->aExceptionCallbacks as $sExClass => $aCallbacks)
         {
-            if(is_a($xException, $sExClass))
+            if (is_a($xException, $sExClass))
             {
                 $aExceptionCallbacks = array_merge($aExceptionCallbacks, $aCallbacks);
             }
@@ -190,13 +190,13 @@ 
      */
     public function error(callable $xCallable, string $sExClass = ''): CallbackManager
     {
-        if($sExClass === '' || $sExClass === Exception::class)
+        if ($sExClass === '' || $sExClass === Exception::class)
         {
             $this->aErrorCallbacks[] = $xCallable;
             return $this;
         }
         // Callback for a given exception class
-        if(isset($this->aExceptionCallbacks[$sExClass]))
+        if (isset($this->aExceptionCallbacks[$sExClass]))
         {
             $this->aExceptionCallbacks[$sExClass][] = $xCallable;
             return $this;
@@ -227,7 +227,7 @@ 
     private function executeCallback(callable $xCallback, array $aParameters)
     {
         $xReturn = call_user_func_array($xCallback, $aParameters);
-        if($xReturn instanceof ResponseInterface)
+        if ($xReturn instanceof ResponseInterface)
         {
             $this->xResponseManager->append($xReturn);
         }
@@ -241,7 +241,7 @@ 
      */
     private function executeCallbacks(array $aCallbacks, array $aParameters)
     {
-        foreach($aCallbacks as $xCallback)
+        foreach ($aCallbacks as $xCallback)
         {
             $this->executeCallback($xCallback, $aParameters);
         }
@@ -271,10 +271,10 @@ 
     public function onBefore(Target $xTarget, bool &$bEndRequest)
     {
         // Call the user defined callback
-        foreach($this->aBeforeCallbacks as $xCallback)
+        foreach ($this->aBeforeCallbacks as $xCallback)
         {
             $this->executeCallback($xCallback, [$xTarget, &$bEndRequest]);
-            if($bEndRequest)
+            if ($bEndRequest)
             {
                 return;
             }
@@ -321,7 +321,7 @@ 
     {
         $aExceptionCallbacks = $this->getExceptionCallbacks($xException);
         $this->executeCallbacks($aExceptionCallbacks, [$xException]);
-        if(count($aExceptionCallbacks) > 0)
+        if (count($aExceptionCallbacks) > 0)
         {
             // Do not throw the exception if a custom handler is defined
             return;

src/Plugin/Code/AssetManager.php

Spacing +9 added lines, -9 removed lines

@@ -71,7 +71,7 @@ 
     public function shallIncludeAssets(Plugin $xPlugin): bool

     {

         $sPluginOptionName = 'assets.include.' . $xPlugin->getName();

-        if($this->xConfigManager->hasOption($sPluginOptionName))

+        if ($this->xConfigManager->hasOption($sPluginOptionName))

         {

             return $this->xConfigManager->getOption($sPluginOptionName);

         }

@@ -90,7 +90,7 @@ 
         $sJsLibUri = rtrim($this->xConfigManager->getOption('js.lib.uri', self::JS_LIB_URL), '/') . '/';

         // Add component files to the javascript file array;

         $aJsFiles = [$sJsLibUri . 'jaxon.core' . $sJsExtension];

-        if($this->xConfigManager->getOption('core.debug.on'))

+        if ($this->xConfigManager->getOption('core.debug.on'))

         {

             $sLanguage = $this->xConfigManager->getOption('core.language');

             $aJsFiles[] = $sJsLibUri . 'jaxon.debug' . $sJsExtension;

@@ -107,7 +107,7 @@ 
      */

     public function getOptionVars(): array

     {

-        if(!$this->xConfigManager->hasOption('core.request.uri'))

+        if (!$this->xConfigManager->hasOption('core.request.uri'))

         {

             $this->xConfigManager->setOption('core.request.uri', $this->xParameterReader->uri());

         }

@@ -140,7 +140,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->xConfigManager->getOption('js.app.export', false) ||

+        if (!$this->xConfigManager->getOption('js.app.export', false) ||

             !$this->xConfigManager->getOption('js.app.uri') ||

             !$this->xConfigManager->getOption('js.app.dir'))

         {

@@ -158,7 +158,7 @@ 
      */

     public function createJsFiles(CodeGenerator $xCodeGenerator): string

     {

-        if(!$this->shallCreateJsFiles())

+        if (!$this->shallCreateJsFiles())

         {

             return '';

         }

@@ -167,7 +167,7 @@ 
         $sJsFileName = $this->xConfigManager->getOption('js.app.file') ?: $xCodeGenerator->getHash();

         $sJsDirectory = rtrim($this->xConfigManager->getOption('js.app.dir'), '\/') . DIRECTORY_SEPARATOR;

         // - The js.app.dir must be writable

-        if(!$sJsFileName || !is_dir($sJsDirectory) || !is_writable($sJsDirectory))

+        if (!$sJsFileName || !is_dir($sJsDirectory) || !is_writable($sJsDirectory))

         {

             return '';

         }

@@ -175,15 +175,15 @@ 
         $sJsFilePath = $sJsDirectory . $sJsFileName . '.js';

         $sJsMinFilePath = $sJsDirectory . $sJsFileName . '.min.js';

         $sJsFileUri = rtrim($this->xConfigManager->getOption('js.app.uri'), '/') . "/$sJsFileName";

-        if(!is_file($sJsFilePath) && !@file_put_contents($sJsFilePath, $xCodeGenerator->getJsScript()))

+        if (!is_file($sJsFilePath) && !@file_put_contents($sJsFilePath, $xCodeGenerator->getJsScript()))

         {

             return '';

         }

-        if(!$this->xConfigManager->getOption('js.app.minify', false))

+        if (!$this->xConfigManager->getOption('js.app.minify', false))

         {

             return $sJsFileUri . '.js';

         }

-        if(!is_file($sJsMinFilePath) && !$this->xMinifier->minify($sJsFilePath, $sJsMinFilePath))

+        if (!is_file($sJsMinFilePath) && !$this->xMinifier->minify($sJsFilePath, $sJsMinFilePath))

         {

             // If the file cannot be minified, return the plain js file.

             return $sJsFileUri . '.js';

src/Plugin/Response/JQuery/DomSelector.php

Spacing +6 added lines, -7 removed lines

@@ -86,12 +86,12 @@ 
      */

     private function getPath(string $jQueryNs, string $sPath, $xContext)

     {

-        if(!$sPath)

+        if (!$sPath)

         {

             // If an empty selector is given, use the event target instead

             return "$jQueryNs(e.currentTarget)";

         }

-        if(!$xContext)

+        if (!$xContext)

         {

             return "$jQueryNs('" . $sPath . "')";

         }

@@ -110,12 +110,12 @@ 
      */

     public function __call(string $sMethod, array $aArguments)

     {

-        if(count($aArguments) === 1)

+        if (count($aArguments) === 1)

         {

             // If the only parameter is a selector, and the first call

             // on that selector is a method, then the selector is a callback.

             $xArgument = $aArguments[0];

-            if(is_a($xArgument, self::class) && $xArgument->bIsCallback === null &&

+            if (is_a($xArgument, self::class) && $xArgument->bIsCallback === null &&

                 count($xArgument->aCalls) > 0 && is_a($xArgument->aCalls[0], JsCall::class))

             {

                 $xArgument->bIsCallback = true;

@@ -188,12 +188,11 @@ 
     public function getScript(): string

     {

         $sScript = $this->sPath;

-        if(count($this->aCalls) > 0)

+        if (count($this->aCalls) > 0)

         {

             $sScript .= '.' . implode('.', $this->aCalls);

         }

-        return $this->bIsCallback ? '(e) => {' . $sScript . '}' :

-            ($this->bToInt ? "parseInt($sScript)" : $sScript);

+        return $this->bIsCallback ? '(e) => {' . $sScript . '}' : ($this->bToInt ? "parseInt($sScript)" : $sScript);

     }

 

     /**

src/Plugin/Request/CallableClass/CallableObjectOptions.php

Switch Indentation +27 added lines, -27 removed lines

@@ -235,19 +235,19 @@ 
         switch($sName)

         {

         // Set the methods to call before processing the request

-        case '__before':

-            $this->setHookMethods($this->aBeforeMethods, $xValue);

-            break;

-        // Set the methods to call after processing the request

-        case '__after':

-            $this->setHookMethods($this->aAfterMethods, $xValue);

-            break;

-        // Set the attributes to inject in the callable object

-        case '__di':

-            $this->addDiOption($xValue);

-            break;

-        default:

-            break;

+            case '__before':

+                $this->setHookMethods($this->aBeforeMethods, $xValue);

+                break;

+            // Set the methods to call after processing the request

+            case '__after':

+                $this->setHookMethods($this->aAfterMethods, $xValue);

+                break;

+            // Set the attributes to inject in the callable object

+            case '__di':

+                $this->addDiOption($xValue);

+                break;

+            default:

+                break;

         }

     }

 

@@ -295,20 +295,20 @@ 
     {

         switch($sOptionName)

         {

-        case 'excluded':

-            if((bool)$xOptionValue)

-            {

-                $this->addProtectedMethods($sFunctionName);

-            }

-            break;

-        // For databags, all the value are merged in a single array.

-        case 'bags':

-            $this->_addJsArrayOption($sFunctionName, $sOptionName, $xOptionValue);

-            return;

-        // For all the other options, including callback, only the last value is kept.

-        case 'callback':

-        default:

-            $this->_setJsOption($sFunctionName, $sOptionName, $xOptionValue);

+            case 'excluded':

+                if((bool)$xOptionValue)

+                {

+                    $this->addProtectedMethods($sFunctionName);

+                }

+                break;

+            // For databags, all the value are merged in a single array.

+            case 'bags':

+                $this->_addJsArrayOption($sFunctionName, $sOptionName, $xOptionValue);

+                return;

+            // For all the other options, including callback, only the last value is kept.

+            case 'callback':

+            default:

+                $this->_setJsOption($sFunctionName, $sOptionName, $xOptionValue);

         }

     }

 

Spacing +23 added lines, -25 removed lines

@@ -81,29 +81,29 @@ 
     public function __construct(array $aOptions, array $aAnnotations)

     {

         [$bExcluded, $aAnnotationOptions, $aAnnotationProtected] = $aAnnotations;

-        $this->bExcluded = $bExcluded || (bool)($aOptions['excluded'] ?? false);

-        if($this->bExcluded)

+        $this->bExcluded = $bExcluded || (bool) ($aOptions['excluded'] ?? false);

+        if ($this->bExcluded)

         {

             return;

         }

 

         $sSeparator = $aOptions['separator'];

-        if($sSeparator === '_' || $sSeparator === '.')

+        if ($sSeparator === '_' || $sSeparator === '.')

         {

             $this->sSeparator = $sSeparator;

         }

         $this->addProtectedMethods($aOptions['protected']);

         $this->addProtectedMethods($aAnnotationProtected);

 

-        foreach($aOptions['functions'] as $sNames => $aFunctionOptions)

+        foreach ($aOptions['functions'] as $sNames => $aFunctionOptions)

         {

             $aFunctionNames = explode(',', $sNames); // Names are in comma-separated list.

-            foreach($aFunctionNames as $sFunctionName)

+            foreach ($aFunctionNames as $sFunctionName)

             {

                 $this->addFunctionOptions($sFunctionName, $aFunctionOptions);

             }

         }

-        foreach($aAnnotationOptions as $sFunctionName => $aFunctionOptions)

+        foreach ($aAnnotationOptions as $sFunctionName => $aFunctionOptions)

         {

             $this->addFunctionOptions($sFunctionName, $aFunctionOptions);

         }

@@ -116,14 +116,14 @@ 
      */

     private function addProtectedMethods($xMethods)

     {

-        if(!is_array($xMethods))

+        if (!is_array($xMethods))

         {

-            $this->aProtectedMethods[trim((string)$xMethods)] = true;

+            $this->aProtectedMethods[trim((string) $xMethods)] = true;

             return;

         }

-        foreach($xMethods as $sMethod)

+        foreach ($xMethods as $sMethod)

         {

-            $this->aProtectedMethods[trim((string)$sMethod)] = true;

+            $this->aProtectedMethods[trim((string) $sMethod)] = true;

         }

     }

 

@@ -197,17 +197,17 @@ 
      */

     private function setHookMethods(array &$aHookMethods, $xValue)

     {

-        foreach($xValue as $sCalledMethod => $xMethodToCall)

+        foreach ($xValue as $sCalledMethod => $xMethodToCall)

         {

-            if(!isset($aHookMethods[$sCalledMethod]))

+            if (!isset($aHookMethods[$sCalledMethod]))

             {

                 $aHookMethods[$sCalledMethod] = [];

             }

-            if(is_array($xMethodToCall))

+            if (is_array($xMethodToCall))

             {

                 $aHookMethods[$sCalledMethod] = array_merge($aHookMethods[$sCalledMethod], $xMethodToCall);

             }

-            elseif(is_string($xMethodToCall))

+            elseif (is_string($xMethodToCall))

             {

                 $aHookMethods[$sCalledMethod][] = $xMethodToCall;

             }

@@ -232,7 +232,7 @@ 
      */

     private function addOption(string $sName, $xValue)

     {

-        switch($sName)

+        switch ($sName)

         {

         // Set the methods to call before processing the request

         case '__before':

@@ -260,11 +260,11 @@ 
      */

     private function _addJsArrayOption(string $sFunctionName, string $sOptionName, $xOptionValue)

     {

-        if(is_string($xOptionValue))

+        if (is_string($xOptionValue))

         {

             $xOptionValue = [$xOptionValue];

         }

-        if(!is_array($xOptionValue))

+        if (!is_array($xOptionValue))

         {

             return; // Do not save.

         }

@@ -293,10 +293,10 @@ 
      */

     private function addJsOption(string $sFunctionName, string $sOptionName, $xOptionValue)

     {

-        switch($sOptionName)

+        switch ($sOptionName)

         {

         case 'excluded':

-            if((bool)$xOptionValue)

+            if ((bool) $xOptionValue)

             {

                 $this->addProtectedMethods($sFunctionName);

             }

@@ -320,12 +320,11 @@ 
      */

     private function addFunctionOptions(string $sFunctionName, array $aFunctionOptions)

     {

-        foreach($aFunctionOptions as $sOptionName => $xOptionValue)

+        foreach ($aFunctionOptions as $sOptionName => $xOptionValue)

         {

             substr($sOptionName, 0, 2) === '__' ?

                 // Options for PHP classes. They start with "__".

-                $this->addOption($sOptionName, [$sFunctionName => $xOptionValue]) :

-                // Options for javascript code.

+                $this->addOption($sOptionName, [$sFunctionName => $xOptionValue]) : // Options for javascript code.

                 $this->addJsOption($sFunctionName, $sOptionName, $xOptionValue);

         }

     }

@@ -341,12 +340,11 @@ 
         $aOptions = array_merge($this->aJsOptions['*'] ?? []); // Clone the array

         // Then add the method options.

         $aMethodOptions = $this->aJsOptions[$sMethodName] ?? [];

-        foreach($aMethodOptions as $sOptionName => $xOptionValue)

+        foreach ($aMethodOptions as $sOptionName => $xOptionValue)

         {

             // For databags, merge the values in a single array.

             // For all the other options, including callback, keep the last value.

-            $aOptions[$sOptionName] = $sOptionName !== 'bags' ? $xOptionValue :

-                array_unique(array_merge($aOptions[$sOptionName] ?? [], $xOptionValue));

+            $aOptions[$sOptionName] = $sOptionName !== 'bags' ? $xOptionValue : array_unique(array_merge($aOptions[$sOptionName] ?? [], $xOptionValue));

         }

         return $aOptions;

     }

Braces +1 added lines, -2 removed lines

@@ -206,8 +206,7 @@
             if(is_array($xMethodToCall))

             {

                 $aHookMethods[$sCalledMethod] = array_merge($aHookMethods[$sCalledMethod], $xMethodToCall);

-            }

-            elseif(is_string($xMethodToCall))

+            } elseif(is_string($xMethodToCall))

             {

                 $aHookMethods[$sCalledMethod][] = $xMethodToCall;

             }

src/Response/Response.php

Spacing +6 added lines, -6 removed lines

@@ -86,7 +86,7 @@ 
      */

     public function getOutput(): string

     {

-        if($this->getCommandCount() === 0)

+        if ($this->getCommandCount() === 0)

         {

             return '{}';

         }

@@ -175,7 +175,7 @@ 
     public function addCommand(array $aAttributes, $mData): ResponseInterface

     {

         $aAttributes = array_map(function($xAttribute) {

-            return is_integer($xAttribute) ? $xAttribute : trim((string)$xAttribute, " \t");

+            return is_integer($xAttribute) ? $xAttribute : trim((string) $xAttribute, " \t");

         }, $aAttributes);

         return $this->addRawCommand($aAttributes, $mData);

     }

@@ -194,9 +194,9 @@ 
         $mData, bool $bRemoveEmpty = false): ResponseInterface

     {

         $mData = is_array($mData) ? array_map(function($sData) {

-            return trim((string)$sData, " \t\n");

-        }, $mData) : trim((string)$mData, " \t\n");

-        if($bRemoveEmpty)

+            return trim((string) $sData, " \t\n");

+        }, $mData) : trim((string) $mData, " \t\n");

+        if ($bRemoveEmpty)

         {

             $aAttributes = array_filter($aAttributes, function($xValue) {

                 return $xValue === '';

@@ -229,7 +229,7 @@ 
     public function toPsr(): PsrResponseInterface

     {

         $xPsrResponse = $this->xPsr17Factory->createResponse(200);

-        if($this->xRequest->getMethod() === 'GET')

+        if ($this->xRequest->getMethod() === 'GET')

         {

             $xPsrResponse = $xPsrResponse

                 ->withHeader('Expires', 'Mon, 26 Jul 1997 05:00:00 GMT')