jaxon-php / jaxon-core

src/Response/Response.php

Spacing +7 added lines, -7 removed lines

@@ -86,7 +86,7 @@ 
      */
     public function getOutput(): string
     {
-        if($this->getCommandCount() === 0)
+        if ($this->getCommandCount() === 0)
         {
             return '';
         }
@@ -145,7 +145,7 @@ 
      */
     public function bag(string $sName): DataBagContext
     {
-        return $this->plugin('bags')->bag($sName);;
+        return $this->plugin('bags')->bag($sName); ;
     }
 
     /**
@@ -159,7 +159,7 @@ 
     public function addCommand(array $aAttributes, $mData): Response
     {
         $aAttributes = array_map(function($xAttribute) {
-            return is_integer($xAttribute) ? $xAttribute : trim((string)$xAttribute, " \t");
+            return is_integer($xAttribute) ? $xAttribute : trim((string) $xAttribute, " \t");
         }, $aAttributes);
         $aAttributes['data'] = $mData;
         $this->aCommands[] = $aAttributes;
@@ -179,9 +179,9 @@ 
     protected function _addCommand(string $sName, array $aAttributes, $mData, bool $bRemoveEmpty = false): Response
     {
         $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 === '';
@@ -214,7 +214,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/Response/Manager/ResponseManager.php

Spacing +8 added lines, -9 removed lines

@@ -79,7 +79,7 @@ 
      */
     public function clear()
     {
-        if($this->xResponse !== null)
+        if ($this->xResponse !== null)
         {
             $this->xResponse->clearCommands();
         }
@@ -93,7 +93,7 @@ 
      */
     public function getResponse(): ResponseInterface
     {
-        if(!$this->xResponse)
+        if (!$this->xResponse)
         {
             $this->xResponse = $this->di->getResponse();
         }
@@ -114,21 +114,21 @@ 
      */
     public function append(ResponseInterface $xResponse)
     {
-        if(!$this->xResponse)
+        if (!$this->xResponse)
         {
             $this->xResponse = $this->di->getResponse();
         }
-        if($this->xResponse->getCommandCount() === 0)
+        if ($this->xResponse->getCommandCount() === 0)
         {
             $this->xResponse = $xResponse;
             return;
         }
-        if(get_class($this->xResponse) !== get_class($xResponse))
+        if (get_class($this->xResponse) !== get_class($xResponse))
         {
             throw new RequestException($this->xTranslator->trans('errors.mismatch.types',
                 ['class' => get_class($xResponse)]));
         }
-        if($this->xResponse !== $xResponse)
+        if ($this->xResponse !== $xResponse)
         {
             $this->xResponse->appendResponse($xResponse);
         }
@@ -169,7 +169,7 @@ 
      */
     public function printDebug()
     {
-        foreach($this->aDebugMessages as $sMessage)
+        foreach ($this->aDebugMessages as $sMessage)
         {
             $this->getResponse()->debug($sMessage);
         }
@@ -183,8 +183,7 @@ 
      */
     public function getContentType(): string
     {
-        return empty($this->sCharacterEncoding) ? $this->getResponse()->getContentType() :
-            $this->getResponse()->getContentType() . '; charset="' . $this->sCharacterEncoding . '"';
+        return empty($this->sCharacterEncoding) ? $this->getResponse()->getContentType() : $this->getResponse()->getContentType() . '; charset="' . $this->sCharacterEncoding . '"';
     }
 
     /**

src/Response/Traits/JsTrait.php

Spacing +1 added lines, -1 removed lines

@@ -94,7 +94,7 @@
     public function redirect(string $sURL, int $nDelay = 0): Response
     {
         $sURL = $this->xPluginManager->getParameterReader()->parseUrl($sURL);
-        if($nDelay <= 0)
+        if ($nDelay <= 0)
         {
             return $this->script("window.location = '$sURL';");
         }

src/Plugin/Code/AssetManager.php

Spacing +9 added lines, -9 removed lines

@@ -71,7 +71,7 @@ 
     public function shallIncludeAssets(Plugin $xPlugin): bool
     {
         $sPluginOptionName = 'assets.include.' . $xPlugin->getName();
-        if($this->xConfigManager->hasOption($sPluginOptionName))
+        if ($this->xConfigManager->hasOption($sPluginOptionName))
         {
             return $this->xConfigManager->getOption($sPluginOptionName);
         }
@@ -90,7 +90,7 @@ 
         $sJsLibUri = rtrim($this->xConfigManager->getOption('js.lib.uri', self::JS_LIB_URL), '/') . '/';
         // Add component files to the javascript file array;
         $aJsFiles = [$sJsLibUri . 'jaxon.core' . $sJsExtension];
-        if($this->xConfigManager->getOption('core.debug.on'))
+        if ($this->xConfigManager->getOption('core.debug.on'))
         {
             $sLanguage = $this->xConfigManager->getOption('core.language');
             $aJsFiles[] = $sJsLibUri . 'jaxon.debug' . $sJsExtension;
@@ -107,7 +107,7 @@ 
      */
     public function getOptionVars(): array
     {
-        if(!$this->xConfigManager->hasOption('core.request.uri'))
+        if (!$this->xConfigManager->hasOption('core.request.uri'))
         {
             $this->xConfigManager->setOption('core.request.uri', $this->xParameterReader->uri());
         }
@@ -140,7 +140,7 @@ 
         // Check config options
         // - The js.app.export option must be set to true
         // - The js.app.uri and js.app.dir options must be set to non null values
-        if(!$this->xConfigManager->getOption('js.app.export', false) ||
+        if (!$this->xConfigManager->getOption('js.app.export', false) ||
             !$this->xConfigManager->getOption('js.app.uri') ||
             !$this->xConfigManager->getOption('js.app.dir'))
         {
@@ -158,7 +158,7 @@ 
      */
     public function createJsFiles(CodeGenerator $xCodeGenerator): string
     {
-        if(!$this->shallCreateJsFiles())
+        if (!$this->shallCreateJsFiles())
         {
             return '';
         }
@@ -167,7 +167,7 @@ 
         $sJsFileName = $this->xConfigManager->getOption('js.app.file') ?: $xCodeGenerator->getHash();
         $sJsDirectory = rtrim($this->xConfigManager->getOption('js.app.dir'), '\/') . DIRECTORY_SEPARATOR;
         // - The js.app.dir must be writable
-        if(!$sJsFileName || !is_dir($sJsDirectory) || !is_writable($sJsDirectory))
+        if (!$sJsFileName || !is_dir($sJsDirectory) || !is_writable($sJsDirectory))
         {
             return '';
         }
@@ -175,15 +175,15 @@ 
         $sJsFilePath = $sJsDirectory . $sJsFileName . '.js';
         $sJsMinFilePath = $sJsDirectory . $sJsFileName . '.min.js';
         $sJsFileUri = rtrim($this->xConfigManager->getOption('js.app.uri'), '/') . "/$sJsFileName";
-        if(!is_file($sJsFilePath) && !@file_put_contents($sJsFilePath, $xCodeGenerator->getJsScript()))
+        if (!is_file($sJsFilePath) && !@file_put_contents($sJsFilePath, $xCodeGenerator->getJsScript()))
         {
             return '';
         }
-        if(!$this->xConfigManager->getOption('js.app.minify', false))
+        if (!$this->xConfigManager->getOption('js.app.minify', false))
         {
             return $sJsFileUri . '.js';
         }
-        if(!is_file($sJsMinFilePath) && !$this->xMinifier->minify($sJsFilePath, $sJsMinFilePath))
+        if (!is_file($sJsMinFilePath) && !$this->xMinifier->minify($sJsFilePath, $sJsMinFilePath))
         {
             // If the file cannot be minified, return the plain js file.
             return $sJsFileUri . '.js';

src/Plugin/Response/JQuery/JQueryPlugin.php

Spacing +1 added lines, -1 removed lines

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

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/CallableRepository.php

Spacing +15 added lines, -15 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,7 +322,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/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

Spacing +13 added lines, -13 removed lines

@@ -36,15 +36,15 @@ 
     private function getCallableObjectOptions(array $aConfigOptions, array $aAnnotationOptions): array
     {
         $aOptions = [];
-        foreach($aConfigOptions as $sNames => $aFunctionOptions)
+        foreach ($aConfigOptions as $sNames => $aFunctionOptions)
         {
             $aFunctionNames = explode(',', $sNames); // Names are in comma-separated list.
-            foreach($aFunctionNames as $sFunctionName)
+            foreach ($aFunctionNames as $sFunctionName)
             {
                 $aOptions[$sFunctionName] = array_merge($aOptions[$sFunctionName] ?? [], $aFunctionOptions);
             }
         }
-        foreach($aAnnotationOptions as $sFunctionName => $aFunctionOptions)
+        foreach ($aAnnotationOptions as $sFunctionName => $aFunctionOptions)
         {
             $aOptions[$sFunctionName] = array_merge($aOptions[$sFunctionName] ?? [], $aFunctionOptions);
         }
@@ -66,7 +66,7 @@ 
         $aMethods = $xCallableObject->getPublicMethods($aProtectedMethods);
         $aProperties = $xCallableObject->getProperties();
         [$bExcluded, $aAnnotationOptions, $aAnnotationProtected] = $xAnnotationReader->getAttributes($sClassName, $aMethods, $aProperties);
-        if($bExcluded)
+        if ($bExcluded)
         {
             $xCallableObject->configure('excluded', true);
             return;
@@ -78,11 +78,11 @@ 
         // Functions options
         $aCallableOptions = [];
         $aOptions = $this->getCallableObjectOptions($aOptions['functions'], $aAnnotationOptions);
-        foreach($aOptions as $sFunctionName => $aFunctionOptions)
+        foreach ($aOptions as $sFunctionName => $aFunctionOptions)
         {
-            foreach($aFunctionOptions as $sOptionName => $xOptionValue)
+            foreach ($aFunctionOptions as $sOptionName => $xOptionValue)
             {
-                if(substr($sOptionName, 0, 2) !== '__')
+                if (substr($sOptionName, 0, 2) !== '__')
                 {
                     // Options for javascript code.
                     $aCallableOptions[$sFunctionName][$sOptionName] = $xOptionValue;
@@ -111,13 +111,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']);
         }
@@ -126,7 +126,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]);
@@ -149,7 +149,7 @@ 
         });
 
         // Register the user class, but only if the user already didn't.
-        if(!$this->h($sClassName))
+        if (!$this->h($sClassName))
         {
             $this->set($sClassName, function($c) use($sReflectionClass) {
                 return $this->make($c->g($sReflectionClass));
@@ -157,7 +157,7 @@ 
         }
         // Initialize the user class instance
         $this->extend($sClassName, function($xRegisteredObject, $c) use($sClassName) {
-            if($xRegisteredObject instanceof CallableClass)
+            if ($xRegisteredObject instanceof CallableClass)
             {
                 // Set the protected attributes of the object
                 $cSetter = function($c, $sClassName) {
@@ -170,7 +170,7 @@ 
 
             // Run the callbacks for class initialisation
             $aCallbacks = $c->g(CallbackManager::class)->getInitCallbacks();
-            foreach($aCallbacks as $xCallback)
+            foreach ($aCallbacks as $xCallback)
             {
                 call_user_func($xCallback, $xRegisteredObject);
             }

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