jaxon-php / jaxon-mono

jaxon-core/src/Jaxon.php

Switch Indentation +8 added lines, -8 removed lines

@@ -16,23 +16,23 @@
 
 class Jaxon
 {
-    /**
+/**
      * @const string
      */
-    public const VERSION = 'Jaxon 5.x';
+public const VERSION = 'Jaxon 5.x';
 
-    /**
+/**
      * @const string
      */
-    public const CALLABLE_CLASS = 'CallableClass';
+public const CALLABLE_CLASS = 'CallableClass';
 
-    /**
+/**
      * @const string
      */
-    public const CALLABLE_DIR = 'CallableDir';
+public const CALLABLE_DIR = 'CallableDir';
 
-    /**
+/**
      * @const string
      */
-    public const CALLABLE_FUNCTION = 'CallableFunction';
+public const CALLABLE_FUNCTION = 'CallableFunction';
 }

jaxon-annotations/src/Annotation/DatabagAnnotation.php

Switch Indentation +22 added lines, -22 removed lines

@@ -28,40 +28,40 @@
  */
 class DatabagAnnotation extends AbstractAnnotation
 {
-    /**
+/**
      * The data bag name
      *
      * @var string
      */
-    protected $sName = '';
+protected $sName = '';
 
-    /**
+/**
      * @inheritDoc
      */
-    public static function parseAnnotation($value)
-    {
-        $aParams = preg_split('/[\s]+/', $value, 2);
-        return count($aParams) === 1 ? ['name' => $aParams[0]] : ['name' => $aParams[0], 'extra' => $aParams[1]];
-    }
+public static function parseAnnotation($value)
+{
+$aParams = preg_split('/[\s]+/', $value, 2);
+return count($aParams) === 1 ? ['name' => $aParams[0]] : ['name' => $aParams[0], 'extra' => $aParams[1]];
+}
 
-    /**
+/**
      * @inheritDoc
      * @throws AnnotationException
      */
-    public function initAnnotation(array $properties)
-    {
-        if(count($properties) !== 1 || !isset($properties['name']) || !is_string($properties['name']))
-        {
-            throw new AnnotationException('The @databag annotation requires a property "name" of type string');
-        }
-        $this->sName = $properties['name'];
-    }
+public function initAnnotation(array $properties)
+{
+if(count($properties) !== 1 || !isset($properties['name']) || !is_string($properties['name']))
+{
+throw new AnnotationException('The @databag annotation requires a property "name" of type string');
+}
+$this->sName = $properties['name'];
+}
 
-    /**
+/**
      * @inheritDoc
      */
-    public function saveValue(Metadata $xMetadata, string $sMethod = '*'): void
-    {
-        $xMetadata->databag($sMethod)->addValue($this->sName);
-    }
+public function saveValue(Metadata $xMetadata, string $sMethod = '*'): void
+{
+$xMetadata->databag($sMethod)->addValue($this->sName);
+}
 }

jaxon-core/src/App/Databag/DatabagContext.php

Switch Indentation +25 added lines, -25 removed lines

@@ -4,58 +4,58 @@
 
 class DatabagContext
 {
-    /**
+/**
      * @var Databag
      */
-    protected $xDatabag;
+protected $xDatabag;
 
-    /**
+/**
      * @var string
      */
-    protected $sName;
+protected $sName;
 
-    /**
+/**
      * The constructor
      *
      * @param Databag $xDatabag
      * @param string $sName
      */
-    public function __construct(Databag $xDatabag, string $sName)
-    {
-        $this->xDatabag = $xDatabag;
-        $this->sName = $sName;
-    }
+public function __construct(Databag $xDatabag, string $sName)
+{
+$this->xDatabag = $xDatabag;
+$this->sName = $sName;
+}
 
-    /**
+/**
      * @param string $sKey
      * @param mixed $xValue
      *
      * @return void
      */
-    public function set(string $sKey, $xValue): void
-    {
-        $this->xDatabag->set($this->sName, $sKey, $xValue);
-    }
+public function set(string $sKey, $xValue): void
+{
+$this->xDatabag->set($this->sName, $sKey, $xValue);
+}
 
-    /**
+/**
      * @param string $sKey
      * @param mixed $xValue
      *
      * @return void
      */
-    public function new(string $sKey, $xValue): void
-    {
-        $this->xDatabag->new($this->sName, $sKey, $xValue);
-    }
+public function new(string $sKey, $xValue): void
+{
+$this->xDatabag->new($this->sName, $sKey, $xValue);
+}
 
-    /**
+/**
      * @param string $sKey
      * @param mixed $xValue
      *
      * @return mixed
      */
-    public function get(string $sKey, $xValue = null): mixed
-    {
-        return $this->xDatabag->get($this->sName, $sKey, $xValue);
-    }
+public function get(string $sKey, $xValue = null): mixed
+{
+return $this->xDatabag->get($this->sName, $sKey, $xValue);
+}
 }

