jaxon-php / jaxon-mono

jaxon-core/src/Di/Traits/DiAutoTrait.php

Spacing +2 added lines, -2 removed lines

@@ -42,13 +42,13 @@
      */
     public function make(string|ReflectionClass $xClass): mixed
     {
-        if(is_string($xClass))
+        if (is_string($xClass))
         {
             // Create the reflection class instance
             $xClass = new ReflectionClass($xClass);
         }
         // Use the Reflection class to get the parameters of the constructor
-        if(($constructor = $xClass->getConstructor()) === null)
+        if (($constructor = $xClass->getConstructor()) === null)
         {
             return $xClass->newInstance();
         }

jaxon-core/src/Di/Traits/PsrTrait.php

Spacing +1 added lines, -2 removed lines

@@ -58,8 +58,7 @@
             $xParameterReader = $di->g(ParameterReader::class);
             $xRequest = $di->g(ServerRequestInterface::class);
             $aRequestParameter = $xParameterReader->getRequestParameter($xRequest);
-            return !is_array($aRequestParameter) ? $xRequest :
-                $xRequest->withAttribute('jxncall', $aRequestParameter);
+            return !is_array($aRequestParameter) ? $xRequest : $xRequest->withAttribute('jxncall', $aRequestParameter);
         });
         // PSR factory
         $this->set(PsrFactory::class, function($di) {

jaxon-core/src/Di/Traits/PluginTrait.php

Spacing +2 added lines, -2 removed lines

@@ -193,7 +193,7 @@ 
     public function registerPackage(string $sClassName, array $aUserOptions): void
     {
         // Register the user class, but only if the user didn't already.
-        if(!$this->h($sClassName))
+        if (!$this->h($sClassName))
         {
             $this->set($sClassName, fn() => $this->make($sClassName));
         }
@@ -203,7 +203,7 @@ 
         $this->set($sConfigKey, function($di) use($aUserOptions) {
             $xOptionsProvider = $aUserOptions['provider'] ?? null;
             // The user can provide a callable that returns the package options.
-            if(is_callable($xOptionsProvider))
+            if (is_callable($xOptionsProvider))
             {
                 $aUserOptions = $xOptionsProvider($aUserOptions);
             }

jaxon-core/src/Di/ComponentContainer.php

Indentation +2 added lines, -2 removed lines

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

Spacing +16 added lines, -17 removed lines

@@ -194,13 +194,13 @@ 
         try
         {
             // Make sure the registered class exists
-            if(isset($aOptions['include']))
+            if (isset($aOptions['include']))
             {
                 require_once $aOptions['include'];
             }
             $xReflectionClass = new ReflectionClass($sClassName);
             // Check if the class is registrable
-            if(!$xReflectionClass->isInstantiable())
+            if (!$xReflectionClass->isInstantiable())
             {
                 return;
             }
@@ -208,14 +208,14 @@ 
             $this->aComponents[$sClassName] = $aOptions;
             $this->val($this->getReflectionClassKey($sClassName), $xReflectionClass);
             // Register the user class, but only if the user didn't already.
-            if(!$this->has($sClassName))
+            if (!$this->has($sClassName))
             {
                 $this->set($sClassName, function() use($sClassName) {
                     return $this->make($this->get($this->getReflectionClassKey($sClassName)));
                 });
             }
         }
-        catch(ReflectionException $e)
+        catch (ReflectionException $e)
         {
             throw new SetupException($this->di->g(Translator::class)
                 ->trans('errors.class.invalid', ['name' => $sClassName]));
@@ -232,12 +232,12 @@ 
      */
     private function discoverComponent(string $sClassName)
     {
-        if(!isset($this->aComponents[$sClassName]))
+        if (!isset($this->aComponents[$sClassName]))
         {
             $xRegistry = $this->di->g(ComponentRegistry::class);
             $xRegistry->updateHash(false); // Disable hash calculation.
             $aOptions = $xRegistry->getNamespaceComponentOptions($sClassName);
-            if($aOptions !== null)
+            if ($aOptions !== null)
             {
                 $this->registerComponent($sClassName, $aOptions);
             }
@@ -248,7 +248,7 @@ 
                 $xRegistry->registerComponentsInDirectories();
             }
         }
-        if(!isset($this->aComponents[$sClassName]))
+        if (!isset($this->aComponents[$sClassName]))
         {
             throw new SetupException($this->di->g(Translator::class)
                 ->trans('errors.class.invalid', ['name' => $sClassName]));
@@ -264,7 +264,7 @@ 
     public function getCallableObjects(): array
     {
         $aCallableObjects = [];
-        foreach($this->aComponents as $sClassName => $_)
+        foreach ($this->aComponents as $sClassName => $_)
         {
             $aCallableObjects[$sClassName] = $this->makeCallableObject($sClassName);
         }
@@ -283,7 +283,7 @@ 
     {
         $sComponentObject = $this->getCallableObjectKey($sClassName);
         // Prevent duplication. It's important not to use the class name here.
-        if($this->has($sComponentObject))
+        if ($this->has($sComponentObject))
         {
             return;
         }
@@ -308,14 +308,14 @@ 
 
         // Initialize the user class instance
         $this->xContainer->extend($sClassName, function($xClassInstance) use($sClassName) {
-            if($xClassInstance instanceof AbstractComponent)
+            if ($xClassInstance instanceof AbstractComponent)
             {
                 $xHelper = $this->get($this->getCallableHelperKey($sClassName));
                 $xHelper->xTarget = $this->xTarget;
 
                 // Call the protected "initComponent()" method of the Component class.
                 $cSetter = function($di, $xHelper) {
-                    $this->initComponent($di, $xHelper);  // "$this" here refers to the Component class.
+                    $this->initComponent($di, $xHelper); // "$this" here refers to the Component class.
                 };
                 $cSetter = $cSetter->bindTo($xClassInstance, $xClassInstance);
                 call_user_func($cSetter, $this->di, $xHelper);
@@ -330,7 +330,7 @@ 
             /** @var CallableObject */
             $xCallableObject = $this->get($this->getCallableObjectKey($sClassName));
             $xCallableObject->setDiClassAttributes($xClassInstance);
-            if($this->xTarget !== null)
+            if ($this->xTarget !== null)
             {
                 $sMethodName = $this->xTarget->getMethodName();
                 $xCallableObject->setDiMethodAttributes($xClassInstance, $sMethodName);
@@ -406,7 +406,7 @@ 
     private function registerRequestFactory(string $sClassName, string $sFactoryKey)
     {
         $this->xContainer->offsetSet($sFactoryKey, function() use($sClassName) {
-            if(!($xCallable = $this->makeCallableObject($sClassName)))
+            if (!($xCallable = $this->makeCallableObject($sClassName)))
             {
                 return null;
             }
@@ -436,13 +436,13 @@ 
     private function getComponentRequestFactory(string $sClassName): ?JxnCall
     {
         $sClassName = trim($sClassName, " \t");
-        if($sClassName === '')
+        if ($sClassName === '')
         {
             return null;
         }
 
         $sFactoryKey = $this->getRequestFactoryKey($sClassName);
-        if(!$this->has($sFactoryKey))
+        if (!$this->has($sFactoryKey))
         {
             $this->registerRequestFactory($sClassName, $sFactoryKey);
         }
@@ -458,7 +458,6 @@ 
      */
     public function getRequestFactory(string $sClassName = ''): JxnCall
     {
-        return $sClassName === '' ? $this->getFunctionRequestFactory() :
-            $this->getComponentRequestFactory($sClassName);
+        return $sClassName === '' ? $this->getFunctionRequestFactory() : $this->getComponentRequestFactory($sClassName);
     }
 }

Braces +2 added lines, -4 removed lines

@@ -214,8 +214,7 @@ 
                     return $this->make($this->get($this->getReflectionClassKey($sClassName)));
                 });
             }
-        }
-        catch(ReflectionException $e)
+        } catch(ReflectionException $e)
         {
             throw new SetupException($this->di->g(Translator::class)
                 ->trans('errors.class.invalid', ['name' => $sClassName]));
@@ -240,8 +239,7 @@ 
             if($aOptions !== null)
             {
                 $this->registerComponent($sClassName, $aOptions);
-            }
-            else // if(!isset($this->aComponents[$sClassName]))
+            } else // if(!isset($this->aComponents[$sClassName]))
             {
                 // The component was not found in a registered namespace. We need to parse all
                 // the directories to be able to find a component registered without a namespace.

jaxon-core/src/Response/Manager/ResponseManager.php

Spacing +6 added lines, -7 removed lines

@@ -186,7 +186,7 @@ 
      */
     private function getCommandArgs(array|JsonSerializable $aArgs, bool $bRemoveEmpty = false): array
     {
-        if(!$bRemoveEmpty)
+        if (!$bRemoveEmpty)
         {
             return $aArgs;
         }
@@ -211,7 +211,7 @@ 
             'name' => $this->str($sName),
             'args' => $this->getCommandArgs($aArgs, $bRemoveEmpty),
         ]);
-        if($this->bOnConfirm)
+        if ($this->bOnConfirm)
         {
             $this->aConfirmCommands[] = $xCommand;
         }
@@ -240,14 +240,14 @@ 
     public function addConfirmCommand(string $sName, Closure $fConfirm,
         string $sQuestion, array $aArgs = []): self
     {
-        if($this->bOnConfirm)
+        if ($this->bOnConfirm)
         {
             throw new AppException($this->xTranslator->trans('errors.app.confirm.nested'));
         }
         $this->bOnConfirm = true;
         $fConfirm();
         $this->bOnConfirm = false;
-        if(($nCommandCount = count($this->aConfirmCommands)) > 0)
+        if (($nCommandCount = count($this->aConfirmCommands)) > 0)
         {
             $aCommand = $this->di->getDialogCommand()->confirm($this->str($sQuestion), $aArgs);
             $aCommand['count'] = $nCommandCount;
@@ -354,7 +354,7 @@ 
      */
     public function printDebug()
     {
-        foreach($this->aDebugMessages as $sMessage)
+        foreach ($this->aDebugMessages as $sMessage)
         {
             $this->addCommand('script.debug', ['message' => $this->str($sMessage)]);
         }
@@ -368,8 +368,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 . '"';
     }
 
     /**

Braces +1 added lines, -2 removed lines

@@ -214,8 +214,7 @@
         if($this->bOnConfirm)
         {
             $this->aConfirmCommands[] = $xCommand;
-        }
-        else
+        } else
         {
             $this->aCommands[] = $xCommand;
         }

jaxon-core/src/Response/Manager/Command.php

Spacing +1 added lines, -1 removed lines

@@ -66,7 +66,7 @@
      */
     public function setOption(string $sName, string|array|JsonSerializable $xValue): Command
     {
-        if(isset($this->aCommand['options']))
+        if (isset($this->aCommand['options']))
         {
             $this->aCommand['options'][$this->str($sName)] = $xValue;
             return $this;

jaxon-core/src/Response/AbstractResponse.php

Indentation +9 added lines, -9 removed lines

@@ -91,15 +91,15 @@
         return $this->xManager->getErrorMessage();
     }
 
-     /**
-     * Add a response command to the array of commands
-     *
-     * @param string $sName    The command name
-     * @param array|JsonSerializable $aArgs    The command arguments
-     * @param bool $bRemoveEmpty
-     *
-     * @return Command
-     */
+        /**
+         * Add a response command to the array of commands
+         *
+         * @param string $sName    The command name
+         * @param array|JsonSerializable $aArgs    The command arguments
+         * @param bool $bRemoveEmpty
+         *
+         * @return Command
+         */
     public function addCommand(string $sName, array|JsonSerializable $aArgs = [],
         bool $bRemoveEmpty = false): Command
     {

jaxon-core/src/Plugin/Manager/PackageManager.php

Spacing +18 added lines, -18 removed lines

@@ -63,25 +63,25 @@ 
     private function updateContainer(Config $xConfig): void
     {
         $aOptions = $xConfig->getOption('container.set', []);
-        foreach($aOptions as $xKey => $xValue)
+        foreach ($aOptions as $xKey => $xValue)
         {
             // The key is the class name. It must be a string.
             $this->di->set((string)$xKey, $xValue);
         }
         $aOptions = $xConfig->getOption('container.val', []);
-        foreach($aOptions as $xKey => $xValue)
+        foreach ($aOptions as $xKey => $xValue)
         {
             // The key is the class name. It must be a string.
             $this->di->val((string)$xKey, $xValue);
         }
         $aOptions = $xConfig->getOption('container.auto', []);
-        foreach($aOptions as $xValue)
+        foreach ($aOptions as $xValue)
         {
             // The key is the class name. It must be a string.
             $this->di->auto((string)$xValue);
         }
         $aOptions = $xConfig->getOption('container.alias', []);
-        foreach($aOptions as $xKey => $xValue)
+        foreach ($aOptions as $xKey => $xValue)
         {
             // The key is the class name. It must be a string.
             $this->di->alias((string)$xKey, (string)$xValue);
@@ -99,15 +99,15 @@ 
      */
     private function registerCallables(array $aOptions, string $sCallableType): void
     {
-        foreach($aOptions as $xKey => $xValue)
+        foreach ($aOptions as $xKey => $xValue)
         {
-            if(is_integer($xKey) && is_string($xValue))
+            if (is_integer($xKey) && is_string($xValue))
             {
                 // Register a function without options
                 $this->xPluginManager->registerCallable($sCallableType, $xValue);
                 continue;
             }
-            if(is_string($xKey) && (is_array($xValue) || is_string($xValue)))
+            if (is_string($xKey) && (is_array($xValue) || is_string($xValue)))
             {
                 // Register a function with options
                 $this->xPluginManager->registerCallable($sCallableType, $xKey, $xValue);
@@ -124,7 +124,7 @@ 
      */
     private function registerExceptionHandlers(Config $xConfig): void
     {
-        foreach($xConfig->getOption('exceptions', []) as $sExClass => $xExHandler)
+        foreach ($xConfig->getOption('exceptions', []) as $sExClass => $xExHandler)
         {
             $this->xCallbackManager->error($xExHandler, is_string($sExClass) ? $sExClass : '');
         }
@@ -147,19 +147,19 @@ 
         // key of the array item, a string as the value of an entry without a key,
         // or set with the key $sOptionKey in an array entry without a key.
         $aCallables = [];
-        foreach($xConfig->getOption($sOptionName, []) as $xKey => $xValue)
+        foreach ($xConfig->getOption($sOptionName, []) as $xKey => $xValue)
         {
-            if(is_string($xKey))
+            if (is_string($xKey))
             {
                 $aCallables[$xKey] = $xValue;
                 continue;
             }
-            if(is_string($xValue))
+            if (is_string($xValue))
             {
                 $aCallables[] = $xValue;
                 continue;
             }
-            if(is_array($xValue) && isset($xValue[$sOptionKey]))
+            if (is_array($xValue) && isset($xValue[$sOptionKey]))
             {
                 $aCallables[$xValue[$sOptionKey]] = $xValue;
             }
@@ -214,12 +214,12 @@ 
     {
         // $this->aPackages contains packages config file paths.
         $aLibOptions = $sClassName::config();
-        if(is_string($aLibOptions))
+        if (is_string($aLibOptions))
         {
             // A string is supposed to be the path to a config file.
             $aLibOptions = $this->xConfigManager->read($aLibOptions);
         }
-        elseif(!is_array($aLibOptions))
+        elseif (!is_array($aLibOptions))
         {
             // Otherwise, anything else than an array is not accepted.
             $sMessage = $this->xTranslator->trans('errors.register.invalid', ['name' => $sClassName]);
@@ -242,7 +242,7 @@ 
     public function registerPackage(string $sClassName, array $aUserOptions = []): void
     {
         $sClassName = trim($sClassName, '\\ ');
-        if(!is_subclass_of($sClassName, AbstractPackage::class))
+        if (!is_subclass_of($sClassName, AbstractPackage::class))
         {
             $sMessage = $this->xTranslator->trans('errors.register.invalid', ['name' => $sClassName]);
             throw new SetupException($sMessage);
@@ -286,16 +286,16 @@ 
 
         // Register packages
         $aPackageConfig = $xAppConfig->getOption('packages', []);
-        foreach($aPackageConfig as $xKey => $xValue)
+        foreach ($aPackageConfig as $xKey => $xValue)
         {
-            if(is_integer($xKey) && is_string($xValue))
+            if (is_integer($xKey) && is_string($xValue))
             {
                 // Register a package without options
                 $sClassName = $xValue;
                 $this->registerPackage($sClassName);
                 continue;
             }
-            if(is_string($xKey) && is_array($xValue))
+            if (is_string($xKey) && is_array($xValue))
             {
                 // Register a package with options
                 $sClassName = $xKey;

Braces +1 added lines, -2 removed lines

@@ -218,8 +218,7 @@
         {
             // A string is supposed to be the path to a config file.
             $aLibOptions = $this->xConfigManager->read($aLibOptions);
-        }
-        elseif(!is_array($aLibOptions))
+        } elseif(!is_array($aLibOptions))
         {
             // Otherwise, anything else than an array is not accepted.
             $sMessage = $this->xTranslator->trans('errors.register.invalid', ['name' => $sClassName]);

jaxon-core/src/Plugin/Manager/PluginManager.php

Spacing +9 added lines, -10 removed lines

@@ -100,7 +100,7 @@ 
     private function _registerPlugin(string $sClassName, string $sPluginName, array $aInterfaces): int
     {
         // Any plugin must implement the PluginInterface interface.
-        if(!in_array(PluginInterface::class, $aInterfaces))
+        if (!in_array(PluginInterface::class, $aInterfaces))
         {
             $sMessage = $this->xTranslator->trans('errors.register.invalid', [
                 'name' => $sClassName,
@@ -109,7 +109,7 @@ 
         }
 
         // Response plugin.
-        if(in_array(ResponsePluginInterface::class, $aInterfaces))
+        if (in_array(ResponsePluginInterface::class, $aInterfaces))
         {
             $this->aResponsePlugins[$sPluginName] = $sClassName;
             return 1;
@@ -117,12 +117,12 @@ 
 
         // Request plugin.
         $nCount = 0;
-        if(in_array(CallableRegistryInterface::class, $aInterfaces))
+        if (in_array(CallableRegistryInterface::class, $aInterfaces))
         {
             $this->aRegistryPlugins[$sPluginName] = $sClassName;
             $nCount++;
         }
-        if(in_array(RequestHandlerInterface::class, $aInterfaces))
+        if (in_array(RequestHandlerInterface::class, $aInterfaces))
         {
             $this->aRequestHandlers[$sPluginName] = $sClassName;
             $nCount++;
@@ -151,13 +151,13 @@ 
         $nCount = $this->_registerPlugin($sClassName, $sPluginName, $aInterfaces);
 
         // Any plugin can implement the CodeGeneratorInterface interface.
-        if(in_array(CodeGeneratorInterface::class, $aInterfaces))
+        if (in_array(CodeGeneratorInterface::class, $aInterfaces))
         {
             $this->xCodeGenerator->addCodeGenerator($sClassName, $nPriority);
             $nCount++;
         }
         // The class is not a valid plugin.
-        if($nCount === 0)
+        if ($nCount === 0)
         {
             $sMessage = $this->xTranslator->trans('errors.register.invalid', [
                 'name' => $sClassName,
@@ -166,7 +166,7 @@ 
         }
 
         // Register the plugin in the DI container, if necessary
-        if(!$this->di->has($sClassName))
+        if (!$this->di->has($sClassName))
         {
             $this->di->auto($sClassName);
         }
@@ -182,8 +182,7 @@ 
      */
     public function getResponsePlugin(string $sName): ?ResponsePluginInterface
     {
-        return $this->di->h($sName) ? $this->di->g($sName) :
-            (!isset($this->aResponsePlugins[$sName]) ? null :
+        return $this->di->h($sName) ? $this->di->g($sName) : (!isset($this->aResponsePlugins[$sName]) ? null :
             $this->di->g($this->aResponsePlugins[$sName]));
     }
 
@@ -201,7 +200,7 @@ 
      */
     public function registerCallable(string $sType, string $sCallable, $xOptions = []): void
     {
-        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));