jaxon-php / jaxon-mono

jaxon-core/src/Plugin/Code/MinifierInterface.php

Switch Indentation +2 added lines, -2 removed lines

@@ -4,7 +4,7 @@ 
 
 interface MinifierInterface
 {
-    /**
+/**
      * Minify javascript code
      *
      * @param string $sJsFile The javascript file to be minified
@@ -12,5 +12,5 @@ 
      *
      * @return bool
      */
-    public function minify(string $sJsFile, string $sMinFile): bool;
+public function minify(string $sJsFile, string $sMinFile): bool;
 }

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/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/Request/CallableClass/CallableClassPlugin.php

Braces +2 added lines, -4 removed lines

@@ -85,8 +85,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'));
         }
@@ -261,8 +260,7 @@ 
 
             $sError = 'errors.objects.call';
             $xCallableObject->call($this->xTarget);
-        }
-        catch(ReflectionException|SetupException $e)
+        } catch(ReflectionException|SetupException $e)
         {
             // Unable to execute the requested class or method
             $this->throwException($e->getMessage(), $sError, $aErrorParams);

Switch Indentation +210 added lines, -210 removed lines

@@ -46,17 +46,17 @@ 
 
 class CallableClassPlugin extends AbstractRequestPlugin
 {
-    /**
+/**
      * @var array<CallableObject>
      */
-    private array $aCallableObjects = [];
+private array $aCallableObjects = [];
 
-    /**
+/**
      * @var array<string>
      */
-    private array $aCallableNames = [];
+private array $aCallableNames = [];
 
-    /**
+/**
      * The class constructor
      *
      * @param string $sPrefix
@@ -67,150 +67,150 @@ 
      * @param TemplateEngine $xTemplateEngine
      * @param Validator $xValidator
      */
-    public function __construct(private string $sPrefix,
-        private LoggerInterface $xLogger, private ComponentContainer $cdi,
-        private ComponentRegistry $xRegistry, private Translator $xTranslator,
-        private TemplateEngine $xTemplateEngine, private Validator $xValidator)
-    {}
+public function __construct(private string $sPrefix,
+private LoggerInterface $xLogger, private ComponentContainer $cdi,
+private ComponentRegistry $xRegistry, private Translator $xTranslator,
+private TemplateEngine $xTemplateEngine, private Validator $xValidator)
+{}
 
-    /**
+/**
      * @inheritDoc
      */
-    public function getName(): string
-    {
-        return Jaxon::CALLABLE_CLASS;
-    }
+public function getName(): string
+{
+return Jaxon::CALLABLE_CLASS;
+}
 
-    /**
+/**
      * @inheritDoc
      * @throws SetupException
      */
-    public function checkOptions(string $sCallable, $xOptions): array
-    {
-        if(!$this->xValidator->validateClass(trim($sCallable)))
-        {
-            throw new SetupException($this->xTranslator->trans('errors.objects.invalid-declaration'));
-        }
-        if(is_string($xOptions))
-        {
-            $xOptions = ['include' => $xOptions];
-        }
-        elseif(!is_array($xOptions))
-        {
-            throw new SetupException($this->xTranslator->trans('errors.objects.invalid-declaration'));
-        }
-        return $xOptions;
-    }
-
-    /**
+public function checkOptions(string $sCallable, $xOptions): array
+{
+if(!$this->xValidator->validateClass(trim($sCallable)))
+{
+throw new SetupException($this->xTranslator->trans('errors.objects.invalid-declaration'));
+}
+if(is_string($xOptions))
+{
+$xOptions = ['include' => $xOptions];
+}
+elseif(!is_array($xOptions))
+{
+throw new SetupException($this->xTranslator->trans('errors.objects.invalid-declaration'));
+}
+return $xOptions;
+}
+
+/**
      * @inheritDoc
      */
-    public function register(string $sType, string $sCallable, array $aOptions): bool
-    {
-        $sClassName = trim($sCallable);
-        $this->xRegistry->registerComponent($sClassName, $aOptions);
-        return true;
-    }
-
-    /**
+public function register(string $sType, string $sCallable, array $aOptions): bool
+{
+$sClassName = trim($sCallable);
+$this->xRegistry->registerComponent($sClassName, $aOptions);
+return true;
+}
+
+/**
      * @inheritDoc
      * @throws SetupException
      */
-    public function getCallable(string $sCallable): CallableObject|null
-    {
-        return $this->cdi->makeCallableObject($sCallable);
-    }
+public function getCallable(string $sCallable): CallableObject|null
+{
+return $this->cdi->makeCallableObject($sCallable);
+}
 
-    /**
+/**
      * @inheritDoc
      */
-    public function getHash(): string
-    {
-        $this->xRegistry->registerAllComponents();
-        return md5($this->xRegistry->getHash());
-    }
+public function getHash(): string
+{
+$this->xRegistry->registerAllComponents();
+return md5($this->xRegistry->getHash());
+}
 
-    /**
+/**
      * Add a callable object to the script generator
      *
      * @param CallableObject $xCallableObject
      *
      * @return void
      */
-    private function addCallable(CallableObject $xCallableObject): void
-    {
-        $aCallableMethods = $xCallableObject->getCallableMethods();
-        if($xCallableObject->excluded() || count($aCallableMethods) === 0)
-        {
-            return;
-        }
-
-        $aCallableObject = &$this->aCallableObjects;
-        $sJsName = $xCallableObject->getJsName();
-        foreach(explode('.', $sJsName) as $sName)
-        {
-            if(!isset($aCallableObject['children'][$sName]))
-            {
-                $aCallableObject['children'][$sName] = [];
-            }
-            $aCallableObject = &$aCallableObject['children'][$sName];
-        }
-
-        $aCallableObject['methods'] = $aCallableMethods;
-        $aCallableObject['index'] = count($this->aCallableNames);
-        $this->aCallableNames[] = $sJsName;
-    }
-
-    /**
+private function addCallable(CallableObject $xCallableObject): void
+{
+$aCallableMethods = $xCallableObject->getCallableMethods();
+if($xCallableObject->excluded() || count($aCallableMethods) === 0)
+{
+return;
+}
+
+$aCallableObject = &$this->aCallableObjects;
+$sJsName = $xCallableObject->getJsName();
+foreach(explode('.', $sJsName) as $sName)
+{
+if(!isset($aCallableObject['children'][$sName]))
+{
+    $aCallableObject['children'][$sName] = [];
+}
+$aCallableObject = &$aCallableObject['children'][$sName];
+}
+
+$aCallableObject['methods'] = $aCallableMethods;
+$aCallableObject['index'] = count($this->aCallableNames);
+$this->aCallableNames[] = $sJsName;
+}
+
+/**
      * @param string $sIndent
      * @param array $aTemplateVars
      *
      * @return string
      */
-    private function renderMethod(string $sIndent, array $aTemplateVars): string
-    {
-        $aOptions = [];
-        foreach($aTemplateVars['aMethod']['options'] as $sKey => $sValue)
-        {
-            $aOptions[] = "$sKey: $sValue";
-        }
-        $aTemplateVars['sArguments'] = count($aOptions) === 0 ? 'args' :
-            'args, { ' . implode(', ', $aOptions) . ' }';
-
-        return $sIndent . trim($this->xTemplateEngine
-            ->render('jaxon::callables/method.js', $aTemplateVars));
-    }
-
-    /**
+private function renderMethod(string $sIndent, array $aTemplateVars): string
+{
+$aOptions = [];
+foreach($aTemplateVars['aMethod']['options'] as $sKey => $sValue)
+{
+$aOptions[] = "$sKey: $sValue";
+}
+$aTemplateVars['sArguments'] = count($aOptions) === 0 ? 'args' :
+'args, { ' . implode(', ', $aOptions) . ' }';
+
+return $sIndent . trim($this->xTemplateEngine
+->render('jaxon::callables/method.js', $aTemplateVars));
+}
+
+/**
      * @param string $sJsClass
      * @param array $aCallable
      * @param int $nIndent
      *
      * @return string
      */
-    private function renderCallable(string $sJsClass, array $aCallable, int $nIndent): string
-    {
-        $nIndent += 2; // Indentation.
-        $sIndent = str_repeat(' ', $nIndent);
-
-        $fMethodCallback = fn($aMethod) => $this->renderMethod($sIndent, [
-            'aMethod' => $aMethod,
-            'nIndex' => $aCallable['index'] ?? 0,
-        ]);
-        $aMethods = !isset($aCallable['methods']) ? [] :
-            array_map($fMethodCallback, $aCallable['methods']);
-
-        $aChildren = [];
-        foreach($aCallable['children'] ?? [] as $sName => $aChild)
-        {
-            $aChildren[] = $this->renderChild("$sName:", "$sJsClass.$sName",
-                $aChild, $nIndent) . ',';
-        }
-
-        return implode("\n", array_merge($aMethods, $aChildren));
-    }
-
-    /**
+private function renderCallable(string $sJsClass, array $aCallable, int $nIndent): string
+{
+$nIndent += 2; // Indentation.
+$sIndent = str_repeat(' ', $nIndent);
+
+$fMethodCallback = fn($aMethod) => $this->renderMethod($sIndent, [
+'aMethod' => $aMethod,
+'nIndex' => $aCallable['index'] ?? 0,
+]);
+$aMethods = !isset($aCallable['methods']) ? [] :
+array_map($fMethodCallback, $aCallable['methods']);
+
+$aChildren = [];
+foreach($aCallable['children'] ?? [] as $sName => $aChild)
+{
+$aChildren[] = $this->renderChild("$sName:", "$sJsClass.$sName",
+    $aChild, $nIndent) . ',';
+}
+
+return implode("\n", array_merge($aMethods, $aChildren));
+}
+
+/**
      * @param string $sJsVar
      * @param string $sJsClass
      * @param array $aCallable
@@ -218,70 +218,70 @@ 
      *
      * @return string
      */
-    private function renderChild(string $sJsVar, string $sJsClass,
-        array $aCallable, int $nIndent = 0): string
-    {
-        $sIndent = str_repeat(' ', $nIndent);
-        $sScript = $this->renderCallable($sJsClass, $aCallable, $nIndent);
+private function renderChild(string $sJsVar, string $sJsClass,
+array $aCallable, int $nIndent = 0): string
+{
+$sIndent = str_repeat(' ', $nIndent);
+$sScript = $this->renderCallable($sJsClass, $aCallable, $nIndent);
 
-        return <<<CODE
+return <<<CODE
 $sIndent$sJsVar {
 $sScript
 $sIndent}
 CODE;
-    }
+}
 
-    /**
+/**
      * Generate client side javascript code for the registered callable objects
      *
      * @return string
      * @throws SetupException
      */
-    public function getScript(): string
-    {
-        $this->xRegistry->registerAllComponents();
-
-        $this->aCallableNames = [];
-        $this->aCallableObjects = ['children' => []];
-        foreach($this->cdi->getCallableObjects() as $xCallableObject)
-        {
-            $this->addCallable($xCallableObject);
-        }
-
-        $aScripts = [
-            $this->xTemplateEngine ->render('jaxon::callables/objects.js', [
-                'aCallableNames' => $this->aCallableNames,
-            ])
-        ];
-        foreach($this->aCallableObjects['children'] as $sJsClass => $aCallable)
-        {
-            $aScripts[] = $this->renderChild("{$this->sPrefix}$sJsClass =",
-                $sJsClass, $aCallable) . ';';
-        }
-        return implode("\n", $aScripts) . "\n";
-    }
-
-    /**
+public function getScript(): string
+{
+$this->xRegistry->registerAllComponents();
+
+$this->aCallableNames = [];
+$this->aCallableObjects = ['children' => []];
+foreach($this->cdi->getCallableObjects() as $xCallableObject)
+{
+$this->addCallable($xCallableObject);
+}
+
+$aScripts = [
+$this->xTemplateEngine ->render('jaxon::callables/objects.js', [
+    'aCallableNames' => $this->aCallableNames,
+])
+];
+foreach($this->aCallableObjects['children'] as $sJsClass => $aCallable)
+{
+$aScripts[] = $this->renderChild("{$this->sPrefix}$sJsClass =",
+    $sJsClass, $aCallable) . ';';
+}
+return implode("\n", $aScripts) . "\n";
+}
+
+/**
      * @inheritDoc
      */
-    public static function canProcessRequest(ServerRequestInterface $xRequest): bool
-    {
-        $aCall = $xRequest->getAttribute('jxncall');
-        return $aCall !== null && ($aCall['type'] ?? '') === 'class' &&
-            isset($aCall['name']) && isset($aCall['method']) &&
-            is_string($aCall['name']) && is_string($aCall['method']);
-    }
-
-    /**
+public static function canProcessRequest(ServerRequestInterface $xRequest): bool
+{
+$aCall = $xRequest->getAttribute('jxncall');
+return $aCall !== null && ($aCall['type'] ?? '') === 'class' &&
+isset($aCall['name']) && isset($aCall['method']) &&
+is_string($aCall['name']) && is_string($aCall['method']);
+}
+
+/**
      * @inheritDoc
      */
-    public function setTarget(ServerRequestInterface $xRequest): Target
-    {
-        $this->xTarget = Target::makeClass($xRequest->getAttribute('jxncall'));
-        return $this->xTarget;
-    }
+public function setTarget(ServerRequestInterface $xRequest): Target
+{
+$this->xTarget = Target::makeClass($xRequest->getAttribute('jxncall'));
+return $this->xTarget;
+}
 
-    /**
+/**
      * @param string $sExceptionMessage
      * @param string $sErrorCode
      * @param array $aErrorParams
@@ -289,53 +289,53 @@ 
      * @throws RequestException
      * @return void
      */
-    private function throwException(string $sExceptionMessage,
-        string $sErrorCode, array $aErrorParams = []): void
-    {
-        $sMessage = $this->xTranslator->trans($sErrorCode, $aErrorParams) .
-            (!$sExceptionMessage ? '' : "\n$sExceptionMessage");
-        $this->xLogger->error($sMessage);
-        throw new RequestException($sMessage);
-    }
-
-    /**
+private function throwException(string $sExceptionMessage,
+string $sErrorCode, array $aErrorParams = []): void
+{
+$sMessage = $this->xTranslator->trans($sErrorCode, $aErrorParams) .
+(!$sExceptionMessage ? '' : "\n$sExceptionMessage");
+$this->xLogger->error($sMessage);
+throw new RequestException($sMessage);
+}
+
+/**
      * @inheritDoc
      * @throws RequestException
      */
-    public function processRequest(): void
-    {
-        $sClassName = $this->xTarget->getClassName();
-        $sMethodName = $this->xTarget->getMethodName();
-        // Will be used to print a translated error message.
-        $aErrorParams = ['class' => $sClassName, 'method' => $sMethodName];
-
-        if(!$this->xValidator->validateJsObject($sClassName) ||
-            !$this->xValidator->validateMethod($sMethodName))
-        {
-            // Unable to find the requested object or method
-            $this->throwException('', 'errors.objects.invalid', $aErrorParams);
-        }
-
-        // Call the requested method
-        try
-        {
-            $sError = 'errors.objects.find';
-            /** @var CallableObject */
-            $xCallableObject = $this->getCallable($sClassName);
-
-            if($xCallableObject->excluded($sMethodName))
-            {
-                // Unable to find the requested class or method
-                $this->throwException('', 'errors.objects.excluded', $aErrorParams);
-            }
-
-            $sError = 'errors.objects.call';
-            $xCallableObject->call($this->xTarget);
-        }
-        catch(ReflectionException|SetupException $e)
-        {
-            // Unable to execute the requested class or method
-            $this->throwException($e->getMessage(), $sError, $aErrorParams);
-        }
-    }
+public function processRequest(): void
+{
+$sClassName = $this->xTarget->getClassName();
+$sMethodName = $this->xTarget->getMethodName();
+// Will be used to print a translated error message.
+$aErrorParams = ['class' => $sClassName, 'method' => $sMethodName];
+
+if(!$this->xValidator->validateJsObject($sClassName) ||
+!$this->xValidator->validateMethod($sMethodName))
+{
+// Unable to find the requested object or method
+$this->throwException('', 'errors.objects.invalid', $aErrorParams);
+}
+
+// Call the requested method
+try
+{
+$sError = 'errors.objects.find';
+/** @var CallableObject */
+$xCallableObject = $this->getCallable($sClassName);
+
+if($xCallableObject->excluded($sMethodName))
+{
+    // Unable to find the requested class or method
+    $this->throwException('', 'errors.objects.excluded', $aErrorParams);
+}
+
+$sError = 'errors.objects.call';
+$xCallableObject->call($this->xTarget);
+}
+catch(ReflectionException|SetupException $e)
+{
+// Unable to execute the requested class or method
+$this->throwException($e->getMessage(), $sError, $aErrorParams);
+}
+}
 }

Spacing +15 added lines, -17 removed lines

@@ -87,15 +87,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'));
         }
