jaxon-php / jaxon-core

src/Di/Traits/RegisterTrait.php

Braces +4 added lines, -3 removed lines

@@ -111,10 +111,12 @@ 
         $sReflectionClass = $sClassName . '_ReflectionClass';
 
         // Prevent duplication
-        if($this->h($sReflectionClass)) // It's important not to use the class name here.
+        if($this->h($sReflectionClass)) {
+            // It's important not to use the class name here.
         {
             return;
         }
+        }
 
         // Make sure the registered class exists
         if(isset($aOptions['include']))
@@ -125,8 +127,7 @@ 
         try
         {
             $this->val($sReflectionClass, new ReflectionClass($sClassName));
-        }
-        catch(ReflectionException $e)
+        } catch(ReflectionException $e)
         {
             $xTranslator = $this->g(Translator::class);
             $sMessage = $xTranslator->trans('errors.class.invalid', ['name' => $sClassName]);

Spacing +9 added lines, -9 removed lines

@@ -33,7 +33,7 @@ 
      */
     private function setDiAttributes($xRegisteredObject, array $aDiOptions)
     {
-        foreach($aDiOptions as $sName => $sClass)
+        foreach ($aDiOptions as $sName => $sClass)
         {
             // Set the protected attributes of the object
             $cSetter = function($xInjectedObject) use($sName) {
@@ -63,7 +63,7 @@ 
         $this->setDiAttributes($xRegisteredObject, $aDiOptions);
 
         // Set the Jaxon request target in the helper
-        if($xRegisteredObject instanceof CallableClass)
+        if ($xRegisteredObject instanceof CallableClass)
         {
             // Set the protected attributes of the object
             $cSetter = function() use($xTarget) {
@@ -91,13 +91,13 @@ 
         $sReflectionClass = $sClassName . '_ReflectionClass';
 
         // Prevent duplication
-        if($this->h($sReflectionClass)) // It's important not to use the class name here.
+        if ($this->h($sReflectionClass)) // It's important not to use the class name here.
         {
             return;
         }
 
         // Make sure the registered class exists
-        if(isset($aOptions['include']))
+        if (isset($aOptions['include']))
         {
             require_once($aOptions['include']);
         }
@@ -106,7 +106,7 @@ 
         {
             $this->val($sReflectionClass, new ReflectionClass($sClassName));
         }
-        catch(ReflectionException $e)
+        catch (ReflectionException $e)
         {
             $xTranslator = $this->g(Translator::class);
             $sMessage = $xTranslator->trans('errors.class.invalid', ['name' => $sClassName]);
@@ -130,7 +130,7 @@ 
         });
 
         // Register the user class, but only if the user didn't already.
-        if(!$this->h($sClassName))
+        if (!$this->h($sClassName))
         {
             $this->set($sClassName, function($di) use($sReflectionClass) {
                 return $this->make($di->g($sReflectionClass));
@@ -139,7 +139,7 @@ 
         // Initialize the user class instance
         $this->xLibContainer->extend($sClassName, function($xRegisteredObject)
             use($sCallableObject, $sClassName) {
-            if($xRegisteredObject instanceof CallableClass)
+            if ($xRegisteredObject instanceof CallableClass)
             {
                 $cSetter = function($di) use($sClassName) {
                     // Set the protected attributes of the object
@@ -152,7 +152,7 @@ 
 
             // Run the callbacks for class initialisation
             $aCallbacks = $this->g(CallbackManager::class)->getInitCallbacks();
-            foreach($aCallbacks as $xCallback)
+            foreach ($aCallbacks as $xCallback)
             {
                 call_user_func($xCallback, $xRegisteredObject);
             }
@@ -204,7 +204,7 @@ 
     public function registerPackage(string $sClassName, Config $xPkgConfig)
     {
         // Register the user class, but only if the user didn't already.
-        if(!$this->h($sClassName))
+        if (!$this->h($sClassName))
         {
             $this->set($sClassName, function() use($sClassName) {
                 return $this->make($sClassName);

src/Request/Call/Parameter.php

Spacing +9 added lines, -9 removed lines

@@ -134,23 +134,23 @@ 
      */
     public static function make($xValue): ParameterInterface
     {
-        if($xValue instanceof ParameterInterface)
+        if ($xValue instanceof ParameterInterface)
         {
             return $xValue;
         }
-        if(is_numeric($xValue))
+        if (is_numeric($xValue))
         {
             return new Parameter(self::NUMERIC_VALUE, $xValue);
         }
-        if(is_string($xValue))
+        if (is_string($xValue))
         {
             return new Parameter(self::QUOTED_VALUE, $xValue);
         }
-        if(is_bool($xValue))
+        if (is_bool($xValue))
         {
             return new Parameter(self::BOOL_VALUE, $xValue);
         }
-        if($xValue instanceof JsCall)
+        if ($xValue instanceof JsCall)
         {
             return new Parameter(self::JS_CALL, $xValue);
         }
@@ -252,7 +252,7 @@ 
      */
     protected function getNumericValueScript(): string
     {
-        return (string)$this->xValue;
+        return (string) $this->xValue;
     }
 
     /**
@@ -262,7 +262,7 @@ 
      */
     protected function getUnquotedValueScript(): string
     {
-        return (string)$this->xValue;
+        return (string) $this->xValue;
     }
 
     /**
@@ -284,7 +284,7 @@ 
      */
     protected function getPageNumberScript(): string
     {
-        return (string)$this->xValue;
+        return (string) $this->xValue;
     }
 
     /**
@@ -305,7 +305,7 @@ 
     public function getScript(): string
     {
         $sMethodName = 'get' . $this->sType . 'Script';
-        if(!method_exists($this, $sMethodName))
+        if (!method_exists($this, $sMethodName))
         {
             return '';
         }

src/Request/Call/Call.php

Spacing +12 added lines, -13 removed lines

@@ -79,18 +79,18 @@ 
      */
     private function makePhrase(array $aArgs): string
     {
-        if(empty($aArgs))
+        if (empty($aArgs))
         {
             return '';
         }
         // The first array entry is the message.
         $sPhrase = array_shift($aArgs);
-        if(empty($aArgs))
+        if (empty($aArgs))
         {
             return $sPhrase;
         }
         $nParamId = 1;
-        foreach($aArgs as &$xParameter)
+        foreach ($aArgs as &$xParameter)
         {
             $xParameter = "'$nParamId':" . $xParameter->getScript();
             $nParamId++;
@@ -105,7 +105,7 @@ 
      */
     private function makeMessage(): string
     {
-        if(!($sPhrase = $this->makePhrase($this->aMessageArgs)))
+        if (!($sPhrase = $this->makePhrase($this->aMessageArgs)))
         {
             return '';
         }
@@ -124,16 +124,15 @@ 
     {
         $sMessageScript = $this->makeMessage();
         $sScript = parent::getScript();
-        if($this->bConfirm)
+        if ($this->bConfirm)
         {
             $sConfirmPhrase = $this->makePhrase($this->aConfirmArgs);
             $sScript = $this->xDialogLibraryManager->getQuestionLibrary()
                 ->confirm($sConfirmPhrase, $sScript, $sMessageScript);
         }
-        if($this->sCondition !== '')
+        if ($this->sCondition !== '')
         {
-            $sScript = empty($sMessageScript) ? 'if(' . $this->sCondition . '){' . $sScript . ';}' :
-                'if(' . $this->sCondition . '){' . $sScript . ';}else{' . $sMessageScript . ';}';
+            $sScript = empty($sMessageScript) ? 'if(' . $this->sCondition . '){' . $sScript . ';}' : 'if(' . $this->sCondition . '){' . $sScript . ';}else{' . $sMessageScript . ';}';
         }
         return $this->sVars . $sScript;
     }
@@ -145,9 +144,9 @@ 
      */
     public function hasPageNumber(): bool
     {
-        foreach($this->aParameters as $xParameter)
+        foreach ($this->aParameters as $xParameter)
         {
-            if($xParameter->getType() === Parameter::PAGE_NUMBER)
+            if ($xParameter->getType() === Parameter::PAGE_NUMBER)
             {
                 return true;
             }
@@ -165,9 +164,9 @@ 
     public function setPageNumber(int $nPageNumber): Call
     {
         // Set the value of the Parameter::PAGE_NUMBER parameter
-        foreach($this->aParameters as $xParameter)
+        foreach ($this->aParameters as $xParameter)
         {
-            if($xParameter->getType() === Parameter::PAGE_NUMBER)
+            if ($xParameter->getType() === Parameter::PAGE_NUMBER)
             {
                 $xParameter->setValue($nPageNumber);
                 break;
@@ -188,7 +187,7 @@ 
     public function pg(int $nCurrentPage, int $nItemsPerPage, int $nItemsTotal): Paginator
     {
         // Append the page number to the parameter list, if not yet given.
-        if(!$this->hasPageNumber())
+        if (!$this->hasPageNumber())
         {
             $this->addParameter(Parameter::PAGE_NUMBER, 0);
         }

src/Request/Call/JsCall.php

Spacing +1 added lines, -1 removed lines

@@ -121,7 +121,7 @@
      */
     public function addParameters(array $aParameters): JsCall
     {
-        foreach($aParameters as $xParameter)
+        foreach ($aParameters as $xParameter)
         {
             $this->pushParameter(Parameter::make($xParameter));
         }

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/Code/CodeGenerator.php

Spacing +11 added lines, -11 removed lines

@@ -115,7 +115,7 @@ 
      */
     public function addCodeGenerator(string $sClassName, int $nPriority)
     {
-        while(isset($this->aCodeGenerators[$nPriority]))
+        while (isset($this->aCodeGenerators[$nPriority]))
         {
             $nPriority++;
         }
@@ -158,7 +158,7 @@ 
     private function generatePluginCodes(string $sClassName)
     {
         $xGenerator = $this->di->g($sClassName);
-        if(!is_subclass_of($xGenerator, Plugin::class) || $this->xAssetManager->shallIncludeAssets($xGenerator))
+        if (!is_subclass_of($xGenerator, Plugin::class) || $this->xAssetManager->shallIncludeAssets($xGenerator))
         {
             // HTML tags for CSS
             $this->sCss = trim($this->sCss) . "\n" . trim($xGenerator->getCss(), " \n");
@@ -167,7 +167,7 @@ 
         }
         // Javascript code
         $this->sJsScript = trim($this->sJsScript) . "\n\n" . trim($xGenerator->getScript(), " \n");
-        if($xGenerator->readyEnabled())
+        if ($xGenerator->readyEnabled())
         {
             $sScriptAttr = $xGenerator->readyInlined() ? 'sJsInlineScript' : 'sJsReadyScript';
             $this->$sScriptAttr = trim($this->$sScriptAttr) . "\n\n" . trim($xGenerator->getReadyScript(), " \n");
@@ -186,11 +186,11 @@ 
         $this->sJsScript = trim($this->sJsScript, " \n");
         $this->sJsReadyScript = trim($this->sJsReadyScript, " \n");
         $this->sJsInlineScript = trim($this->sJsInlineScript, " \n");
-        if(($this->sJsReadyScript))
+        if (($this->sJsReadyScript))
         {
             $this->sJsReadyScript = $this->render('ready.js', ['sScript' => $this->sJsReadyScript . "\n"]);
         }
-        if(($this->sJsInlineScript))
+        if (($this->sJsInlineScript))
         {
             $this->sJsInlineScript = $this->render('ready.js', ['sScript' => $this->sJsInlineScript . "\n"]);
         }
@@ -207,7 +207,7 @@ 
      */
     private function generateCodes()
     {
-        if($this->bGenerated)
+        if ($this->bGenerated)
         {
             return;
         }
@@ -217,7 +217,7 @@ 
 
         $this->xAssetManager = $this->di->getAssetManager();
         $this->sJsOptions = $this->xAssetManager->getJsOptions();
-        foreach($this->aCodeGenerators as $sClassName)
+        foreach ($this->aCodeGenerators as $sClassName)
         {
             $this->generatePluginCodes($sClassName);
         }
@@ -229,7 +229,7 @@ 
             trim($this->sJsScript) . "\n\n" . trim($this->sJsReadyScript);
         // For js lib versions prior to 4.0, register the redirect command.
         $sJsLibVersion = $this->di->getJsLibVersion();
-        if((int)$sJsLibVersion[0] < 4)
+        if ((int) $sJsLibVersion[0] < 4)
         {
             $this->sJsScript .= '
 
@@ -296,16 +296,16 @@ 
     {
         $this->generateCodes();
         $sScript = '';
-        if(($bIncludeCss))
+        if (($bIncludeCss))
         {
             $sScript .= $this->getCss() . "\n";
         }
-        if(($bIncludeJs))
+        if (($bIncludeJs))
         {
             $sScript .= $this->getJs() . "\n";
         }
 
-        if(!($sUrl = $this->xAssetManager->createJsFiles($this)))
+        if (!($sUrl = $this->xAssetManager->createJsFiles($this)))
         {
             return trim($sScript) . "\n\n" . $this->render('wrapper.js',
                 ['sScript' => trim($this->sJsScript) . "\n\n" . trim($this->sJsInlineScript)]);

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/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')

src/Plugin/Request/CallableClass/CallableObjectOptions.php

Braces +1 added lines, -2 removed lines

@@ -186,8 +186,7 @@
             if(is_array($xMethodToCall))
             {
                 $aHookMethods[$sCalledMethod] = $xMethodToCall;
-            }
-            elseif(is_string($xMethodToCall))
+            } elseif(is_string($xMethodToCall))
             {
                 $aHookMethods[$sCalledMethod] = [$xMethodToCall];
             }

Switch Indentation +27 added lines, -27 removed lines

@@ -231,19 +231,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;
         }
     }
 
@@ -291,20 +291,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 +22 added lines, -24 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,13 +197,13 @@ 
      */
     private function setHookMethods(array &$aHookMethods, $xValue)
     {
-        foreach($xValue as $sCalledMethod => $xMethodToCall)
+        foreach ($xValue as $sCalledMethod => $xMethodToCall)
         {
-            if(is_array($xMethodToCall))
+            if (is_array($xMethodToCall))
             {
                 $aHookMethods[$sCalledMethod] = $xMethodToCall;
             }
-            elseif(is_string($xMethodToCall))
+            elseif (is_string($xMethodToCall))
             {
                 $aHookMethods[$sCalledMethod] = [$xMethodToCall];
             }
@@ -228,7 +228,7 @@ 
      */
     private function addOption(string $sName, $xValue)
     {
-        switch($sName)
+        switch ($sName)
         {
         // Set the methods to call before processing the request
         case '__before':
@@ -256,11 +256,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.
         }
@@ -289,10 +289,10 @@ 
      */
     private function addJsOption(string $sFunctionName, string $sOptionName, $xOptionValue)
     {
-        switch($sOptionName)
+        switch ($sOptionName)
         {
         case 'excluded':
-            if((bool)$xOptionValue)
+            if ((bool) $xOptionValue)
             {
                 $this->addProtectedMethods($sFunctionName);
             }
@@ -316,12 +316,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);
         }
     }
@@ -337,12 +336,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;
     }