jaxon-core/src/App/Databag/Databag.php

Switch Indentation +56 added lines, -56 removed lines

@@ -11,110 +11,110 @@
 
 class Databag implements JsonSerializable
 {
-    /**
+/**
      * @var DatabagPlugin
      */
-    protected $xPlugin;
+protected $xPlugin;
 
-    /**
+/**
      * @var array
      */
-    protected $aData = [];
+protected $aData = [];
 
-    /**
+/**
      * @var bool
      */
-    protected $bTouched = false;
+protected $bTouched = false;
 
-    /**
+/**
      * The constructor
      *
      * @param array $aData
      */
-    public function __construct(DatabagPlugin $xPlugin, array $aData)
-    {
-        $this->xPlugin = $xPlugin;
-        // Ensure all contents are arrays.
-        $this->aData = array_map(function($aValue) {
-            return is_array($aValue) ? $aValue : [];
-        }, $aData);
-    }
+public function __construct(DatabagPlugin $xPlugin, array $aData)
+{
+$this->xPlugin = $xPlugin;
+// Ensure all contents are arrays.
+$this->aData = array_map(function($aValue) {
+return is_array($aValue) ? $aValue : [];
+}, $aData);
+}
 
-    /**
+/**
      * @return bool
      */
-    public function touched(): bool
-    {
-        return $this->bTouched;
-    }
+public function touched(): bool
+{
+return $this->bTouched;
+}
 
-    /**
+/**
      * @return array
      */
-    public function getAll(): array
-    {
-        return $this->aData;
-    }
+public function getAll(): array
+{
+return $this->aData;
+}
 
-    /**
+/**
      * @param string $sBag
      *
      * @return void
      */
-    public function clear(string $sBag): void
-    {
-        $this->aData[$sBag] = [];
-        $this->xPlugin->addCommand('databag.clear', ['bag' => $sBag]);
-    }
+public function clear(string $sBag): void
+{
+$this->aData[$sBag] = [];
+$this->xPlugin->addCommand('databag.clear', ['bag' => $sBag]);
+}
 
-    /**
+/**
      * @param string $sBag
      * @param string $sKey
      * @param mixed $xValue
      *
      * @return void
      */
-    public function set(string $sBag, string $sKey, $xValue): void
-    {
-        $this->bTouched = true;
-        $this->aData[$sBag][$sKey] = $xValue;
-    }
+public function set(string $sBag, string $sKey, $xValue): void
+{
+$this->bTouched = true;
+$this->aData[$sBag][$sKey] = $xValue;
+}
 
-    /**
+/**
      * @param string $sBag
      * @param string $sKey
      * @param mixed $xValue
      *
      * @return void
      */
-    public function new(string $sBag, string $sKey, $xValue): void
-    {
-        // Set the value only if it doesn't already exist.
-        if(!isset($this->aData[$sBag]) || !key_exists($sKey, $this->aData[$sBag]))
-        {
-            $this->set($sBag, $sKey, $xValue);
-        }
-    }
+public function new(string $sBag, string $sKey, $xValue): void
+{
+// Set the value only if it doesn't already exist.
+if(!isset($this->aData[$sBag]) || !key_exists($sKey, $this->aData[$sBag]))
+{
+$this->set($sBag, $sKey, $xValue);
+}
+}
 
-    /**
+/**
      * @param string $sBag
      * @param string $sKey
      * @param mixed $xValue
      *
      * @return mixed
      */
-    public function get(string $sBag, string $sKey, $xValue = null): mixed
-    {
-        return $this->aData[$sBag][$sKey] ?? $xValue;
-    }
+public function get(string $sBag, string $sKey, $xValue = null): mixed
+{
+return $this->aData[$sBag][$sKey] ?? $xValue;
+}
 
-    /**
+/**
      * Convert this call to array, when converting the response into json.
      *
      * @return array
      */
-    public function jsonSerialize(): array
-    {
-        return $this->aData;
-    }
+public function jsonSerialize(): array
+{
+return $this->aData;
+}
 }

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