@@ -140,16 +140,16 @@ 
     private function addCallable(CallableObject $xCallableObject): void
     {
         $aCallableMethods = $xCallableObject->getCallableMethods();
-        if($xCallableObject->excluded() || count($aCallableMethods) === 0)
+        if ($xCallableObject->excluded() || count($aCallableMethods) === 0)
         {
             return;
         }
 
         $aCallableObject = &$this->aCallableObjects;
         $sJsName = $xCallableObject->getJsName();
-        foreach(explode('.', $sJsName) as $sName)
+        foreach (explode('.', $sJsName) as $sName)
         {
-            if(!isset($aCallableObject['children'][$sName]))
+            if (!isset($aCallableObject['children'][$sName]))
             {
                 $aCallableObject['children'][$sName] = [];
             }
@@ -170,12 +170,11 @@ 
     private function renderMethod(string $sIndent, array $aTemplateVars): string
     {
         $aOptions = [];
-        foreach($aTemplateVars['aMethod']['options'] as $sKey => $sValue)
+        foreach ($aTemplateVars['aMethod']['options'] as $sKey => $sValue)
         {
             $aOptions[] = "$sKey: $sValue";
         }
-        $aTemplateVars['sArguments'] = count($aOptions) === 0 ? 'args' :
-            'args, { ' . implode(', ', $aOptions) . ' }';
+        $aTemplateVars['sArguments'] = count($aOptions) === 0 ? 'args' : 'args, { ' . implode(', ', $aOptions) . ' }';
 
         return $sIndent . trim($this->xTemplateEngine
             ->render('jaxon::callables/method.js', $aTemplateVars));
@@ -197,11 +196,10 @@ 
             'aMethod' => $aMethod,
             'nIndex' => $aCallable['index'] ?? 0,
         ]);
-        $aMethods = !isset($aCallable['methods']) ? [] :
-            array_map($fMethodCallback, $aCallable['methods']);
+        $aMethods = !isset($aCallable['methods']) ? [] : array_map($fMethodCallback, $aCallable['methods']);
 
         $aChildren = [];
-        foreach($aCallable['children'] ?? [] as $sName => $aChild)
+        foreach ($aCallable['children'] ?? [] as $sName => $aChild)
         {
             $aChildren[] = $this->renderChild("$sName:", "$sJsClass.$sName",
                 $aChild, $nIndent) . ',';
@@ -243,7 +241,7 @@ 
 
         $this->aCallableNames = [];
         $this->aCallableObjects = ['children' => []];
-        foreach($this->cdi->getCallableObjects() as $xCallableObject)
+        foreach ($this->cdi->getCallableObjects() as $xCallableObject)
         {
             $this->addCallable($xCallableObject);
         }
@@ -253,7 +251,7 @@ 
                 'aCallableNames' => $this->aCallableNames,
             ])
         ];
