jaxon-php / jaxon-core

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

Spacing +9 added lines, -9 removed lines

@@ -144,7 +144,7 @@ 
      */
     public function has(string $sClass): bool
     {
-        if($this->xContainer != null && $this->xContainer->has($sClass))
+        if ($this->xContainer != null && $this->xContainer->has($sClass))
         {
             return true;
         }
@@ -175,13 +175,13 @@ 
     {
         try
         {
-            if($this->xContainer != null && $this->xContainer->has($sClass))
+            if ($this->xContainer != null && $this->xContainer->has($sClass))
             {
                 return $this->xContainer->get($sClass);
             }
             return $this->offsetGet($sClass);
         }
-        catch(Exception|Throwable $e)
+        catch (Exception | Throwable $e)
         {
             $xLogger = $this->g(LoggerInterface::class);
             $xTranslator = $this->g(Translator::class);
@@ -243,15 +243,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());
             }
@@ -271,16 +271,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

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

src/Plugin/Code/CodeGenerator.php

Spacing +10 added lines, -10 removed lines

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

src/Plugin/Manager/PluginManager.php

Spacing +9 added lines, -9 removed lines

@@ -123,28 +123,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]);
@@ -152,7 +152,7 @@ 
         }
 
         // Register the plugin in the DI container, if necessary
-        if(!$this->di->has($sClassName))
+        if (!$this->di->has($sClassName))
         {
             $this->di->auto($sClassName);
         }
@@ -168,12 +168,12 @@ 
      */
     public function getResponsePlugin(string $sName, ?Response $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);
         }
@@ -194,7 +194,7 @@ 
      */
     public function registerCallable(string $sType, string $sCallable, $xOptions = [])
     {
-        if(isset($this->aRegistryPlugins[$sType]) &&
+        if (isset($this->aRegistryPlugins[$sType]) &&
             ($xPlugin = $this->di->g($this->aRegistryPlugins[$sType])))
         {
             $xPlugin->register($sType, $sCallable, $xPlugin->checkOptions($sCallable, $xOptions));

src/Response/Response.php

Spacing +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';