jaxon-php / jaxon-mono

jaxon-core/src/Plugin/Response/Pagination/PaginatorPlugin.php

Switch Indentation +30 added lines, -30 removed lines

@@ -43,60 +43,60 @@ 
  */
 class PaginatorPlugin extends AbstractResponsePlugin
 {
-    /**
+/**
      * @const The plugin name
      */
-    public const NAME = 'pg';
+public const NAME = 'pg';
 
-    /**
+/**
      * The constructor.
      *
      * @param RendererInterface $xRenderer
      */
-    public function __construct(protected RendererInterface $xRenderer)
-    {}
+public function __construct(protected RendererInterface $xRenderer)
+{}
 
-    /**
+/**
      * @inheritDoc
      */
-    public function getName(): string
-    {
-        return self::NAME;
-    }
+public function getName(): string
+{
+return self::NAME;
+}
 
-    /**
+/**
      * @inheritDoc
      */
-    public function getHash(): string
-    {
-        return '5.0.0'; // Use the version number as hash
-    }
+public function getHash(): string
+{
+return '5.0.0'; // Use the version number as hash
+}
 
-    /**
+/**
      * @inheritDoc
      */
-    public function getCss(): string
-    {
-        return '
+public function getCss(): string
+{
+return '
 <style>
   .pagination li a {
     cursor: pointer;
   }
 </style>
 ';
-    }
+}
 
-    /**
+/**
      * Get the view renderer
      *
      * @return RendererInterface
      */
-    public function renderer(): RendererInterface
-    {
-        return $this->xRenderer;
-    }
+public function renderer(): RendererInterface
+{
+return $this->xRenderer;
+}
 
-    /**
+/**
      * Create a paginator
      *
      * @param int $nPageNumber     The current page number
@@ -105,8 +105,8 @@ 
      *
      * @return Paginator
      */
-    public function paginator(int $nPageNumber, int $nItemsPerPage, int $nTotalItems): Paginator
-    {
-        return new Paginator($this, $nPageNumber, $nItemsPerPage, $nTotalItems);
-    }
+public function paginator(int $nPageNumber, int $nItemsPerPage, int $nTotalItems): Paginator
+{
+return new Paginator($this, $nPageNumber, $nItemsPerPage, $nTotalItems);
+}
 }

jaxon-core/src/Plugin/Response/Script/ScriptPlugin.php

Switch Indentation +47 added lines, -47 removed lines