Switch Indentation +53 added lines, -53 removed lines

@@ -15,81 +15,81 @@
 
 trait CallableTrait
 {
-    /**
+/**
      * Register the values into the container
      *
      * @return void
      */
-    private function registerCallables(): void
-    {
-        // Validator
-        $this->set(Validator::class, function($di) {
-            return new Validator($di->g(ConfigManager::class), $di->g(Translator::class));
-        });
-        // Callable objects registry
-        $this->set(ComponentRegistry::class, function($di) {
-            return new ComponentRegistry($di->g(ComponentContainer::class));
-        });
-        // Callable class plugin
-        $this->set(CallableClassPlugin::class, function($di) {
-            $sPrefix = $di->g(ConfigManager::class)->getOption('core.prefix.class');
-            return new CallableClassPlugin($sPrefix, $di->getLogger(),
-                $di->g(ComponentContainer::class), $di->g(ComponentRegistry::class),
-                $di->g(Translator::class), $di->g(TemplateEngine::class),
-                $di->g(Validator::class));
-        });
-        // Callable dir plugin
-        $this->set(CallableDirPlugin::class, function($di) {
-            return new CallableDirPlugin($di->g(ComponentContainer::class),
-                $di->g(ComponentRegistry::class), $di->g(Translator::class));
-        });
-        // Callable function plugin
-        $this->set(CallableFunctionPlugin::class, function($di) {
-            $sPrefix = $di->g(ConfigManager::class)->getOption('core.prefix.function');
-            $bDebug = $di->g(ConfigManager::class)->getOption('core.debug.on', false);
-            return new CallableFunctionPlugin($sPrefix, $bDebug,
-                $di->g(Container::class), $di->g(TemplateEngine::class),
-                $di->g(Translator::class), $di->g(Validator::class));
-        });
-    }
+private function registerCallables(): void
+{
+// Validator
+$this->set(Validator::class, function($di) {
+return new Validator($di->g(ConfigManager::class), $di->g(Translator::class));
+});
+// Callable objects registry
+$this->set(ComponentRegistry::class, function($di) {
+return new ComponentRegistry($di->g(ComponentContainer::class));
+});
+// Callable class plugin
+$this->set(CallableClassPlugin::class, function($di) {
+$sPrefix = $di->g(ConfigManager::class)->getOption('core.prefix.class');
+return new CallableClassPlugin($sPrefix, $di->getLogger(),
+    $di->g(ComponentContainer::class), $di->g(ComponentRegistry::class),
+    $di->g(Translator::class), $di->g(TemplateEngine::class),
+    $di->g(Validator::class));
+});
+// Callable dir plugin
+$this->set(CallableDirPlugin::class, function($di) {
+return new CallableDirPlugin($di->g(ComponentContainer::class),
+    $di->g(ComponentRegistry::class), $di->g(Translator::class));
+});
+// Callable function plugin
+$this->set(CallableFunctionPlugin::class, function($di) {
+$sPrefix = $di->g(ConfigManager::class)->getOption('core.prefix.function');
+$bDebug = $di->g(ConfigManager::class)->getOption('core.debug.on', false);
+return new CallableFunctionPlugin($sPrefix, $bDebug,
+    $di->g(Container::class), $di->g(TemplateEngine::class),
+    $di->g(Translator::class), $di->g(Validator::class));
+});
+}
 
-    /**
+/**
      * Get the callable registry
      *
      * @return ComponentRegistry
      */
-    public function getComponentRegistry(): ComponentRegistry
-    {
-        return $this->g(ComponentRegistry::class);
-    }
+public function getComponentRegistry(): ComponentRegistry
+{
+return $this->g(ComponentRegistry::class);
+}
 
-    /**
+/**
      * Get the callable function plugin
      *
      * @return CallableFunctionPlugin
      */
-    public function getCallableFunctionPlugin(): CallableFunctionPlugin
-    {
-        return $this->g(CallableFunctionPlugin::class);
-    }
+public function getCallableFunctionPlugin(): CallableFunctionPlugin
+{
+return $this->g(CallableFunctionPlugin::class);
+}
 
-    /**
+/**
      * Get the callable class plugin
      *
      * @return CallableClassPlugin
      */
-    public function getCallableClassPlugin(): CallableClassPlugin
-    {
-        return $this->g(CallableClassPlugin::class);
-    }
+public function getCallableClassPlugin(): CallableClassPlugin
+{
+return $this->g(CallableClassPlugin::class);
+}
 
-    /**
+/**
      * Get the callable dir plugin
      *
      * @return CallableDirPlugin
      */
-    public function getCallableDirPlugin(): CallableDirPlugin
-    {
-        return $this->g(CallableDirPlugin::class);
-    }
+public function getCallableDirPlugin(): CallableDirPlugin
+{
+return $this->g(CallableDirPlugin::class);
+}
 }

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

