jaxon-php / jaxon-core

src/Plugin/Request/CallableDir/CallableDirPlugin.php

Spacing +6 added lines, -6 removed lines

@@ -80,7 +80,7 @@ 
     private function checkDirectory(string $sDirectory): string
     {
         $sDirectory = rtrim(trim($sDirectory), '/\\');
-        if(!is_dir($sDirectory))
+        if (!is_dir($sDirectory))
         {
             throw new SetupException($this->xTranslator->trans('errors.objects.invalid-declaration'));
         }
@@ -93,11 +93,11 @@ 
      */
     public function checkOptions(string $sCallable, $xOptions): array
     {
-        if(is_string($xOptions))
+        if (is_string($xOptions))
         {
             $xOptions = ['namespace' => $xOptions];
         }
-        if(!is_array($xOptions))
+        if (!is_array($xOptions))
         {
             throw new SetupException($this->xTranslator->trans('errors.objects.invalid-declaration'));
         }
@@ -105,14 +105,14 @@ 
         $xOptions['directory'] = $this->checkDirectory($sCallable);
         // Check the namespace
         $sNamespace = $xOptions['namespace'] ?? '';
-        if(!($xOptions['namespace'] = trim($sNamespace, ' \\')))
+        if (!($xOptions['namespace'] = trim($sNamespace, ' \\')))
         {
             $xOptions['namespace'] = '';
         }
 
         // Change the keys in $xOptions to have "\" as separator
         $_aOptions = [];
-        foreach($xOptions as $sName => $aOption)
+        foreach ($xOptions as $sName => $aOption)
         {
             $sName = trim(str_replace('.', '\\', $sName), ' \\');
             $_aOptions[$sName] = $aOption;
@@ -125,7 +125,7 @@ 
      */
     public function register(string $sType, string $sCallable, array $aOptions): bool
     {
-        if(($aOptions['namespace']))
+        if (($aOptions['namespace']))
         {
             $this->xRegistry->addNamespace($aOptions['namespace'], $aOptions);
             return true;

src/Plugin/Request/CallableClass/CallableRegistry.php

Spacing +20 added lines, -20 removed lines

@@ -89,7 +89,7 @@ 
         $this->xRepository = $xRepository;
 
         // Set the composer autoloader
-        if(file_exists(($sAutoloadFile = __DIR__ . '/../../../../../../autoload.php')) ||
+        if (file_exists(($sAutoloadFile = __DIR__ . '/../../../../../../autoload.php')) ||
             file_exists(($sAutoloadFile = __DIR__ . '/../../../../vendor/autoload.php')))
         {
             $this->xAutoloader = require($sAutoloadFile);
@@ -106,7 +106,7 @@ 
     public function addDirectory(string $sDirectory, array $aOptions)
     {
         // Set the autoload option default value
-        if(!isset($aOptions['autoload']))
+        if (!isset($aOptions['autoload']))
         {
             $aOptions['autoload'] = true;
         }
@@ -123,26 +123,26 @@ 
     public function addNamespace(string $sNamespace, array $aOptions)
     {
         // Separator default value
-        if(!isset($aOptions['separator']))
+        if (!isset($aOptions['separator']))
         {
             $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(!isset($aOptions['autoload']))
+        if (!isset($aOptions['autoload']))
         {
             $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']);
         }
@@ -157,7 +157,7 @@ 
     public function parseDirectories()
     {
         // This is to be done only once.
-        if($this->bDirectoriesParsed)
+        if ($this->bDirectoriesParsed)
         {
             return;
         }
@@ -165,14 +165,14 @@ 
 
         // Browse directories without namespaces and read all the files.
         $aClassMap = [];
-        foreach($this->xRepository->getDirectoryOptions() as $sDirectory => $aOptions)
+        foreach ($this->xRepository->getDirectoryOptions() as $sDirectory => $aOptions)
         {
             $itFile = new RecursiveIteratorIterator(new RecursiveDirectoryIterator($sDirectory));
             // 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;
                 }
@@ -180,7 +180,7 @@ 
                 $sClassName = $xFile->getBasename('.php');
                 $aClassOptions = ['timestamp' => $xFile->getMTime()];
                 // No more classmap autoloading. The file will be included when needed.
-                if(($aOptions['autoload']))
+                if (($aOptions['autoload']))
                 {
                     $aClassMap[$sClassName] = $xFile->getPathname();
                 }
@@ -188,7 +188,7 @@ 
             }
         }
         // Set classmap autoloading
-        if(($aClassMap) && $this->xAutoloader !== null)
+        if (($aClassMap) && $this->xAutoloader !== null)
         {
             $this->xAutoloader->addClassMap($aClassMap);
         }
@@ -202,7 +202,7 @@ 
     public function parseNamespaces()
     {
         // This is to be done only once.
-        if($this->bNamespacesParsed)
+        if ($this->bNamespacesParsed)
         {
             return;
         }
@@ -210,17 +210,17 @@ 
 
         // Browse directories with namespaces and read all the files.
         $sDS = DIRECTORY_SEPARATOR;
-        foreach($this->xRepository->getNamespaceOptions() as $sNamespace => $aOptions)
+        foreach ($this->xRepository->getNamespaceOptions() as $sNamespace => $aOptions)
         {
             $this->xRepository->addNamespace($sNamespace, ['separator' => $aOptions['separator']]);
 
             // Iterate on dir content
             $sDirectory = $aOptions['directory'];
             $itFile = new RecursiveIteratorIterator(new RecursiveDirectoryIterator($sDirectory));
-            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;
                 }
@@ -229,7 +229,7 @@ 
                 $sClassPath = $sNamespace;
                 $sRelativePath = substr($xFile->getPath(), strlen($sDirectory));
                 $sRelativePath = trim(str_replace($sDS, '\\', $sRelativePath), '\\');
-                if($sRelativePath !== '')
+                if ($sRelativePath !== '')
                 {
                     $sClassPath .= '\\' . $sRelativePath;
                 }
@@ -256,12 +256,12 @@ 
         // Replace all separators ('.' and '_') with antislashes, and remove the antislashes
         // at the beginning and the end of the class name.
         $sClassName = trim(str_replace('.', '\\', $sClassName), '\\');
-        if($this->bUsingUnderscore)
+        if ($this->bUsingUnderscore)
         {
             $sClassName = trim(str_replace('_', '\\', $sClassName), '\\');
         }
         // Register the class, if it wasn't already.
-        if(!$this->di->h($sClassName))
+        if (!$this->di->h($sClassName))
         {
             $this->di->registerCallableClass($sClassName, $this->xRepository->getClassOptions($sClassName));
         }

src/Plugin/Request/CallableClass/CallableRepository.php

Spacing +16 added lines, -16 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,14 +181,14 @@ 
      */
     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;
             }
         }
-        if(is_string($aClassOptions['protected']))
+        if (is_string($aClassOptions['protected']))
         {
             $aClassOptions['protected'] = [$aClassOptions['protected']]; // Convert to array.
         }
@@ -199,21 +199,21 @@ 
             $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'] = $aOptionGroup['separator'];
             }
-            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']);
             }
@@ -259,10 +259,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,
@@ -283,17 +283,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];
         }
@@ -322,9 +322,9 @@ 
     public function getCallableObjects(): array
     {
         $aCallableObjects = [];
-        foreach($this->aClasses as $sClassName => $aOptions)
+        foreach ($this->aClasses as $sClassName => $aOptions)
         {
-            if(!$this->di->h($sClassName))
+            if (!$this->di->h($sClassName))
             {
                 $this->di->registerCallableClass($sClassName, $aOptions);
             }

src/Plugin/Request/CallableClass/CallableObject.php

Switch Indentation +30 added lines, -30 removed lines

@@ -207,36 +207,36 @@
         switch($sName)
         {
         // Set the separator
-        case 'separator':
-            if($xValue === '_' || $xValue === '.')
-            {
-                $this->sSeparator = $xValue;
-            }
-            break;
-        // Set the protected methods
-        case 'protected':
-            if(is_array($xValue))
-            {
-                $this->aProtectedMethods = array_merge($this->aProtectedMethods, $xValue);
-            }
-            break;
-        // 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->aAttributes = array_merge($this->aAttributes, $xValue);
-            break;
-        case 'excluded':
-            $this->bExcluded = (bool)$xValue;
-            break;
-        default:
-            break;
+            case 'separator':
+                if($xValue === '_' || $xValue === '.')
+                {
+                    $this->sSeparator = $xValue;
+                }
+                break;
+            // Set the protected methods
+            case 'protected':
+                if(is_array($xValue))
+                {
+                    $this->aProtectedMethods = array_merge($this->aProtectedMethods, $xValue);
+                }
+                break;
+            // 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->aAttributes = array_merge($this->aAttributes, $xValue);
+                break;
+            case 'excluded':
+                $this->bExcluded = (bool)$xValue;
+                break;
+            default:
+                break;
         }
     }
 

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];
             }

Spacing +15 added lines, -15 removed lines

@@ -193,13 +193,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];
             }
@@ -216,18 +216,18 @@ 
      */
     public function configure(string $sName, $xValue)
     {
-        switch($sName)
+        switch ($sName)
         {
         // Set the separator
         case 'separator':
-            if($xValue === '_' || $xValue === '.')
+            if ($xValue === '_' || $xValue === '.')
             {
                 $this->sSeparator = $xValue;
             }
             break;
         // Set the protected methods
         case 'protected':
-            if(is_array($xValue))
+            if (is_array($xValue))
             {
                 $this->aProtectedMethods = array_merge($this->aProtectedMethods, $xValue);
             }
@@ -245,7 +245,7 @@ 
             $this->aAttributes = array_merge($this->aAttributes, $xValue);
             break;
         case 'excluded':
-            $this->bExcluded = (bool)$xValue;
+            $this->bExcluded = (bool) $xValue;
             break;
         default:
             break;
@@ -295,16 +295,16 @@ 
      */
     private function getOptionValue(array $aCommonOptions, array $aMethodOptions, string $sOptionName)
     {
-        if(!isset($aCommonOptions[$sOptionName]))
+        if (!isset($aCommonOptions[$sOptionName]))
         {
             return $aMethodOptions[$sOptionName];
         }
-        if(!isset($aMethodOptions[$sOptionName]))
+        if (!isset($aMethodOptions[$sOptionName]))
         {
             return $aCommonOptions[$sOptionName];
         }
         // If both are not arrays, return the latest.
-        if(!is_array($aCommonOptions[$sOptionName]) && !is_array($aMethodOptions[$sOptionName]))
+        if (!is_array($aCommonOptions[$sOptionName]) && !is_array($aMethodOptions[$sOptionName]))
         {
             return $aMethodOptions[$sOptionName];
         }
@@ -328,7 +328,7 @@ 
         $aMethodOptions = isset($this->aOptions[$sMethodName]) ? $this->aOptions[$sMethodName] : [];
         $aOptionNames = array_unique(array_merge(array_keys($aCommonOptions), array_keys($aMethodOptions)));
         $aOptions = [];
-        foreach($aOptionNames as $sOptionName)
+        foreach ($aOptionNames as $sOptionName)
         {
             $aOptions[$sOptionName] = $this->getOptionValue($aCommonOptions, $aMethodOptions, $sOptionName);
         }
@@ -412,11 +412,11 @@ 
         // $aMethods = $aHookMethods[$sMethod] ?? $aHookMethods['*'] ?? [];
         // 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];
@@ -457,7 +457,7 @@ 
         // $aAttributes = $this->aAttributes[$sMethod] ?? $this->aAttributes['*'] ?? [];
         // The attributes defined at method level are merged with those defined at class level.
         $aAttributes = array_merge($this->aAttributes['*'] ?? [], $this->aAttributes[$sMethod] ?? []);
-        foreach($aAttributes as $sName => $sClass)
+        foreach ($aAttributes as $sName => $sClass)
         {
             // Set the protected attributes of the object
             $cSetter = function($c) use($sName, $sClass) {
@@ -469,7 +469,7 @@ 
         }
 
         // Set the Jaxon request target in the helper
-        if($this->xRegisteredObject instanceof CallableClass)
+        if ($this->xRegisteredObject instanceof CallableClass)
         {
             // Set the protected attributes of the object
             $cSetter = function() use($xTarget) {

src/Plugin/Response/DataBag/DataBagPlugin.php

Spacing +4 added lines, -5 removed lines

@@ -39,7 +39,7 @@ 
      */
     public function setDataBag()
     {
-        if($this->xDataBag !== null)
+        if ($this->xDataBag !== null)
         {
             return;
         }
@@ -48,8 +48,7 @@ 
         $aBody = $xRequest->getParsedBody();
         $aParams = $xRequest->getQueryParams();
         $aData = is_array($aBody) ?
-            $this->readData($aBody['jxnbags'] ?? []) :
-            $this->readData($aParams['jxnbags'] ?? []);
+            $this->readData($aBody['jxnbags'] ?? []) : $this->readData($aParams['jxnbags'] ?? []);
         $this->xDataBag = new DataBag($aData);
     }
 
@@ -69,7 +68,7 @@ 
     private function readData($xData): array
     {
         // Todo: clean input data.
-        if(is_string($xData))
+        if (is_string($xData))
         {
             return json_decode($xData, true) ?: [];
         }
@@ -105,7 +104,7 @@ 
     public function writeCommand()
     {
         $this->setDataBag();
-        if($this->xDataBag->touched())
+        if ($this->xDataBag->touched())
         {
             $this->addCommand(['cmd' => 'bags.set'], $this->xDataBag->getAll());
         }

src/Plugin/Response/Dialog/DialogPlugin.php

Spacing +1 added lines, -1 removed lines

@@ -126,7 +126,7 @@
      */
     private function getLibraries(): array
     {
-        if($this->aLibraries === null)
+        if ($this->aLibraries === null)
         {
             $this->aLibraries = $this->xLibraryManager->getLibraries();
         }

src/Plugin/Response/JQuery/DomSelector.php

Braces +2 added lines, -4 removed lines

@@ -63,12 +63,10 @@
         if(!$sPath)
         {
             $this->sPath = "$jQueryNs(this)"; // If an empty selector is given, use javascript "this" instead
-        }
-        elseif(($sContext))
+        } elseif(($sContext))
         {
             $this->sPath = "$jQueryNs('" . $sPath . "', $jQueryNs('" . $sContext . "'))";
-        }
-        else
+        } else
         {
             $this->sPath = "$jQueryNs('" . $sPath . "')";
         }

Spacing +3 added lines, -3 removed lines

@@ -67,11 +67,11 @@ 
         $sContext = trim($sContext, " \t");
         $this->aCalls = [];
 
-        if(!$sPath)
+        if (!$sPath)
         {
             $this->sPath = "$jQueryNs(this)"; // If an empty selector is given, use javascript "this" instead
         }
-        elseif(($sContext))
+        elseif (($sContext))
         {
             $this->sPath = "$jQueryNs('" . $sPath . "', $jQueryNs('" . $sContext . "'))";
         }
@@ -145,7 +145,7 @@ 
     public function getScript(): string
     {
         $sScript = $this->sPath;
-        if(count($this->aCalls) > 0)
+        if (count($this->aCalls) > 0)
         {
             $sScript .= '.' . implode('.', $this->aCalls);
         }

src/Plugin/Response/JQuery/JQueryPlugin.php

Spacing +1 added lines, -1 removed lines

@@ -87,7 +87,7 @@
     public function selector(string $sPath = '', string $sContext = ''): DomSelector
     {
         $xSelector = new DomSelector($this->jQueryNs, $sPath, $sContext);
-        if($this->bCommand && $this->response() !== null)
+        if ($this->bCommand && $this->response() !== null)
         {
             $this->addCommand(['cmd' => 'jquery'], $xSelector);
         }

src/Plugin/Manager/PackageManager.php

Spacing +15 added lines, -15 removed lines

@@ -85,28 +85,28 @@ 
     private function updateContainer(Config $xConfig)
     {
         $aOptions = $xConfig->getOption('container.set', []);
-        foreach($aOptions as $xKey => $xValue)
+        foreach ($aOptions as $xKey => $xValue)
         {
             // The key is the class name. It must be a string.
-            $this->di->set((string)$xKey, $xValue);
+            $this->di->set((string) $xKey, $xValue);
         }
         $aOptions = $xConfig->getOption('container.val', []);
-        foreach($aOptions as $xKey => $xValue)
+        foreach ($aOptions as $xKey => $xValue)
         {
             // The key is the class name. It must be a string.
-            $this->di->val((string)$xKey, $xValue);
+            $this->di->val((string) $xKey, $xValue);
         }
         $aOptions = $xConfig->getOption('container.auto', []);
-        foreach($aOptions as $xValue)
+        foreach ($aOptions as $xValue)
         {
             // The key is the class name. It must be a string.
-            $this->di->auto((string)$xValue);
+            $this->di->auto((string) $xValue);
         }
         $aOptions = $xConfig->getOption('container.alias', []);
-        foreach($aOptions as $xKey => $xValue)
+        foreach ($aOptions as $xKey => $xValue)
         {
             // The key is the class name. It must be a string.
-            $this->di->alias((string)$xKey, (string)$xValue);
+            $this->di->alias((string) $xKey, (string) $xValue);
         }
     }
 
@@ -121,14 +121,14 @@ 
      */
     private function registerCallables(array $aOptions, string $sCallableType)
     {
-        foreach($aOptions as $xKey => $xValue)
+        foreach ($aOptions as $xKey => $xValue)
         {
-            if(is_integer($xKey) && is_string($xValue))
+            if (is_integer($xKey) && is_string($xValue))
             {
                 // Register a function without options
                 $this->xPluginManager->registerCallable($sCallableType, $xValue);
             }
-            elseif(is_string($xKey) && (is_array($xValue) || is_string($xValue)))
+            elseif (is_string($xKey) && (is_array($xValue) || is_string($xValue)))
             {
                 // Register a function with options
                 $this->xPluginManager->registerCallable($sCallableType, $xKey, $xValue);
@@ -171,12 +171,12 @@ 
     {
         // $this->aPackages contains packages config file paths.
         $aLibOptions = $sClassName::config();
-        if(is_string($aLibOptions))
+        if (is_string($aLibOptions))
         {
             // A string is supposed to be the path to a config file.
             $aLibOptions = $this->xConfigManager->read($aLibOptions);
         }
-        elseif(!is_array($aLibOptions))
+        elseif (!is_array($aLibOptions))
         {
             // Otherwise, anything else than an array is not accepted.
             $sMessage = $this->xTranslator->trans('errors.register.invalid', ['name' => $sClassName]);
@@ -197,7 +197,7 @@ 
     public function registerPackage(string $sClassName, array $aUserOptions)
     {
         $sClassName = trim($sClassName, '\\ ');
-        if(!is_subclass_of($sClassName, Package::class))
+        if (!is_subclass_of($sClassName, Package::class))
         {
             $sMessage = $this->xTranslator->trans('errors.register.invalid', ['name' => $sClassName]);
             throw new SetupException($sMessage);
@@ -241,7 +241,7 @@ 
 
         // Register packages
         $aPackageConfig = $xAppConfig->getOption('packages', []);
-        foreach($aPackageConfig as $sClassName => $aPkgOptions)
+        foreach ($aPackageConfig as $sClassName => $aPkgOptions)
         {
             $this->registerPackage($sClassName, $aPkgOptions);
         }

Braces +2 added lines, -4 removed lines

@@ -127,8 +127,7 @@ 
             {
                 // Register a function without options
                 $this->xPluginManager->registerCallable($sCallableType, $xValue);
-            }
-            elseif(is_string($xKey) && (is_array($xValue) || is_string($xValue)))
+            } elseif(is_string($xKey) && (is_array($xValue) || is_string($xValue)))
             {
                 // Register a function with options
                 $this->xPluginManager->registerCallable($sCallableType, $xKey, $xValue);
@@ -175,8 +174,7 @@ 
         {
             // A string is supposed to be the path to a config file.
             $aLibOptions = $this->xConfigManager->read($aLibOptions);
-        }
-        elseif(!is_array($aLibOptions))
+        } elseif(!is_array($aLibOptions))
         {
             // Otherwise, anything else than an array is not accepted.
             $sMessage = $this->xTranslator->trans('errors.register.invalid', ['name' => $sClassName]);