@@ -26,56 +26,56 @@ 
 
 class ScriptPlugin extends AbstractResponsePlugin
 {
-    /**
+/**
      * @const The plugin name
      */
-    public const NAME = 'script';
+public const NAME = 'script';
 
-    /**
+/**
      * The class constructor
      *
      * @param CallFactory $xFactory
      */
-    public function __construct(private CallFactory $xFactory)
-    {}
+public function __construct(private CallFactory $xFactory)
+{}
 
-    /**
+/**
      * @return Closure
      */
-    private function getCallback(): Closure
-    {
-        // The closure needs to capture the response object the script plugin is called with.
-        $xResponse = $this->response();
-        return function(JsExpr $xJsExpr) use($xResponse) {
-            // Add the newly created expression to the response
-            $aOptions = [
-                'expr' => $xJsExpr,
-                'context' => is_a($xResponse, NodeResponse::class) ?
-                    ['component' => true] : [],
-            ];
-            $xResponse->addCommand('script.exec.expr', $aOptions)
-                ->setOption('plugin', $this->getName());
-        };
-    }
+private function getCallback(): Closure
+{
+// The closure needs to capture the response object the script plugin is called with.
+$xResponse = $this->response();
+return function(JsExpr $xJsExpr) use($xResponse) {
+// Add the newly created expression to the response
+$aOptions = [
+    'expr' => $xJsExpr,
+    'context' => is_a($xResponse, NodeResponse::class) ?
+        ['component' => true] : [],
+];
+$xResponse->addCommand('script.exec.expr', $aOptions)
+    ->setOption('plugin', $this->getName());
+};
+}
 
-    /**
+/**
      * @inheritDoc
      */
-    public function getName(): string
-    {
-        return self::NAME;
-    }
+public function getName(): string
+{
+return self::NAME;
+}
 
-    /**
+/**
      * @inheritDoc
      */
-    public function getHash(): string
-    {
-        // Use the version number as hash
-        return '5.0.0';
-    }
+public function getHash(): string
+{
+// Use the version number as hash
+return '5.0.0';
+}
 
-    /**
+/**
      * Create a JQuery selector expression, and link it to the current response.
      *
      * @param string $sPath    The jQuery selector path
@@ -83,32 +83,32 @@ 
      *
      * @return JqSelectorCall
      */
-    public function jq(string $sPath = '', $xContext = null): JqSelectorCall
-    {
-        return $this->xFactory->jq($sPath, $xContext, $this->getCallback());
-    }
+public function jq(string $sPath = '', $xContext = null): JqSelectorCall
+{
+return $this->xFactory->jq($sPath, $xContext, $this->getCallback());
+}
 
-    /**
+/**
      * Create a Javascript object expression, and link it to the current response.
      *
      * @param string $sObject
      *
      * @return JsObjectCall
      */
-    public function jo(string $sObject = ''): JsObjectCall
-    {
-        return $this->xFactory->jo($sObject, $this->getCallback());
-    }
+public function jo(string $sObject = ''): JsObjectCall
+{
+return $this->xFactory->jo($sObject, $this->getCallback());
+}
 
-    /**
+/**
      * Create a Javascript element selector expression, and link it to the current response.
      *
      * @param string $sElementId
      *
      * @return JsSelectorCall
      */
-    public function je(string $sElementId = ''): JsSelectorCall
-    {
-        return $this->xFactory->je($sElementId, $this->getCallback());
-    }
+public function je(string $sElementId = ''): JsSelectorCall
+{
+return $this->xFactory->je($sElementId, $this->getCallback());
+}
 }

jaxon-core/src/Plugin/Response/Dialog/DialogPlugin.php

Switch Indentation +60 added lines, -60 removed lines

