jaxon-php / jaxon-core

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/App/Dialog/Library/DialogLibraryHelper.php

Spacing +8 added lines, -8 removed lines

@@ -136,18 +136,18 @@ 
         $aOptions = $this->getOptionNames($sKeyPrefix);
         $sSpaces = str_repeat(' ', $nSpaces);
         $sScript = '';
-        foreach($aOptions as $sShortName => $sFullName)
+        foreach ($aOptions as $sShortName => $sFullName)
         {
             $value = $this->xConfigManager->getOption($sFullName);
-            if(is_string($value))
+            if (is_string($value))
             {
                 $value = "'$value'";
             }
-            elseif(is_bool($value))
+            elseif (is_bool($value))
             {
                 $value = ($value ? 'true' : 'false');
             }
-            elseif(!is_numeric($value))
+            elseif (!is_numeric($value))
             {
                 $value = json_encode($value);
             }
@@ -175,10 +175,10 @@ 
      */
     public function getJsCode(string $sFile): string
     {
-        if($this->hasOption('assets.js'))
+        if ($this->hasOption('assets.js'))
         {
             // If this expression evaluates to false, then the asset is not displayed.
-            if(!($sUri = $this->getOption('assets.js')))
+            if (!($sUri = $this->getOption('assets.js')))
             {
                 return '';
             }
@@ -200,10 +200,10 @@ 
      */
     public function getCssCode(string $sFile): string
     {
-        if($this->hasOption('assets.css'))
+        if ($this->hasOption('assets.css'))
         {
             // If this expression evaluates to false, then the asset is not displayed.
-            if(!($sUri = $this->getOption('assets.css')))
+            if (!($sUri = $this->getOption('assets.css')))
             {
                 return '';
             }

Braces +4 added lines, -8 removed lines

@@ -142,12 +142,10 @@ 
             if(is_string($value))
             {
                 $value = "'$value'";
-            }
-            elseif(is_bool($value))
+            } elseif(is_bool($value))
             {
                 $value = ($value ? 'true' : 'false');
-            }
-            elseif(!is_numeric($value))
+            } elseif(!is_numeric($value))
             {
                 $value = json_encode($value);
             }
@@ -182,8 +180,7 @@ 
             {
                 return '';
             }
-        }
-        else
+        } else
         {
             $sUri = $this->sUri . '/' . ($this->sSubDir ? $this->sSubDir . '/' : '') .
                 ($this->sVersion ? $this->sVersion . '/' : '') . $sFile;
@@ -207,8 +204,7 @@ 
             {
                 return '';
             }
-        }
-        else
+        } else
         {
             $sUri = $this->sUri . '/' . ($this->sSubDir ? $this->sSubDir . '/' : '') .
                 ($this->sVersion ? $this->sVersion . '/' : '') . $sFile;

src/Plugin/Request/CallableClass/CallableRegistry.php

Spacing +19 added lines, -19 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 custom 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,7 +256,7 @@ 
         // 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), '\\');
         }

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 +8 added lines, -8 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
@@ -212,7 +212,7 @@ 
         $sPkgConfigKey = $this->getPackageConfigKey($sClassName);
         $this->val($sPkgConfigKey, $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/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/Plugin/Request/CallableClass/CallableObjectOptions.php

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 +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/Di/Container.php

Indentation +2 added lines, -2 removed lines

@@ -214,7 +214,7 @@ 
      */
     public function set(string $sClass, Closure $xClosure)
     {
-       $this->xLibContainer->offsetSet($sClass, function() use($xClosure) {
+        $this->xLibContainer->offsetSet($sClass, function() use($xClosure) {
             return $xClosure($this);
         });
     }
@@ -229,7 +229,7 @@ 
      */
     public function val(string $sKey, $xValue)
     {
-       $this->xLibContainer->offsetSet($sKey, $xValue);
+        $this->xLibContainer->offsetSet($sKey, $xValue);
     }
 
     /**

Spacing +9 added lines, -9 removed lines

@@ -157,7 +157,7 @@ 
      */
     public function has(string $sClass): bool
     {
-        if($this->xAppContainer != null && $this->xAppContainer->has($sClass))
+        if ($this->xAppContainer != null && $this->xAppContainer->has($sClass))
         {
             return true;
         }
@@ -188,13 +188,13 @@ 
     {
         try
         {
-            if($this->xAppContainer != null && $this->xAppContainer->has($sClass))
+            if ($this->xAppContainer != null && $this->xAppContainer->has($sClass))
             {
                 return $this->xAppContainer->get($sClass);
             }
             return $this->xLibContainer->offsetGet($sClass);
         }
-        catch(Exception|Throwable $e)
+        catch (Exception | Throwable $e)
         {
             $xLogger = $this->g(LoggerInterface::class);
             $xTranslator = $this->g(Translator::class);
@@ -258,15 +258,15 @@ 
     {
         $xType = $xParameter->getType();
         // Check the parameter class first.
-        if($xType instanceof ReflectionNamedType)
+        if ($xType instanceof ReflectionNamedType)
         {
             // Check the class + the name
-            if($this->has($xType->getName() . ' $' . $xParameter->getName()))
+            if ($this->has($xType->getName() . ' $' . $xParameter->getName()))
             {
                 return $this->get($xType->getName() . ' $' . $xParameter->getName());
             }
             // Check the class only
-            if($this->get($xType->getName()))
+            if ($this->get($xType->getName()))
             {
                 return $this->get($xType->getName());
             }
@@ -286,16 +286,16 @@ 
      */
     public function make($xClass)
     {
-        if(is_string($xClass))
+        if (is_string($xClass))
         {
             $xClass = new ReflectionClass($xClass); // Create the reflection class instance
         }
-        if(!($xClass instanceof ReflectionClass))
+        if (!($xClass instanceof ReflectionClass))
         {
             return null;
         }
         // Use the Reflection class to get the parameters of the constructor
-        if(($constructor = $xClass->getConstructor()) === null)
+        if (($constructor = $xClass->getConstructor()) === null)
         {
             return $xClass->newInstance();
         }

Braces +1 added lines, -2 removed lines

@@ -193,8 +193,7 @@
                 return $this->xAppContainer->get($sClass);
             }
             return $this->xLibContainer->offsetGet($sClass);
-        }
-        catch(Exception|Throwable $e)
+        } catch(Exception|Throwable $e)
         {
             $xLogger = $this->g(LoggerInterface::class);
             $xTranslator = $this->g(Translator::class);