Switch Indentation +28 added lines, -28 removed lines

@@ -9,50 +9,50 @@
 
 trait MetadataTrait
 {
-    /**
+/**
      * Register the values into the container
      *
      * @return void
      */
-    private function registerMetadataReader(): void
-    {
-        // Metadata cache
-        $this->set(MetadataCache::class, fn($di) =>
-            new MetadataCache($di->g('jaxon_metadata_cache_dir')));
+private function registerMetadataReader(): void
+{
+// Metadata cache
+$this->set(MetadataCache::class, fn($di) =>
+new MetadataCache($di->g('jaxon_metadata_cache_dir')));
 
-        // By default, register a fake metadata reader.
-        $this->set('metadata_reader_null', function() {
-            return new class implements MetadataReaderInterface
-            {
-                public function getAttributes(InputData $xInputData): Metadata
-                {
-                    return new Metadata();
-                }
-            };
-        });
+// By default, register a fake metadata reader.
+$this->set('metadata_reader_null', function() {
+return new class implements MetadataReaderInterface
+{
+    public function getAttributes(InputData $xInputData): Metadata
+    {
+        return new Metadata();
     }
+};
+});
+}
 
-    /**
+/**
      * Get the metadata cache
      *
      * @return MetadataCache
      */
-    public function getMetadataCache(): MetadataCache
-    {
-        return $this->g(MetadataCache::class);
-    }
+public function getMetadataCache(): MetadataCache
+{
+return $this->g(MetadataCache::class);
+}
 
-    /**
+/**
      * Get the metadata reader with the given id
      *
      * @param string $sReaderId
      *
      * @return MetadataReaderInterface
      */
-    public function getMetadataReader(string $sReaderId): MetadataReaderInterface
-    {
-        return $this->h("metadata_reader_$sReaderId") ?
-            $this->g("metadata_reader_$sReaderId") :
-            $this->g('metadata_reader_null');
-    }
+public function getMetadataReader(string $sReaderId): MetadataReaderInterface
+{
+return $this->h("metadata_reader_$sReaderId") ?
+$this->g("metadata_reader_$sReaderId") :
+$this->g('metadata_reader_null');
+}
 }

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

Switch Indentation +62 added lines, -62 removed lines

@@ -16,104 +16,104 @@
 
 trait AppTrait
 {
-    /**
+/**
      * @var string
      */
-    private $sJsLibVersion = 'jaxon_javascript_library_version';
+private $sJsLibVersion = 'jaxon_javascript_library_version';
 
-    /**
+/**
      * Register the values into the container
      *
      * @return void
      */
-    private function registerApp(): void
-    {
-        // Config Manager
-        $this->set(ConfigEventManager::class, function($di) {
-            return new ConfigEventManager($di->g(Container::class));
-        });
-        $this->set(ConfigManager::class, function($di) {
-            $aDefaultOptions = require(__DIR__ . '/../../../config/lib.php');
-            return new ConfigManager($aDefaultOptions, $di->g(Translator::class),
-                $di->g(ConfigReader::class), $di->g(ConfigSetter::class),
-                $di->g(ConfigEventManager::class));
-        });
+private function registerApp(): void
+{
+// Config Manager
+$this->set(ConfigEventManager::class, function($di) {
+return new ConfigEventManager($di->g(Container::class));
+});
+$this->set(ConfigManager::class, function($di) {
+$aDefaultOptions = require(__DIR__ . '/../../../config/lib.php');
+return new ConfigManager($aDefaultOptions, $di->g(Translator::class),
+    $di->g(ConfigReader::class), $di->g(ConfigSetter::class),
+    $di->g(ConfigEventManager::class));
+});
 
-        // Jaxon App
-        $this->set(AppInterface::class, fn() => new App());
-        // Jaxon App bootstrap
-        $this->set(Bootstrap::class, function($di) {
-            return new Bootstrap($di->g(ConfigManager::class),
-                $di->g(PackageManager::class), $di->g(CallbackManager::class));
-        });
-        // The javascript library version
-        $this->set($this->sJsLibVersion, function($di) {
-            $xRequest = $di->getRequest();
-            $aParams = $xRequest->getMethod() === 'POST' ?
-                $xRequest->getParsedBody() : $xRequest->getQueryParams();
-            return $aParams['jxnv'] ?? '3.3.0';
-        });
-    }
+// Jaxon App
+$this->set(AppInterface::class, fn() => new App());
+// Jaxon App bootstrap
+$this->set(Bootstrap::class, function($di) {
+return new Bootstrap($di->g(ConfigManager::class),
+    $di->g(PackageManager::class), $di->g(CallbackManager::class));
+});
+// The javascript library version
+$this->set($this->sJsLibVersion, function($di) {
+$xRequest = $di->getRequest();
+$aParams = $xRequest->getMethod() === 'POST' ?
+    $xRequest->getParsedBody() : $xRequest->getQueryParams();
+return $aParams['jxnv'] ?? '3.3.0';
+});
+}
 
-    /**
+/**
      * Register the event handlers
      *
      * @return void
      */
-    private function setEventHandlers(): void
-    {
-        $xEventManager = $this->g(ConfigEventManager::class);
-        $xEventManager->addLibConfigListener(Translator::class);
-    }
+private function setEventHandlers(): void
+{
+$xEventManager = $this->g(ConfigEventManager::class);
+$xEventManager->addLibConfigListener(Translator::class);
+}
 
-    /**
+/**
      * Get the App instance
      *
      * @return AppInterface
      */
-    public function getApp(): AppInterface
-    {
-        return $this->g(AppInterface::class);
-    }
+public function getApp(): AppInterface
+{
+return $this->g(AppInterface::class);
+}
 
-    /**
+/**
      * Get the App bootstrap
      *
      * @return Bootstrap
      */
-    public function getBootstrap(): Bootstrap
-    {
-        return $this->g(Bootstrap::class);
-    }
+public function getBootstrap(): Bootstrap
+{
+return $this->g(Bootstrap::class);
+}
 
-    /**
+/**
      * Get the config manager
      *
      * @return ConfigManager
      */
-    public function config(): ConfigManager
-    {
-        return $this->g(ConfigManager::class);
-    }
+public function config(): ConfigManager
+{
+return $this->g(ConfigManager::class);
+}
 
-    /**
+/**
      * Get the javascript library version
      *
      * @return string
      */
-    public function getJsLibVersion(): string
-    {
-        return $this->g($this->sJsLibVersion);
-    }
+public function getJsLibVersion(): string
+{
+return $this->g($this->sJsLibVersion);
+}
 
-    /**
+/**
      * Get the default request URI
      *
      * @return string
      */
-    public function getRequestUri(): string
-    {
-        return $this->config()->getOption('core.request.uri',
-            $this->getParameterReader()->uri());
-    }
+public function getRequestUri(): string
+{
+return $this->config()->getOption('core.request.uri',
+$this->getParameterReader()->uri());
+}
 }