@@ -24,107 +24,107 @@
 
 class DialogPlugin implements PluginInterface, ResponsePluginInterface, ModalInterface, AlertInterface
 {
-    use ResponsePluginTrait;
+use ResponsePluginTrait;
 
-    /**
+/**
      * @const The plugin name
      */
-    public const NAME = 'dialog';
+public const NAME = 'dialog';
 
-    /**
+/**
      * The constructor
      *
      * @param DialogCommand $xDialogCommand
      */
-    public function __construct(private DialogCommand $xDialogCommand)
-    {}
+public function __construct(private DialogCommand $xDialogCommand)
+{}
 
-    /**
+/**
      * @inheritDoc
      */
-    public function getName(): string
-    {
-        return self::NAME;
-    }
+public function getName(): string
+{
+return self::NAME;
+}
 
-    /**
+/**
      * Initialize the plugin
      *
      * @return void
      */
-    protected function init(): void
-    {}
+protected function init(): void
+{}
 
-    /**
+/**
      * Set the library to use for the next call.
      *
      * @param string $sLibrary The name of the library
      *
      * @return DialogPlugin
      */
-    public function with(string $sLibrary): DialogPlugin
-    {
-        $this->xDialogCommand->library($sLibrary);
-        return $this;
-    }
+public function with(string $sLibrary): DialogPlugin
+{
+$this->xDialogCommand->library($sLibrary);
+return $this;
+}
 
-    /**
+/**
      * @inheritDoc
      */
-    public function show(string $sTitle, string $sContent, array $aButtons = [], array $aOptions = []): void
-    {
-        // Show the modal dialog
-        $this->addCommand('dialog.modal.show',
-            $this->xDialogCommand->show($sTitle, $sContent, $aButtons, $aOptions));
-    }
-
-    /**
+public function show(string $sTitle, string $sContent, array $aButtons = [], array $aOptions = []): void
+{
+// Show the modal dialog
+$this->addCommand('dialog.modal.show',
+$this->xDialogCommand->show($sTitle, $sContent, $aButtons, $aOptions));
+}
+
+/**
      * @inheritDoc
      */
-    public function hide(): void
-    {
-        // Hide the modal dialog
-        $this->addCommand('dialog.modal.hide', $this->xDialogCommand->hide());
-    }
+public function hide(): void
+{
+// Hide the modal dialog
+$this->addCommand('dialog.modal.hide', $this->xDialogCommand->hide());
+}
 
-    /**
+/**
      * @inheritDoc
      */
-    public function title(string $sTitle): AlertInterface
-    {
-        $this->xDialogCommand->title($sTitle);
-        return $this;
-    }
+public function title(string $sTitle): AlertInterface
+{
+$this->xDialogCommand->title($sTitle);
+return $this;
+}
 
-    /**
+/**
      * @inheritDoc
      */
-    public function success(string $sMessage, ...$aArgs): void
-    {
-        $this->addCommand('dialog.alert.show', $this->xDialogCommand->success($sMessage, $aArgs));
-    }
+public function success(string $sMessage, ...$aArgs): void
+{
+$this->addCommand('dialog.alert.show', $this->xDialogCommand->success($sMessage, $aArgs));
+}
 
-    /**
+/**
      * @inheritDoc
      */
-    public function info(string $sMessage, ...$aArgs): void
-    {
-        $this->addCommand('dialog.alert.show', $this->xDialogCommand->info($sMessage, $aArgs));
-    }
+public function info(string $sMessage, ...$aArgs): void
+{
+$this->addCommand('dialog.alert.show', $this->xDialogCommand->info($sMessage, $aArgs));
+}
 
-    /**
+/**
      * @inheritDoc
      */
-    public function warning(string $sMessage, ...$aArgs): void
-    {
-        $this->addCommand('dialog.alert.show', $this->xDialogCommand->warning($sMessage, $aArgs));
-    }
+public function warning(string $sMessage, ...$aArgs): void
+{
+$this->addCommand('dialog.alert.show', $this->xDialogCommand->warning($sMessage, $aArgs));
+}
 
-    /**
+/**
      * @inheritDoc
      */
-    public function error(string $sMessage, ...$aArgs): void
-    {
-        $this->addCommand('dialog.alert.show', $this->xDialogCommand->error($sMessage, $aArgs));
-    }
+public function error(string $sMessage, ...$aArgs): void
+{
+$this->addCommand('dialog.alert.show', $this->xDialogCommand->error($sMessage, $aArgs));
+}
 }

jaxon-core/src/Plugin/Response/Psr/PsrPlugin.php

Switch Indentation +33 added lines, -33 removed lines