-        foreach($this->aCallableObjects['children'] as $sJsClass => $aCallable)
+        foreach ($this->aCallableObjects['children'] as $sJsClass => $aCallable)
         {
             $aScripts[] = $this->renderChild("{$this->sPrefix}$sJsClass =",
                 $sJsClass, $aCallable) . ';';
@@ -309,7 +307,7 @@ 
         // Will be used to print a translated error message.
         $aErrorParams = ['class' => $sClassName, 'method' => $sMethodName];
 
-        if(!$this->xValidator->validateJsObject($sClassName) ||
+        if (!$this->xValidator->validateJsObject($sClassName) ||
             !$this->xValidator->validateMethod($sMethodName))
         {
             // Unable to find the requested object or method
@@ -323,7 +321,7 @@ 
             /** @var CallableObject */
             $xCallableObject = $this->getCallable($sClassName);
 
-            if($xCallableObject->excluded($sMethodName))
+            if ($xCallableObject->excluded($sMethodName))
             {
                 // Unable to find the requested class or method
                 $this->throwException('', 'errors.objects.excluded', $aErrorParams);
@@ -332,7 +330,7 @@ 
             $sError = 'errors.objects.call';
             $xCallableObject->call($this->xTarget);
         }
-        catch(ReflectionException|SetupException $e)
+        catch (ReflectionException|SetupException $e)
         {
             // Unable to execute the requested class or method
             $this->throwException($e->getMessage(), $sError, $aErrorParams);

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