jaxon-php / jaxon-core

src/Plugin/Request/CallableClass/CallableClassPlugin.php

Braces +2 added lines, -4 removed lines

@@ -140,8 +140,7 @@ 
         if(is_string($xOptions))
         {
             $xOptions = ['include' => $xOptions];
-        }
-        elseif(!is_array($xOptions))
+        } elseif(!is_array($xOptions))
         {
             throw new SetupException($this->xTranslator->trans('errors.objects.invalid-declaration'));
         }
@@ -302,8 +301,7 @@ 
         {
             $xCallableObject = $this->xRegistry->getCallableObject($sClassName);
             return $xCallableObject->call($this->xTarget);
-        }
-        catch(ReflectionException|SetupException $e)
+        } catch(ReflectionException|SetupException $e)
         {
             // Unable to find the requested class or method
             $this->di->getLogger()->error($e->getMessage());

Spacing +11 added lines, -11 removed lines

@@ -133,15 +133,15 @@ 
      */
     public function checkOptions(string $sCallable, $xOptions): array
     {
-        if(!$this->xValidator->validateClass(trim($sCallable)))
+        if (!$this->xValidator->validateClass(trim($sCallable)))
         {
             throw new SetupException($this->xTranslator->trans('errors.objects.invalid-declaration'));
         }
-        if(is_string($xOptions))
+        if (is_string($xOptions))
         {
             $xOptions = ['include' => $xOptions];
         }
-        elseif(!is_array($xOptions))
+        elseif (!is_array($xOptions))
         {
             throw new SetupException($this->xTranslator->trans('errors.objects.invalid-declaration'));
         }
@@ -186,16 +186,16 @@ 
         $sCode = '';
         $aJsClasses = [];
         $aNamespaces = $this->xRepository->getNamespaces();
-        foreach($aNamespaces as $sNamespace)
+        foreach ($aNamespaces as $sNamespace)
         {
             $offset = 0;
             $sJsNamespace = str_replace('\\', '.', $sNamespace);
             $sJsNamespace .= '.Null'; // This is a sentinel. The last token is not processed in the while loop.
-            while(($dotPosition = strpos($sJsNamespace, '.', $offset)) !== false)
+            while (($dotPosition = strpos($sJsNamespace, '.', $offset)) !== false)
             {
                 $sJsClass = substr($sJsNamespace, 0, $dotPosition);
                 // Generate code for this object
-                if(!isset($aJsClasses[$sJsClass]))
+                if (!isset($aJsClasses[$sJsClass]))
                 {
                     $sCode .= $this->sPrefix . "$sJsClass = {};\n";
                     $aJsClasses[$sJsClass] = $sJsClass;
@@ -215,7 +215,7 @@ 
      */
     private function getCallableScript(CallableObject $xCallableObject): string
     {
-        if($xCallableObject->excluded())
+        if ($xCallableObject->excluded())
         {
             return '';
         }
@@ -253,7 +253,7 @@ 
     public static function canProcessRequest(ServerRequestInterface $xRequest): bool
     {
         $aBody = $xRequest->getParsedBody();
-        if(is_array($aBody))
+        if (is_array($aBody))
         {
             return isset($aBody['jxncls']) && isset($aBody['jxnmthd']);
         }
@@ -267,7 +267,7 @@ 
     public function setTarget(ServerRequestInterface $xRequest)
     {
         $aBody = $xRequest->getParsedBody();
-        if(is_array($aBody))
+        if (is_array($aBody))
         {
             $this->xTarget = Target::makeClass(trim($aBody['jxncls']), trim($aBody['jxnmthd']));
             return;
@@ -286,7 +286,7 @@ 
         $sMethodName = $this->xTarget->getMethodName();
         $this->xTarget->setMethodArgs($this->xParameterReader->args());
 
-        if(!$this->xValidator->validateClass($sClassName) || !$this->xValidator->validateMethod($sMethodName))
+        if (!$this->xValidator->validateClass($sClassName) || !$this->xValidator->validateMethod($sMethodName))
         {
             // Unable to find the requested object or method
             throw new RequestException($this->xTranslator->trans('errors.objects.invalid',
@@ -299,7 +299,7 @@ 
             $xCallableObject = $this->xRegistry->getCallableObject($sClassName);
             return $xCallableObject->call($this->xTarget);
         }
-        catch(ReflectionException|SetupException $e)
+        catch (ReflectionException | SetupException $e)
         {
             // Unable to find the requested class or method
             $this->di->getLogger()->error($e->getMessage());

src/App/Dialog/Library/DialogLibraryManager.php

Switch Indentation +10 added lines, -10 removed lines

@@ -331,16 +331,16 @@
         $sPrefix = substr($sName, 0, 15);
         switch($sPrefix)
         {
-        case 'dialogs.default':
-            $this->setDefaultLibraries();
-            return;
-        case 'dialogs.lib.ext':
-            $this->registerLibraries();
-            return;
-        case 'dialogs.lib.use':
-            $this->setUsedLibraries();
-            return;
-        default:
+            case 'dialogs.default':
+                $this->setDefaultLibraries();
+                return;
+            case 'dialogs.lib.ext':
+                $this->registerLibraries();
+                return;
+            case 'dialogs.lib.use':
+                $this->setUsedLibraries();
+                return;
+            default:
         }
     }
 }

Spacing +14 added lines, -14 removed lines

@@ -106,11 +106,11 @@ 
      */
     public function registerLibrary(string $sClassName, string $sLibraryName)
     {
-        if(isset($this->aLibraries[$sLibraryName]))
+        if (isset($this->aLibraries[$sLibraryName]))
         {
             return;
         }
-        if(!($aInterfaces = class_implements($sClassName)))
+        if (!($aInterfaces = class_implements($sClassName)))
         {
             // The class is invalid.
             $sMessage = $this->xTranslator->trans('errors.register.invalid', ['name' => $sClassName]);
@@ -120,7 +120,7 @@ 
         $bIsQuestion = in_array(QuestionInterface::class, $aInterfaces);
         $bIsMessage = in_array(MessageInterface::class, $aInterfaces);
         $bIsModal = in_array(ModalInterface::class, $aInterfaces);
-        if(!$bIsQuestion && !$bIsMessage && !$bIsModal)
+        if (!$bIsQuestion && !$bIsMessage && !$bIsModal)
         {
             // The class is invalid.
             $sMessage = $this->xTranslator->trans('errors.register.invalid', ['name' => $sClassName]);
@@ -148,7 +148,7 @@ 
      */
     public function setQuestionLibrary(string $sLibraryName)
     {
-        if(!isset($this->aLibraries[$sLibraryName]) || !$this->aLibraries[$sLibraryName]['question'])
+        if (!isset($this->aLibraries[$sLibraryName]) || !$this->aLibraries[$sLibraryName]['question'])
         {
             $sMessage = $this->xTranslator->trans('errors.dialog.library',
                 ['type' => 'question', 'name' => $sLibraryName]);
@@ -177,7 +177,7 @@ 
      */
     public function setMessageLibrary(string $sLibraryName)
     {
-        if(!isset($this->aLibraries[$sLibraryName]) || !$this->aLibraries[$sLibraryName]['message'])
+        if (!isset($this->aLibraries[$sLibraryName]) || !$this->aLibraries[$sLibraryName]['message'])
         {
             $sMessage = $this->xTranslator->trans('errors.dialog.library',
                 ['type' => 'message', 'name' => $sLibraryName]);
@@ -206,7 +206,7 @@ 
      */
     public function setModalLibrary(string $sLibraryName)
     {
-        if(!isset($this->aLibraries[$sLibraryName]) || !$this->aLibraries[$sLibraryName]['modal'])
+        if (!isset($this->aLibraries[$sLibraryName]) || !$this->aLibraries[$sLibraryName]['modal'])
         {
             $sMessage = $this->xTranslator->trans('errors.dialog.library',
                 ['type' => 'modal', 'name' => $sLibraryName]);
@@ -246,7 +246,7 @@ 
     protected function registerLibraries()
     {
         $aLibraries = $this->xConfigManager->getOption('dialogs.lib.ext', []);
-        foreach($aLibraries as $sLibraryName => $sClassName)
+        foreach ($aLibraries as $sLibraryName => $sClassName)
         {
             $this->registerLibrary($sClassName, $sLibraryName);
         }
@@ -261,19 +261,19 @@ 
     protected function setDefaultLibraries()
     {
         // Set the default modal library
-        if(($sLibraryName = $this->xConfigManager->getOption('dialogs.default.modal', '')))
+        if (($sLibraryName = $this->xConfigManager->getOption('dialogs.default.modal', '')))
         {
             $this->setModalLibrary($sLibraryName);
             $this->aLibraries[$sLibraryName]['used'] = true;
         }
         // Set the default message library
-        if(($sLibraryName = $this->xConfigManager->getOption('dialogs.default.message', '')))
+        if (($sLibraryName = $this->xConfigManager->getOption('dialogs.default.message', '')))
         {
             $this->setMessageLibrary($sLibraryName);
             $this->aLibraries[$sLibraryName]['used'] = true;
         }
         // Set the default question library
-        if(($sLibraryName = $this->xConfigManager->getOption('dialogs.default.question', '')))
+        if (($sLibraryName = $this->xConfigManager->getOption('dialogs.default.question', '')))
         {
             $this->setQuestionLibrary($sLibraryName);
             $this->aLibraries[$sLibraryName]['used'] = true;
@@ -289,9 +289,9 @@ 
     {
         // Set the other libraries in use
         $aLibraries = $this->xConfigManager->getOption('dialogs.lib.use', []);
-        foreach($aLibraries as $sLibraryName)
+        foreach ($aLibraries as $sLibraryName)
         {
-            if(isset($this->aLibraries[$sLibraryName])) // Make sure the library exists
+            if (isset($this->aLibraries[$sLibraryName])) // Make sure the library exists
             {
                 $this->aLibraries[$sLibraryName]['used'] = true;
             }
@@ -320,7 +320,7 @@ 
      */
     public function onChange(Config $xConfig, string $sName)
     {
-        if($sName === '')
+        if ($sName === '')
         {
             // Reset the default libraries any time the config is changed.
             $this->registerLibraries();
@@ -329,7 +329,7 @@ 
             return;
         }
         $sPrefix = substr($sName, 0, 15);
-        switch($sPrefix)
+        switch ($sPrefix)
         {
         case 'dialogs.default':
             $this->setDefaultLibraries();

Braces +3 added lines, -1 removed lines

@@ -291,10 +291,12 @@
         $aLibraries = $this->xConfigManager->getOption('dialogs.lib.use', []);
         foreach($aLibraries as $sLibraryName)
         {
-            if(isset($this->aLibraries[$sLibraryName])) // Make sure the library exists
+            if(isset($this->aLibraries[$sLibraryName])) {
+                // Make sure the library exists
             {
                 $this->aLibraries[$sLibraryName]['used'] = true;
             }
+            }
         }
     }
 

src/App/View/ViewTrait.php

Spacing +1 added lines, -1 removed lines

@@ -53,7 +53,7 @@
     {
         $this->sDirectory = '';
         $this->sExtension = '';
-        if(isset($this->aDirectories[$sNamespace]))
+        if (isset($this->aDirectories[$sNamespace]))
         {
             // Make sure there's only one '/' at the end of the string
             $this->sDirectory = rtrim($this->aDirectories[$sNamespace]['path'], '/') . '/';

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