@@ -23,56 +23,56 @@
 
 class PsrPlugin extends AbstractResponsePlugin
 {
-    /**
+/**
      * @const The plugin name
      */
-    public const NAME = 'psr';
+public const NAME = 'psr';
 
-    /**
+/**
      * The class constructor
      *
      * @param Psr17Factory $xPsr17Factory
      * @param RequestInterface $xRequest
      */
-    public function __construct(private Psr17Factory $xPsr17Factory,
-        private RequestInterface $xRequest)
-    {}
+public function __construct(private Psr17Factory $xPsr17Factory,
+private RequestInterface $xRequest)
+{}
 
-    /**
+/**
      * @inheritDoc
      */
-    public function getName(): string
-    {
-        return self::NAME;
-    }
+public function getName(): string
+{
+return self::NAME;
+}
 
-    /**
+/**
      * @inheritDoc
      */
-    public function getHash(): string
-    {
-        // Use the version number as hash
-        return '5.0.0';
-    }
+public function getHash(): string
+{
+// Use the version number as hash
+return '5.0.0';
+}
 
-    /**
+/**
      * Convert an ajax response to a PSR7 response object
      *
      * @return ResponseInterface
      */
-    public function ajaxResponse(): ResponseInterface
-    {
-        $xPsrResponse = $this->xPsr17Factory->createResponse(200);
-        if($this->xRequest->getMethod() === 'GET')
-        {
-            $xPsrResponse = $xPsrResponse
-                ->withHeader('Expires', 'Mon, 26 Jul 1997 05:00:00 GMT')
-                ->withHeader('Last-Modified', gmdate("D, d M Y H:i:s") . ' GMT')
-                ->withHeader('Cache-Control', 'no-cache, must-revalidate')
-                ->withHeader('Pragma', 'no-cache');
-        }
-        return $xPsrResponse
-            ->withHeader('content-type', $this->response()->getContentType())
-            ->withBody(Stream::create($this->response()->getOutput()));
-    }
+public function ajaxResponse(): ResponseInterface
+{
+$xPsrResponse = $this->xPsr17Factory->createResponse(200);
+if($this->xRequest->getMethod() === 'GET')
+{
+$xPsrResponse = $xPsrResponse
+    ->withHeader('Expires', 'Mon, 26 Jul 1997 05:00:00 GMT')
+    ->withHeader('Last-Modified', gmdate("D, d M Y H:i:s") . ' GMT')
+    ->withHeader('Cache-Control', 'no-cache, must-revalidate')
+    ->withHeader('Pragma', 'no-cache');
+}
+return $xPsrResponse
+->withHeader('content-type', $this->response()->getContentType())
+->withBody(Stream::create($this->response()->getOutput()));
+}
 }

jaxon-core/src/Plugin/AbstractCodeGenerator.php

Switch Indentation +25 added lines, -25 removed lines

@@ -18,43 +18,43 @@
 
 abstract class AbstractCodeGenerator implements CodeGeneratorInterface
 {
-    /**
+/**
      * @inheritDoc
      */
-    public function getHash(): string
-    {
-        return '';
-    }
+public function getHash(): string
+{
+return '';
+}
 
-    /**
+/**
      * @inheritDoc
      */
-    public function getCss(): string
-    {
-        return '';
-    }
+public function getCss(): string
+{
+return '';
+}
 
-    /**
+/**
      * @inheritDoc
      */
-    public function getJs(): string
-    {
-        return '';
-    }
+public function getJs(): string
+{
+return '';
+}
 
-    /**
+/**
      * @inheritDoc
      */
-    public function getScript(): string
-    {
-        return '';
-    }
+public function getScript(): string
+{
+return '';
+}
 
-    /**
+/**
      * @inheritDoc
      */
-    public function getJsCode(): ?JsCode
-    {
-        return null;
-    }
+public function getJsCode(): ?JsCode
+{
+return null;
+}
 }

jaxon-core/src/Plugin/ResponsePluginTrait.php

Switch Indentation +25 added lines, -25 removed lines

@@ -31,48 +31,48 @@ 
 
 trait ResponsePluginTrait
 {
-    /**
+/**
      * The object used to build the response that will be sent to the client browser
      *
      * @var AbstractResponse
      */
-    private $xResponse = null;
+private $xResponse = null;
 
-    /**
+/**
      * Get a unique name to identify the plugin.
      *
      * @return string
      */
-    abstract public function getName(): string;
+abstract public function getName(): string;
 
-    /**
+/**
      * Initialize the plugin
      *
      * @return void
      */
-    abstract protected function init();
+abstract protected function init();
 
-    /**
+/**
      * @param AbstractResponse $xResponse   The response
      *
      * @return static
      */
-    public function initPlugin(AbstractResponse $xResponse): static
-    {
-        $this->xResponse = $xResponse;
-        $this->init();
-        return $this;
-    }
+public function initPlugin(AbstractResponse $xResponse): static
+{
+$this->xResponse = $xResponse;
+$this->init();
+return $this;
+}
 
-    /**
+/**
      * @inheritDoc
      */
-    public function response(): ?AbstractResponse
-    {
-        return $this->xResponse;
-    }
+public function response(): ?AbstractResponse
+{
+return $this->xResponse;
+}
 
-    /**
+/**
      * Add a plugin command to the response
      *
      * @param string $sName    The command name
@@ -80,10 +80,10 @@ 
      *
      * @return Command
      */
-    public function addCommand(string $sName, array|JsonSerializable $aOptions): Command
-    {
-        return $this->xResponse
-            ->addCommand($sName, $aOptions)
-            ->setOption('plugin', $this->getName());
-    }
+public function addCommand(string $sName, array|JsonSerializable $aOptions): Command
+{
+return $this->xResponse
+->addCommand($sName, $aOptions)
+->setOption('plugin', $this->getName());
+}
 }

