jaxon-php / jaxon-mono

jaxon-annotations/src/AnnotationReader.php

Switch Indentation +150 added lines, -150 removed lines

@@ -36,206 +36,206 @@
 
 class AnnotationReader implements MetadataReaderInterface
 {
-    /**
+/**
      * @var AnnotationManager
      */
-    protected $xManager;
+protected $xManager;
 
-    /**
+/**
      * @var Metadata
      */
-    protected $xMetadata;
+protected $xMetadata;
 
-    /**
+/**
      * Properties types, read from the "var" annotations.
      *
      * @var array
      */
-    protected $aPropTypes;
+protected $aPropTypes;
 
-    /**
+/**
      * The type of the class member being currently processed.
      *
      * @var string
      */
-    protected $sCurrMemberType;
+protected $sCurrMemberType;
 
-    /**
+/**
      * The constructor
      *
      * @param AnnotationManager $xManager
      */
-    public function __construct(AnnotationManager $xManager)
-    {
-        $this->xManager = $xManager;
-        $this->xManager->registry['upload'] = UploadAnnotation::class;
-        $this->xManager->registry['databag'] = DatabagAnnotation::class;
-        $this->xManager->registry['exclude'] = ExcludeAnnotation::class;
-        $this->xManager->registry['before'] = BeforeAnnotation::class;
-        $this->xManager->registry['after'] = AfterAnnotation::class;
-        $this->xManager->registry['di'] = ContainerAnnotation::class;
-        $this->xManager->registry['callback'] = CallbackAnnotation::class;
-        // Missing standard annotations.
-        // We need to define this, otherwise they throw an exception, and make the whole processing fail.
-        $this->xManager->registry['const'] = false;
-        $this->xManager->registry['inheritDoc'] = false;
-        $this->xManager->registry['template'] = false;
-        $this->xManager->registry['param-closure-this'] = false;
-    }
+public function __construct(AnnotationManager $xManager)
+{
+$this->xManager = $xManager;
+$this->xManager->registry['upload'] = UploadAnnotation::class;
+$this->xManager->registry['databag'] = DatabagAnnotation::class;
+$this->xManager->registry['exclude'] = ExcludeAnnotation::class;
+$this->xManager->registry['before'] = BeforeAnnotation::class;
+$this->xManager->registry['after'] = AfterAnnotation::class;
+$this->xManager->registry['di'] = ContainerAnnotation::class;
+$this->xManager->registry['callback'] = CallbackAnnotation::class;
+// Missing standard annotations.
+// We need to define this, otherwise they throw an exception, and make the whole processing fail.
+$this->xManager->registry['const'] = false;
+$this->xManager->registry['inheritDoc'] = false;
+$this->xManager->registry['template'] = false;
+$this->xManager->registry['param-closure-this'] = false;
+}
 
-    /**
+/**
      * @return array
      */
-    public function getPropTypes(): array
-    {
-        return $this->aPropTypes;
-    }
+public function getPropTypes(): array
+{
+return $this->aPropTypes;
+}
 
-    /**
+/**
      * @return bool
      */
-    public function annotationIsOnProperty(): bool
-    {
-        return $this->sCurrMemberType === AnnotationManager::MEMBER_PROPERTY;
-    }
+public function annotationIsOnProperty(): bool
+{
+return $this->sCurrMemberType === AnnotationManager::MEMBER_PROPERTY;
+}
 
-    /**
+/**
      * @param string $sClass
      *
      * @return void
      * @throws AnnotationException
      */
-    private function getClassAttrs(string $sClass): void
-    {
-        // Only keep the annotations declared in this package.
-        /** @var array<AbstractAnnotation> */
-        $aAnnotations = array_filter(
-            $this->xManager->getClassAnnotations($sClass),
-            fn($xAnnotation) => is_a($xAnnotation, AbstractAnnotation::class)
-        );
-        // First check if the class is excluded.
-        foreach($aAnnotations as $xAnnotation)
-        {
-            if(is_a($xAnnotation, ExcludeAnnotation::class))
-            {
-                $xAnnotation->saveValue($this->xMetadata);
-            }
-        }
-        if($this->xMetadata->isExcluded())
-        {
-            return;
-        }
-
-        foreach($aAnnotations as $xAnnotation)
-        {
-            if(!is_a($xAnnotation, ExcludeAnnotation::class))
-            {
-                $xAnnotation->saveValue($this->xMetadata);
-            }
-        }
-    }
+private function getClassAttrs(string $sClass): void
+{
+// Only keep the annotations declared in this package.
+/** @var array<AbstractAnnotation> */
+$aAnnotations = array_filter(
+$this->xManager->getClassAnnotations($sClass),
+fn($xAnnotation) => is_a($xAnnotation, AbstractAnnotation::class)
+);
+// First check if the class is excluded.
+foreach($aAnnotations as $xAnnotation)
+{
+if(is_a($xAnnotation, ExcludeAnnotation::class))
+{
+    $xAnnotation->saveValue($this->xMetadata);
+}
+}
+if($this->xMetadata->isExcluded())
+{
+return;
+}
 
-    /**
+foreach($aAnnotations as $xAnnotation)
+{
+if(!is_a($xAnnotation, ExcludeAnnotation::class))
+{
+    $xAnnotation->saveValue($this->xMetadata);
+}
+}
+}
+
+/**
      * @param string $sClass
      * @param string $sProperty
      *
      * @return void
      * @throws AnnotationException
      */
-    private function getPropertyAttrs(string $sClass, string $sProperty): void
+private function getPropertyAttrs(string $sClass, string $sProperty): void
+{
+/** @var array<ContainerAnnotation> */
+// Only keep the annotations declared in this package.
+$aAnnotations = array_filter(
+$this->xManager->getPropertyAnnotations($sClass, $sProperty),
+function($xAnnotation) use($sProperty) {
+    // Save the property type
+    if(is_a($xAnnotation, VarAnnotation::class))
     {
-        /** @var array<ContainerAnnotation> */
-        // Only keep the annotations declared in this package.
-        $aAnnotations = array_filter(
-            $this->xManager->getPropertyAnnotations($sClass, $sProperty),
-            function($xAnnotation) use($sProperty) {
-                // Save the property type
-                if(is_a($xAnnotation, VarAnnotation::class))
-                {
-                    $this->aPropTypes[$sProperty] = $xAnnotation->type;
-                }
-                // Only container annotations are allowed on properties
-                return is_a($xAnnotation, ContainerAnnotation::class);
-            }
-        );
-        if(count($aAnnotations) > 1)
-        {
-            throw new AnnotationException('Only one @di annotation is allowed on a property');
-        }
-
-        foreach($aAnnotations as $xAnnotation)
-        {
-            $xAnnotation->setAttr($sProperty);
-            $xAnnotation->saveValue($this->xMetadata);
-        }
+        $this->aPropTypes[$sProperty] = $xAnnotation->type;
     }
+    // Only container annotations are allowed on properties
+    return is_a($xAnnotation, ContainerAnnotation::class);
+}
+);
+if(count($aAnnotations) > 1)
+{
+throw new AnnotationException('Only one @di annotation is allowed on a property');
+}
 
-    /**
+foreach($aAnnotations as $xAnnotation)
+{
+$xAnnotation->setAttr($sProperty);
+$xAnnotation->saveValue($this->xMetadata);
+}
+}
+
+/**
      * @param string $sClass
      * @param string $sMethod
      *
      * @return void
      * @throws AnnotationException
      */
-    private function getMethodAttrs(string $sClass, string $sMethod): void
-    {
-        // Only keep the annotations declared in this package.
-        /** @var array<AbstractAnnotation> */
-        $aAnnotations = array_filter(
-            $this->xManager->getMethodAnnotations($sClass, $sMethod),
-            fn($xAnnotation) => is_a($xAnnotation, AbstractAnnotation::class)
-        );
-        foreach($aAnnotations as $xAnnotation)
-        {
-            $xAnnotation->saveValue($this->xMetadata, $sMethod);
-        }
-    }
+private function getMethodAttrs(string $sClass, string $sMethod): void
+{
+// Only keep the annotations declared in this package.
+/** @var array<AbstractAnnotation> */
+$aAnnotations = array_filter(
+$this->xManager->getMethodAnnotations($sClass, $sMethod),
+fn($xAnnotation) => is_a($xAnnotation, AbstractAnnotation::class)
+);
+foreach($aAnnotations as $xAnnotation)
+{
+$xAnnotation->saveValue($this->xMetadata, $sMethod);
+}
+}
 
-    /**
+/**
      * @inheritDoc
      * @throws SetupException
      */
-    public function getAttributes(InputData $xInput): Metadata
-    {
-        ContainerAnnotation::$xReader = $this;
-        $this->aPropTypes = [];
-        $this->xMetadata = new Metadata();
-        $sClass = $xInput->getReflectionClass()->getName();
-
-        try
-        {
-            // Processing class annotations
-            $this->sCurrMemberType = AnnotationManager::MEMBER_CLASS;
-
-            $this->getClassAttrs($sClass);
-            if($this->xMetadata->isExcluded())
-            {
-                // The entire class is not to be exported.
-                return $this->xMetadata;
-            }
-
-            // Processing properties annotations
-            $this->sCurrMemberType = AnnotationManager::MEMBER_PROPERTY;
-
-            // Properties annotations
-            foreach($xInput->getProperties() as $sProperty)
-            {
-                $this->getPropertyAttrs($sClass, $sProperty);
-            }
-
-            // Processing methods annotations
-            $this->sCurrMemberType = AnnotationManager::MEMBER_METHOD;
-
-            foreach($xInput->getMethods() as $sMethod)
-            {
-                $this->getMethodAttrs($sClass, $sMethod);
-            }
-
-            return $this->xMetadata;
-        }
-        catch(AnnotationException $e)
-        {
-            throw new SetupException($e->getMessage());
-        }
-    }
+public function getAttributes(InputData $xInput): Metadata
+{
+ContainerAnnotation::$xReader = $this;
+$this->aPropTypes = [];
+$this->xMetadata = new Metadata();
+$sClass = $xInput->getReflectionClass()->getName();
+
+try
+{
+// Processing class annotations
+$this->sCurrMemberType = AnnotationManager::MEMBER_CLASS;
+
+$this->getClassAttrs($sClass);
+if($this->xMetadata->isExcluded())
+{
+    // The entire class is not to be exported.
+    return $this->xMetadata;
+}
+
+// Processing properties annotations
+$this->sCurrMemberType = AnnotationManager::MEMBER_PROPERTY;
+
+// Properties annotations
+foreach($xInput->getProperties() as $sProperty)
+{
+    $this->getPropertyAttrs($sClass, $sProperty);
+}
+
+// Processing methods annotations
+$this->sCurrMemberType = AnnotationManager::MEMBER_METHOD;
+
+foreach($xInput->getMethods() as $sMethod)
+{
+    $this->getMethodAttrs($sClass, $sMethod);
+}
+
+return $this->xMetadata;
+}
+catch(AnnotationException $e)
+{
+throw new SetupException($e->getMessage());
+}
+}
 }

jaxon-core/src/App/Component/ComponentTrait.php

Switch Indentation +44 added lines, -44 removed lines

@@ -14,41 +14,41 @@ 
 
 trait ComponentTrait
 {
-    /**
+/**
      * Get the component helper
      *
      * @return ComponentHelper
      */
-    abstract protected function helper(): ComponentHelper;
+abstract protected function helper(): ComponentHelper;
 
-    /**
+/**
      * Get the Ajax response
      *
      * @return AjaxResponse
      */
-    abstract protected function response(): AjaxResponse;
+abstract protected function response(): AjaxResponse;
 
-    /**
+/**
      * Get the Jaxon request target
      *
      * @return TargetInterface|null
      */
-    protected function target(): ?TargetInterface
-    {
-        return $this->helper()->xTarget;
-    }
+protected function target(): ?TargetInterface
+{
+return $this->helper()->xTarget;
+}
 
-    /**
+/**
      * Get the temp cache
      *
      * @return Stash
      */
-    protected function stash(): Stash
-    {
-        return $this->helper()->xStash;
-    }
+protected function stash(): Stash
+{
+return $this->helper()->xStash;
+}
 
-    /**
+/**
      * Get an instance of a Jaxon class by name
      *
      * @template T
@@ -57,60 +57,60 @@ 
      * @return T|null
      * @throws SetupException
      */
-    protected function cl(string $sClassName): mixed
-    {
-        return $this->helper()->cl($sClassName);
-    }
+protected function cl(string $sClassName): mixed
+{
+return $this->helper()->cl($sClassName);
+}
 
-    /**
+/**
      * Get the logger
      *
      * @return LoggerInterface
      */
-    protected function logger(): LoggerInterface
-    {
-        return $this->helper()->xLogger;
-    }
+protected function logger(): LoggerInterface
+{
+return $this->helper()->xLogger;
+}
 
-    /**
+/**
      * Get the view renderer
      *
      * @return ViewRenderer
      */
-    protected function view(): ViewRenderer
-    {
-        return $this->helper()->xViewRenderer;
-    }
+protected function view(): ViewRenderer
+{
+return $this->helper()->xViewRenderer;
+}
 
-    /**
+/**
      * Get the session manager
      *
      * @return SessionInterface
      */
-    protected function session(): SessionInterface
-    {
-        return $this->helper()->xSessionManager;
-    }
+protected function session(): SessionInterface
+{
+return $this->helper()->xSessionManager;
+}
 
-    /**
+/**
      * Get the uploaded files
      *
      * @return array
      */
-    protected function files(): array
-    {
-        return $this->helper()->xUploadHandler->files();
-    }
+protected function files(): array
+{
+return $this->helper()->xUploadHandler->files();
+}
 
-    /**
+/**
      * Get a data bag.
      *
      * @param string  $sBagName
      *
      * @return DatabagContext
      */
-    protected function bag(string $sBagName): DatabagContext
-    {
-        return $this->response()->bag($sBagName);
-    }
+protected function bag(string $sBagName): DatabagContext
+{
+return $this->response()->bag($sBagName);
+}
 }

jaxon-core/src/App/Metadata/MetadataReaderInterface.php

Switch Indentation +2 added lines, -2 removed lines

@@ -16,12 +16,12 @@
 
 interface MetadataReaderInterface
 {
-    /**
+/**
      * Get the component metadata
      *
      * @param InputData $xInput
      *
      * @return Metadata
      */
-    public function getAttributes(InputData $xInput): Metadata;
+public function getAttributes(InputData $xInput): Metadata;
 }

jaxon-core/src/App/Metadata/Data/DatabagData.php

Switch Indentation +33 added lines, -33 removed lines

@@ -22,61 +22,61 @@
 
 class DatabagData extends AbstractData
 {
-    /**
+/**
      * The databag names
      *
      * @var string
      */
-    protected $aNames = [];
+protected $aNames = [];
 
-    /**
+/**
      * @return string
      */
-    public function getName(): string
-    {
-        return 'bags';
-    }
+public function getName(): string
+{
+return 'bags';
+}
 
-    /**
+/**
      * @return mixed
      */
-    public function getValue(): mixed
-    {
-        return array_values($this->aNames);
-    }
+public function getValue(): mixed
+{
+return array_values($this->aNames);
+}
 
-    /**
+/**
      * @param string $sName
      *
      * @return void
      */
-    protected function validateName(string $sName): void
-    {
-        if(preg_match('/^[a-zA-Z][a-zA-Z0-9_\-\.]*$/', $sName) > 0)
-        {
-            return;
-        }
-        throw new SetupException("$sName is not a valid \"name\" value for databag");
-    }
+protected function validateName(string $sName): void
+{
+if(preg_match('/^[a-zA-Z][a-zA-Z0-9_\-\.]*$/', $sName) > 0)
+{
+return;
+}
+throw new SetupException("$sName is not a valid \"name\" value for databag");
+}
 
-    /**
+/**
      * @param string $sName
      *
      * @return void
      */
-    public function addValue(string $sName): void
-    {
-        $this->validateName($sName);
+public function addValue(string $sName): void
+{
+$this->validateName($sName);
 
-        $this->aNames[$sName] = $sName;
-    }
+$this->aNames[$sName] = $sName;
+}
 
-    /**
+/**
      * @inheritDoc
      */
-    public function encode(string $sVarName): array
-    {
-        return array_map(fn($sName) =>
-            "{$sVarName}->addValue('$sName');", $this->aNames);
-    }
+public function encode(string $sVarName): array
+{
+return array_map(fn($sName) =>
+"{$sVarName}->addValue('$sName');", $this->aNames);
+}
 }

jaxon-core/src/App/Metadata/Data/CallbackData.php

Switch Indentation +33 added lines, -33 removed lines

@@ -22,61 +22,61 @@
 
 class CallbackData extends AbstractData
 {
-    /**
+/**
      * The callback js objects
      *
      * @var string
      */
-    protected $aNames = [];
+protected $aNames = [];
 
-    /**
+/**
      * @return string
      */
-    public function getName(): string
-    {
-        return 'callback';
-    }
+public function getName(): string
+{
+return 'callback';
+}
 
-    /**
+/**
      * @return mixed
      */
-    public function getValue(): mixed
-    {
-        return array_values($this->aNames);
-    }
+public function getValue(): mixed
+{
+return array_values($this->aNames);
+}
 
-    /**
+/**
      * @param string $sName
      *
      * @return void
      */
-    protected function validateObjectName(string $sName): void
-    {
-        if(preg_match('/^[a-zA-Z][a-zA-Z0-9_\-\.]*$/', $sName) > 0)
-        {
-            return;
-        }
-        throw new SetupException("$sName is not a valid \"name\" value for callback");
-    }
+protected function validateObjectName(string $sName): void
+{
+if(preg_match('/^[a-zA-Z][a-zA-Z0-9_\-\.]*$/', $sName) > 0)
+{
+return;
+}
+throw new SetupException("$sName is not a valid \"name\" value for callback");
+}
 
-    /**
+/**
      * @param string $sName
      *
      * @return void
      */
-    public function addValue(string $sName): void
-    {
-        $this->validateObjectName($sName);
+public function addValue(string $sName): void
+{
+$this->validateObjectName($sName);
 
-        $this->aNames[$sName] = $sName;
-    }
+$this->aNames[$sName] = $sName;
+}
 
-    /**
+/**
      * @inheritDoc
      */
-    public function encode(string $sVarName): array
-    {
-        return array_map(fn($sName) =>
-            "{$sVarName}->addValue('$sName');", $this->aNames);
-    }
+public function encode(string $sVarName): array
+{
+return array_map(fn($sName) =>
+"{$sVarName}->addValue('$sName');", $this->aNames);
+}
 }

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

Switch Indentation +119 added lines, -119 removed lines

@@ -45,49 +45,49 @@ 
 
 class PluginManager
 {
-    /**
+/**
      * Request plugins, indexed by name
      *
      * @var array<string>
      */
-    private $aRegistryPlugins = [];
+private $aRegistryPlugins = [];
 
-    /**
+/**
      * Request handlers, indexed by name
      *
      * @var array<string>
      */
-    private $aRequestHandlers = [];
+private $aRequestHandlers = [];
 
-    /**
+/**
      * Response plugins, indexed by name
      *
      * @var array<string>
      */
-    private $aResponsePlugins = [];
+private $aResponsePlugins = [];
 
-    /**
+/**
      * The constructor
      *
      * @param Container $di
      * @param CodeGenerator $xCodeGenerator
      * @param Translator $xTranslator
      */
-    public function __construct(private Container $di,
-        private CodeGenerator $xCodeGenerator, private Translator $xTranslator)
-    {}
+public function __construct(private Container $di,
+private CodeGenerator $xCodeGenerator, private Translator $xTranslator)
+{}
 
-    /**
+/**
      * Get the request plugins
      *
      * @return array<class-string>
      */
-    public function getRequestHandlers(): array
-    {
-        return $this->aRequestHandlers;
-    }
+public function getRequestHandlers(): array
+{
+return $this->aRequestHandlers;
+}
 
-    /**
+/**
      * Register a plugin
      *
      * @param class-string $sClassName    The plugin class
@@ -97,40 +97,40 @@ 
      * @return int
      * @throws SetupException
      */
-    private function _registerPlugin(string $sClassName, string $sPluginName, array $aInterfaces): int
-    {
-        // Any plugin must implement the PluginInterface interface.
-        if(!in_array(PluginInterface::class, $aInterfaces))
-        {
-            $sMessage = $this->xTranslator->trans('errors.register.invalid', [
-                'name' => $sClassName,
-            ]);
-            throw new SetupException($sMessage);
-        }
-
-        // Response plugin.
-        if(in_array(ResponsePluginInterface::class, $aInterfaces))
-        {
-            $this->aResponsePlugins[$sPluginName] = $sClassName;
-            return 1;
-        }
-
-        // Request plugin.
-        $nCount = 0;
-        if(in_array(CallableRegistryInterface::class, $aInterfaces))
-        {
-            $this->aRegistryPlugins[$sPluginName] = $sClassName;
-            $nCount++;
-        }
-        if(in_array(RequestHandlerInterface::class, $aInterfaces))
-        {
-            $this->aRequestHandlers[$sPluginName] = $sClassName;
-            $nCount++;
-        }
-        return $nCount;
-    }
-
-    /**
+private function _registerPlugin(string $sClassName, string $sPluginName, array $aInterfaces): int
+{
+// Any plugin must implement the PluginInterface interface.
+if(!in_array(PluginInterface::class, $aInterfaces))
+{
+$sMessage = $this->xTranslator->trans('errors.register.invalid', [
+    'name' => $sClassName,
+]);
+throw new SetupException($sMessage);
+}
+
+// Response plugin.
+if(in_array(ResponsePluginInterface::class, $aInterfaces))
+{
+$this->aResponsePlugins[$sPluginName] = $sClassName;
+return 1;
+}
+
+// Request plugin.
+$nCount = 0;
+if(in_array(CallableRegistryInterface::class, $aInterfaces))
+{
+$this->aRegistryPlugins[$sPluginName] = $sClassName;
+$nCount++;
+}
+if(in_array(RequestHandlerInterface::class, $aInterfaces))
+{
+$this->aRequestHandlers[$sPluginName] = $sClassName;
+$nCount++;
+}
+return $nCount;
+}
+
+/**
      * Register a plugin
      *
      * Below is a table for priorities and their description:
@@ -145,34 +145,34 @@ 
      * @return void
      * @throws SetupException
      */
-    public function registerPlugin(string $sClassName, string $sPluginName, int $nPriority = 1000): void
-    {
-        $aInterfaces = class_implements($sClassName);
-        $nCount = $this->_registerPlugin($sClassName, $sPluginName, $aInterfaces);
-
-        // Any plugin can implement the CodeGeneratorInterface interface.
-        if(in_array(CodeGeneratorInterface::class, $aInterfaces))
-        {
-            $this->xCodeGenerator->addCodeGenerator($sClassName, $nPriority);
-            $nCount++;
-        }
-        // The class is not a valid plugin.
-        if($nCount === 0)
-        {
-            $sMessage = $this->xTranslator->trans('errors.register.invalid', [
-                'name' => $sClassName,
-            ]);
-            throw new SetupException($sMessage);
-        }
-
-        // Register the plugin in the DI container, if necessary
-        if(!$this->di->has($sClassName))
-        {
-            $this->di->auto($sClassName);
-        }
-    }
-
-    /**
+public function registerPlugin(string $sClassName, string $sPluginName, int $nPriority = 1000): void
+{
+$aInterfaces = class_implements($sClassName);
+$nCount = $this->_registerPlugin($sClassName, $sPluginName, $aInterfaces);
+
+// Any plugin can implement the CodeGeneratorInterface interface.
+if(in_array(CodeGeneratorInterface::class, $aInterfaces))
+{
+$this->xCodeGenerator->addCodeGenerator($sClassName, $nPriority);
+$nCount++;
+}
+// The class is not a valid plugin.
+if($nCount === 0)
+{
+$sMessage = $this->xTranslator->trans('errors.register.invalid', [
+    'name' => $sClassName,
+]);
+throw new SetupException($sMessage);
+}
+
+// Register the plugin in the DI container, if necessary
+if(!$this->di->has($sClassName))
+{
+$this->di->auto($sClassName);
+}
+}
+
+/**
      * Find the specified response plugin by name or class name
      *
      * @template R of ResponsePluginInterface
@@ -180,14 +180,14 @@ 
      *
      * @return ($sName is class-string ? R : ResponsePluginInterface)|null
      */
-    public function getResponsePlugin(string $sName): ?ResponsePluginInterface
-    {
-        return $this->di->h($sName) ? $this->di->g($sName) :
-            (!isset($this->aResponsePlugins[$sName]) ? null :
-            $this->di->g($this->aResponsePlugins[$sName]));
-    }
-
-    /**
+public function getResponsePlugin(string $sName): ?ResponsePluginInterface
+{
+return $this->di->h($sName) ? $this->di->g($sName) :
+(!isset($this->aResponsePlugins[$sName]) ? null :
+$this->di->g($this->aResponsePlugins[$sName]));
+}
+
+/**
      * Register a callable function or class
      *
      * Call the request plugin with the $sType defined as name.
@@ -199,46 +199,46 @@ 
      * @return void
      * @throws SetupException
      */
-    public function registerCallable(string $sType, string $sCallable, $xOptions = []): void
-    {
-        if(isset($this->aRegistryPlugins[$sType]) &&
-            ($xPlugin = $this->di->g($this->aRegistryPlugins[$sType])))
-        {
-            $xPlugin->register($sType, $sCallable, $xPlugin->checkOptions($sCallable, $xOptions));
-            return;
-        }
-        throw new SetupException($this->xTranslator->trans('errors.register.plugin',
-            ['name' => $sType, 'callable' => $sCallable]));
-    }
-
-    /**
+public function registerCallable(string $sType, string $sCallable, $xOptions = []): void
+{
+if(isset($this->aRegistryPlugins[$sType]) &&
+($xPlugin = $this->di->g($this->aRegistryPlugins[$sType])))
+{
+$xPlugin->register($sType, $sCallable, $xPlugin->checkOptions($sCallable, $xOptions));
+return;
+}
+throw new SetupException($this->xTranslator->trans('errors.register.plugin',
+['name' => $sType, 'callable' => $sCallable]));
+}
+
+/**
      * Register the Jaxon request plugins
      *
      * @return void
      * @throws SetupException
      */
-    public function registerPlugins(): void
-    {
-        // Request plugins
-        $this->registerPlugin(CallableClassPlugin::class, Jaxon::CALLABLE_CLASS, 101);
-        $this->registerPlugin(CallableFunctionPlugin::class, Jaxon::CALLABLE_FUNCTION, 102);
-        $this->registerPlugin(CallableDirPlugin::class, Jaxon::CALLABLE_DIR, 103);
-
-        // Response plugins
-        $this->registerPlugin(ScriptPlugin::class, ScriptPlugin::NAME, 700);
-        $this->registerPlugin(DatabagPlugin::class, DatabagPlugin::NAME, 700);
-        $this->registerPlugin(DialogPlugin::class, DialogPlugin::NAME, 750);
-        $this->registerPlugin(PaginatorPlugin::class, PaginatorPlugin::NAME, 800);
-        $this->registerPlugin(PsrPlugin::class, PsrPlugin::NAME, 850);
-    }
-
-    /**
+public function registerPlugins(): void
+{
+// Request plugins
+$this->registerPlugin(CallableClassPlugin::class, Jaxon::CALLABLE_CLASS, 101);
+$this->registerPlugin(CallableFunctionPlugin::class, Jaxon::CALLABLE_FUNCTION, 102);
+$this->registerPlugin(CallableDirPlugin::class, Jaxon::CALLABLE_DIR, 103);
+
+// Response plugins
+$this->registerPlugin(ScriptPlugin::class, ScriptPlugin::NAME, 700);
+$this->registerPlugin(DatabagPlugin::class, DatabagPlugin::NAME, 700);
+$this->registerPlugin(DialogPlugin::class, DialogPlugin::NAME, 750);
+$this->registerPlugin(PaginatorPlugin::class, PaginatorPlugin::NAME, 800);
+$this->registerPlugin(PsrPlugin::class, PsrPlugin::NAME, 850);
+}
+
+/**
      * Get the parameter reader
      *
      * @return ParameterReader
      */
-    public function getParameterReader(): ParameterReader
-    {
-        return $this->di->g(ParameterReader::class);
-    }
+public function getParameterReader(): ParameterReader
+{
+return $this->di->g(ParameterReader::class);
+}
 }