jaxon-core/src/Plugin/CodeGeneratorInterface.php

Switch Indentation +10 added lines, -10 removed lines

@@ -17,46 +17,46 @@
 
 interface CodeGeneratorInterface
 {
-    /**
+/**
      * Get the value to be hashed
      *
      * @return string
      */
-    public function getHash(): string;
+public function getHash(): string;
 
-    /**
+/**
      * Get the HTML tags to include CSS code and files into the page
      *
      * The code must be enclosed in the appropriate HTML tags.
      *
      * @return string
      */
-    public function getCss(): string;
+public function getCss(): string;
 
-    /**
+/**
      * Get the HTML tags to include javascript code and files into the page
      *
      * The code must be enclosed in the appropriate HTML tags.
      *
      * @return string
      */
-    public function getJs(): string;
+public function getJs(): string;
 
-    /**
+/**
      * Get the javascript code to include into the page
      *
      * The code must NOT be enclosed in HTML tags.
      *
      * @return string
      */
-    public function getScript(): string;
+public function getScript(): string;
 
-    /**
+/**
      * Get the javascript codes to include into the page
      *
      * The code must NOT be enclosed in HTML tags.
      *
      * @return JsCode|null
      */
-    public function getJsCode(): ?JsCode;
+public function getJsCode(): ?JsCode;
 }

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

Switch Indentation +179 added lines, -179 removed lines

@@ -34,7 +34,7 @@ 
 
 class PackageManager
 {
-    /**
+/**
      * The constructor
      *
      * @param Container $di
@@ -46,48 +46,48 @@ 
      * @param CallbackManager $xCallbackManager
      * @param ComponentRegistry $xRegistry
      */
-    public function __construct(private Container $di, private Translator $xTranslator,
-        private PluginManager $xPluginManager, private ConfigManager $xConfigManager,
-        private CodeGenerator $xCodeGenerator, private ViewRenderer $xViewRenderer,
-        private CallbackManager $xCallbackManager, private ComponentRegistry $xRegistry)
-    {}
+public function __construct(private Container $di, private Translator $xTranslator,
+private PluginManager $xPluginManager, private ConfigManager $xConfigManager,
+private CodeGenerator $xCodeGenerator, private ViewRenderer $xViewRenderer,
+private CallbackManager $xCallbackManager, private ComponentRegistry $xRegistry)
+{}
 
-    /**
+/**
      * Save items in the DI container
      *
      * @param Config $xConfig
      *
      * @return void
      */
-    private function updateContainer(Config $xConfig): void
-    {
-        $aOptions = $xConfig->getOption('container.set', []);
-        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)
-        {
-            // 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)
-        {
-            // 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)
-        {
-            // The key is the class name. It must be a string.
-            $this->di->alias((string)$xKey, (string)$xValue);
-        }
-    }
+private function updateContainer(Config $xConfig): void
+{
+$aOptions = $xConfig->getOption('container.set', []);
+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)
+{
+// 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)
+{
+// 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)
+{
+// The key is the class name. It must be a string.
+$this->di->alias((string)$xKey, (string)$xValue);
+}
+}
 
-    /**
+/**
      * Register callables from a section of the config
      *
      * @param array $aOptions    The content of the config section
@@ -96,41 +96,41 @@ 
      * @return void
      * @throws SetupException
      */
-    private function registerCallables(array $aOptions, string $sCallableType): void
-    {
-        foreach($aOptions as $xKey => $xValue)
-        {
-            if(is_integer($xKey) && is_string($xValue))
-            {
-                // Register a function without options
-                $this->xPluginManager->registerCallable($sCallableType, $xValue);
-                continue;
-            }
+private function registerCallables(array $aOptions, string $sCallableType): void
+{
+foreach($aOptions as $xKey => $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)))
-            {
-                // Register a function with options
-                $this->xPluginManager->registerCallable($sCallableType, $xKey, $xValue);
-            }
-        }
-    }
+if(is_string($xKey) && (is_array($xValue) || is_string($xValue)))
+{
+    // Register a function with options
+    $this->xPluginManager->registerCallable($sCallableType, $xKey, $xValue);
+}
+}
+}
 
-    /**
+/**
      * Register exceptions handlers
      *
      * @param Config $xConfig
      *
      * @return void
      */
-    private function registerExceptionHandlers(Config $xConfig): void
-    {
-        foreach($xConfig->getOption('exceptions', []) as $sExClass => $xExHandler)
-        {
-            $this->xCallbackManager->error($xExHandler, is_string($sExClass) ? $sExClass : '');
-        }
-    }
+private function registerExceptionHandlers(Config $xConfig): void
+{
+foreach($xConfig->getOption('exceptions', []) as $sExClass => $xExHandler)
+{
+$this->xCallbackManager->error($xExHandler, is_string($sExClass) ? $sExClass : '');
+}
+}
 
-    /**
+/**
      * Get a callable list from config
      *
      * @param Config $xConfig
@@ -140,36 +140,36 @@ 
      *
      * @return void
      */
-    private function registerCallablesFromConfig(Config $xConfig,
-        string $sOptionName, string $sOptionKey, string $sCallableType): void
-    {
-        // The callable (directory path, class or function name) can be used as the
-        // 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)
-        {
-            if(is_string($xKey))
-            {
-                $aCallables[$xKey] = $xValue;
-                continue;
-            }
-            if(is_string($xValue))
-            {
-                $aCallables[] = $xValue;
-                continue;
-            }
+private function registerCallablesFromConfig(Config $xConfig,
+string $sOptionName, string $sOptionKey, string $sCallableType): void
+{
+// The callable (directory path, class or function name) can be used as the
+// 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)
+{
+if(is_string($xKey))
+{
+    $aCallables[$xKey] = $xValue;
+    continue;
+}
+if(is_string($xValue))
+{
+    $aCallables[] = $xValue;
+    continue;
+}
 
-            if(is_array($xValue) && isset($xValue[$sOptionKey]))
-            {
-                $aCallables[$xValue[$sOptionKey]] = $xValue;
-            }
-            // Invalid values are ignored.
-        }
-        $this->registerCallables($aCallables, $sCallableType);
-    }
+if(is_array($xValue) && isset($xValue[$sOptionKey]))
+{
+    $aCallables[$xValue[$sOptionKey]] = $xValue;
+}
+// Invalid values are ignored.
+}
+$this->registerCallables($aCallables, $sCallableType);
+}
 
-    /**
+/**
      * Read and set Jaxon options from a JSON config file
      *
      * @param Config $xConfig The config options
@@ -177,33 +177,33 @@ 
      * @return void
      * @throws SetupException
      */
-    private function registerItemsFromConfig(Config $xConfig): void
-    {
-        // Set the config for the registered callables.
-        $this->xRegistry->setPackageConfig($xConfig);
+private function registerItemsFromConfig(Config $xConfig): void
+{
+// Set the config for the registered callables.
+$this->xRegistry->setPackageConfig($xConfig);
 
-        // Register functions, classes and directories
-        $this->registerCallablesFromConfig($xConfig,
-            'functions', 'name', Jaxon::CALLABLE_FUNCTION);
-        $this->registerCallablesFromConfig($xConfig,
-            'classes', 'name', Jaxon::CALLABLE_CLASS);
-        $this->registerCallablesFromConfig($xConfig,
-            'directories', 'path', Jaxon::CALLABLE_DIR);
+// Register functions, classes and directories
+$this->registerCallablesFromConfig($xConfig,
+'functions', 'name', Jaxon::CALLABLE_FUNCTION);
+$this->registerCallablesFromConfig($xConfig,
+'classes', 'name', Jaxon::CALLABLE_CLASS);
+$this->registerCallablesFromConfig($xConfig,
+'directories', 'path', Jaxon::CALLABLE_DIR);
 
-        // Unset the current config.
-        $this->xRegistry->unsetPackageConfig();
+// Unset the current config.
+$this->xRegistry->unsetPackageConfig();
 
-        // Register the view namespaces
-        // Note: the $xUserConfig can provide a "template" option, which is used to customize
-        // the user defined view namespaces. That's why it is needed here.
-        $this->xViewRenderer->addNamespaces($xConfig);
-        // Save items in the DI container
-        $this->updateContainer($xConfig);
-        // Register the exception handlers
-        $this->registerExceptionHandlers($xConfig);
-    }
+// Register the view namespaces
+// Note: the $xUserConfig can provide a "template" option, which is used to customize
+// the user defined view namespaces. That's why it is needed here.
+$this->xViewRenderer->addNamespaces($xConfig);
+// Save items in the DI container
+$this->updateContainer($xConfig);
+// Register the exception handlers
+$this->registerExceptionHandlers($xConfig);
+}
 
-    /**
+/**
      * Get the options provided by the package library
      *
      * @param class-string $sClassName    The package class
@@ -211,27 +211,27 @@ 
      * @return Config
      * @throws SetupException
      */
-    private function getPackageLibConfig(string $sClassName): Config
-    {
-        // $this->aPackages contains packages config file paths.
-        $aLibOptions = $sClassName::config();
-        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))
-        {
-            // Otherwise, anything else than an array is not accepted.
-            $sMessage = $this->xTranslator->trans('errors.register.invalid', ['name' => $sClassName]);
-            throw new SetupException($sMessage);
-        }
-        // Add the package name to the config
-        $aLibOptions['package'] = $sClassName;
-        return $this->xConfigManager->newConfig($aLibOptions);
-    }
+private function getPackageLibConfig(string $sClassName): Config
+{
+// $this->aPackages contains packages config file paths.
+$aLibOptions = $sClassName::config();
+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))
+{
+// Otherwise, anything else than an array is not accepted.
+$sMessage = $this->xTranslator->trans('errors.register.invalid', ['name' => $sClassName]);
+throw new SetupException($sMessage);
+}
+// Add the package name to the config
+$aLibOptions['package'] = $sClassName;
+return $this->xConfigManager->newConfig($aLibOptions);
+}
 
-    /**
+/**
      * Register a package
      *
      * @param class-string $sClassName    The package class
@@ -240,27 +240,27 @@ 
      * @return void
      * @throws SetupException
      */
-    public function registerPackage(string $sClassName, array $aUserOptions = []): void
-    {
-        $sClassName = trim($sClassName, '\\ ');
-        if(!is_subclass_of($sClassName, AbstractPackage::class))
-        {
-            $sMessage = $this->xTranslator->trans('errors.register.invalid', ['name' => $sClassName]);
-            throw new SetupException($sMessage);
-        }
+public function registerPackage(string $sClassName, array $aUserOptions = []): void
+{
+$sClassName = trim($sClassName, '\\ ');
+if(!is_subclass_of($sClassName, AbstractPackage::class))
+{
+$sMessage = $this->xTranslator->trans('errors.register.invalid', ['name' => $sClassName]);
+throw new SetupException($sMessage);
+}
 
-        // Register the declarations in the package config.
-        $xAppConfig = $this->getPackageLibConfig($sClassName);
-        $this->registerItemsFromConfig($xAppConfig);
+// Register the declarations in the package config.
+$xAppConfig = $this->getPackageLibConfig($sClassName);
+$this->registerItemsFromConfig($xAppConfig);
 
-        // Register the package and its options in the DI
-        $this->di->registerPackage($sClassName, $aUserOptions);
+// Register the package and its options in the DI
+$this->di->registerPackage($sClassName, $aUserOptions);
 
-        // Register the package as a code generator.
-        $this->xCodeGenerator->addCodeGenerator($sClassName, 500);
-    }
+// Register the package as a code generator.
+$this->xCodeGenerator->addCodeGenerator($sClassName, 500);
+}
 
-    /**
+/**
      * Get a package instance
      *
      * @template T of AbstractPackage
@@ -268,42 +268,42 @@ 
      *
      * @return T|null
      */
-    public function getPackage(string $sClassName): ?AbstractPackage
-    {
-        $sClassName = trim($sClassName, '\\ ');
-        return $this->di->h($sClassName) ? $this->di->g($sClassName) : null;
-    }
+public function getPackage(string $sClassName): ?AbstractPackage
+{
+$sClassName = trim($sClassName, '\\ ');
+return $this->di->h($sClassName) ? $this->di->g($sClassName) : null;
+}
 
-    /**
+/**
      * Read and set Jaxon options from the config
      *
      * @return void
      * @throws SetupException
      */
-    public function registerFromConfig(): void
-    {
-        $xAppConfig = $this->xConfigManager->getAppConfig();
-        $this->registerItemsFromConfig($xAppConfig);
+public function registerFromConfig(): void
+{
+$xAppConfig = $this->xConfigManager->getAppConfig();
+$this->registerItemsFromConfig($xAppConfig);
 
-        // Register packages
-        $aPackageConfig = $xAppConfig->getOption('packages', []);
-        foreach($aPackageConfig as $xKey => $xValue)
-        {
-            if(is_integer($xKey) && is_string($xValue))
-            {
-                // Register a package without options
-                $sClassName = $xValue;
-                $this->registerPackage($sClassName);
-                continue;
-            }
+// Register packages
+$aPackageConfig = $xAppConfig->getOption('packages', []);
+foreach($aPackageConfig as $xKey => $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))
-            {
-                // Register a package with options
-                $sClassName = $xKey;
-                $aPkgOptions = $xValue;
-                $this->registerPackage($sClassName, $aPkgOptions);
-            }
-        }
-    }
+if(is_string($xKey) && is_array($xValue))
+{
+    // Register a package with options
+    $sClassName = $xKey;
+    $aPkgOptions = $xValue;
+    $this->registerPackage($sClassName, $aPkgOptions);
+}
+}
+}
 }

jaxon-core/src/Request/Upload/UploadHandlerInterface.php

Switch Indentation +10 added lines, -10 removed lines

@@ -20,45 +20,45 @@
 
 interface UploadHandlerInterface
 {
-    /**
+/**
      * Set the uploaded file name sanitizer
      *
      * @param Closure $cSanitizer    The closure
      *
      * @return void
      */
-    public function sanitizer(Closure $cSanitizer);
+public function sanitizer(Closure $cSanitizer);
 
-    /**
+/**
      * Get the uploaded files
      *
      * @return FileInterface[]
      */
-    public function files(): array;
+public function files(): array;
 
-    /**
+/**
      * Check if the current request contains uploaded files
      *
      * @param ServerRequestInterface $xRequest
      *
      * @return bool
      */
-    public function canProcessRequest(ServerRequestInterface $xRequest): bool;
+public function canProcessRequest(ServerRequestInterface $xRequest): bool;
 
-    /**
+/**
      * Process the uploaded files in the HTTP request
      *
      * @param ServerRequestInterface $xRequest
      *
      * @return bool
      */
-    public function processRequest(ServerRequestInterface $xRequest): bool;
+public function processRequest(ServerRequestInterface $xRequest): bool;
 
-    /**
+/**
      * @param string $sStorage
      * @param Closure $cFactory
      *
      * @return void
      */
-    public function registerStorageAdapter(string $sStorage, Closure $cFactory);
+public function registerStorageAdapter(string $sStorage, Closure $cFactory);
 }