jaxon-php / jaxon-mono

jaxon-core/src/App/View/Store.php

Switch Indentation +55 added lines, -55 removed lines

@@ -9,35 +9,35 @@ 
 
 class Store implements JsonSerializable, Stringable
 {
-    /**
+/**
      * The view renderer
      *
      * @var ViewInterface|null
      */
-    protected $xRenderer = null;
+protected $xRenderer = null;
 
-    /**
+/**
      * The view namespace
      *
      * @var string
      */
-    protected $sNamespace;
+protected $sNamespace;
 
-    /**
+/**
      * The view name
      *
      * @var string
      */
-    protected $sViewName;
+protected $sViewName;
 
-    /**
+/**
      * The view data
      *
      * @var array
      */
-    protected $aViewData = [];
+protected $aViewData = [];
 
-    /**
+/**
      * Make a piece of data available for the rendered view
      *
      * @param string $sName    The data name
@@ -45,26 +45,26 @@ 
      *
      * @return Store
      */
-    public function with(string $sName, $xValue): Store
-    {
-        $this->aViewData[$sName] = $xValue;
-        return $this;
-    }
+public function with(string $sName, $xValue): Store
+{
+$this->aViewData[$sName] = $xValue;
+return $this;
+}
 
-    /**
+/**
      * Set the data to be rendered
      *
      * @param array $aViewData    The view data
      *
      * @return Store
      */
-    public function setData(array $aViewData): Store
-    {
-        $this->aViewData = array_merge($this->aViewData, $aViewData);
-        return $this;
-    }
+public function setData(array $aViewData): Store
+{
+$this->aViewData = array_merge($this->aViewData, $aViewData);
+return $this;
+}
 
-    /**
+/**
      * Set the view to be rendered, with optional data
      *
      * @param ViewInterface $xRenderer    The view renderer
@@ -74,65 +74,65 @@ 
      *
      * @return Store
      */
-    public function setView(ViewInterface $xRenderer,
-        string $sNamespace, string $sViewName, array $aViewData = []): Store
-    {
-        $this->xRenderer = $xRenderer;
-        $this->sNamespace = trim($sNamespace);
-        $this->sViewName = trim($sViewName);
-        $this->aViewData = array_merge($this->aViewData, $aViewData);
-        return $this;
-    }
+public function setView(ViewInterface $xRenderer,
+string $sNamespace, string $sViewName, array $aViewData = []): Store
+{
+$this->xRenderer = $xRenderer;
+$this->sNamespace = trim($sNamespace);
+$this->sViewName = trim($sViewName);
+$this->aViewData = array_merge($this->aViewData, $aViewData);
+return $this;
+}
 
-    /**
+/**
      * Get the view namespace
      *
      * @return string        The view namespace
      */
-    public function getNamespace(): string
-    {
-        return $this->sNamespace;
-    }
+public function getNamespace(): string
+{
+return $this->sNamespace;
+}
 
-    /**
+/**
      * Get the view name
      *
      * @return string        The view name
      */
-    public function getViewName(): string
-    {
-        return $this->sViewName;
-    }
+public function getViewName(): string
+{
+return $this->sViewName;
+}
 
-    /**
+/**
      * Get the view data
      *
      * @return array         The view data
      */
-    public function getViewData(): array
-    {
-        return $this->aViewData;
-    }
+public function getViewData(): array
+{
+return $this->aViewData;
+}
 
-    /**
+/**
      * Render a view using third party view system
      *
      * @return string        The string representation of the view
      */
-    public function __toString(): string
-    {
-        return !$this->xRenderer ? '' : $this->xRenderer->render($this);
-    }
+public function __toString(): string
+{
+return !$this->xRenderer ? '' : $this->xRenderer->render($this);
+}
 
-    /**
+/**
      * Convert this object to string for json.
      *
      * This is a method of the JsonSerializable interface.
      *
      * @return string
      */
-    public function jsonSerialize(): string
-    {
-        return $this->__toString();
-    }
+public function jsonSerialize(): string
+{
+return $this->__toString();
+}
 }

jaxon-core/src/App/View/ViewRenderer.php

Switch Indentation +151 added lines, -151 removed lines

@@ -13,58 +13,58 @@ 
 
 class ViewRenderer
 {
-    /**
+/**
      * @var Container
      */
-    protected $di;
+protected $di;
 
-    /**
+/**
      * The view data store
      *
      * @var Store|null
      */
-    protected $xStore = null;
+protected $xStore = null;
 
-    /**
+/**
      * The view data store
      *
      * @var Store
      */
-    protected $xEmptyStore = null;
+protected $xEmptyStore = null;
 
-    /**
+/**
      * The view namespaces
      *
      * @var array
      */
-    protected $aNamespaces = [];
+protected $aNamespaces = [];
 
-    /**
+/**
      * The default namespace
      *
      * @var string
      */
-    protected $sDefaultNamespace = 'jaxon';
+protected $sDefaultNamespace = 'jaxon';
 
-    /**
+/**
      * The view global data
      *
      * @var array
      */
-    protected $aViewData = [];
+protected $aViewData = [];
 
-    /**
+/**
      * The class constructor
      *
      * @param Container $di
      */
-    public function __construct(Container $di)
-    {
-        $this->di = $di;
-        $this->xEmptyStore = new Store();
-    }
+public function __construct(Container $di)
+{
+$this->di = $di;
+$this->xEmptyStore = new Store();
+}
 
-    /**
+/**
      * Add a view namespace, and set the corresponding renderer.
      *
      * @param string $sNamespace    The namespace name
@@ -74,59 +74,59 @@ 
      *
      * @return void
      */
-    public function addNamespace(string $sNamespace, string $sDirectory,
-        string $sExtension, string $sRenderer): void
-    {
-        $aNamespace = [
-            'directory' => $sDirectory,
-            'extension' => $sExtension,
-            'renderer' => $sRenderer,
-        ];
-        $this->aNamespaces[$sNamespace] = $aNamespace;
-    }
+public function addNamespace(string $sNamespace, string $sDirectory,
+string $sExtension, string $sRenderer): void
+{
+$aNamespace = [
+'directory' => $sDirectory,
+'extension' => $sExtension,
+'renderer' => $sRenderer,
+];
+$this->aNamespaces[$sNamespace] = $aNamespace;
+}
 
-    /**
+/**
      * Set the view namespaces.
      *
      * @param Config $xAppConfig    The config options provided in the library
      *
      * @return void
      */
-    public function addNamespaces(Config $xAppConfig): void
-    {
-        if(empty($aNamespaces = $xAppConfig->getOptionNames('views')))
-        {
-            return;
-        }
+public function addNamespaces(Config $xAppConfig): void
+{
+if(empty($aNamespaces = $xAppConfig->getOptionNames('views')))
+{
+return;
+}
 
-        $sPackage = $xAppConfig->getOption('package', '');
-        foreach($aNamespaces as $sNamespace => $sOption)
-        {
-            // Save the namespace
-            $aNamespace = $xAppConfig->getOption($sOption);
-            $aNamespace['package'] = $sPackage;
-            if(!isset($aNamespace['renderer']))
-            {
-                $aNamespace['renderer'] = 'jaxon'; // 'jaxon' is the default renderer.
-            }
-            $this->aNamespaces[$sNamespace] = $aNamespace;
-        }
-    }
+$sPackage = $xAppConfig->getOption('package', '');
+foreach($aNamespaces as $sNamespace => $sOption)
+{
+// Save the namespace
+$aNamespace = $xAppConfig->getOption($sOption);
+$aNamespace['package'] = $sPackage;
+if(!isset($aNamespace['renderer']))
+{
+    $aNamespace['renderer'] = 'jaxon'; // 'jaxon' is the default renderer.
+}
+$this->aNamespaces[$sNamespace] = $aNamespace;
+}
+}
 
-    /**
+/**
      * Get the view renderer
      *
      * @param string $sId    The unique identifier of the view renderer
      *
      * @return ViewInterface
      */
-    public function getRenderer(string $sId): ViewInterface
-    {
-        // Return the view renderer with the given id
-        return $this->di->g("jaxon.app.view.$sId");
-    }
+public function getRenderer(string $sId): ViewInterface
+{
+// Return the view renderer with the given id
+return $this->di->g("jaxon.app.view.$sId");
+}
 
-    /**
+/**
      * Add a view renderer with an id
      *
      * @param string $sId    The unique identifier of the view renderer
@@ -134,25 +134,25 @@ 
      *
      * @return void
      */
-    public function addRenderer(string $sId, Closure $xClosure): void
-    {
-        // Return the initialized view renderer
-        $this->di->set("jaxon.app.view.$sId", function($di) use($sId, $xClosure) {
-            // Get the defined renderer
-            $xRenderer = $xClosure($di);
-            // Init the renderer with the template namespaces
-            $aNamespaces = array_filter($this->aNamespaces, function($aOptions) use($sId) {
-                return $aOptions['renderer'] === $sId;
-            });
-            foreach($aNamespaces as $sName => $aOptions)
-            {
-                $xRenderer->addNamespace($sName, $aOptions['directory'], $aOptions['extension']);
-            }
-            return $xRenderer;
-        });
-    }
+public function addRenderer(string $sId, Closure $xClosure): void
+{
+// Return the initialized view renderer
+$this->di->set("jaxon.app.view.$sId", function($di) use($sId, $xClosure) {
+// Get the defined renderer
+$xRenderer = $xClosure($di);
+// Init the renderer with the template namespaces
+$aNamespaces = array_filter($this->aNamespaces, function($aOptions) use($sId) {
+    return $aOptions['renderer'] === $sId;
+});
+foreach($aNamespaces as $sName => $aOptions)
+{
+    $xRenderer->addNamespace($sName, $aOptions['directory'], $aOptions['extension']);
+}
+return $xRenderer;
+});
+}
 
-    /**
+/**
      * Add a view renderer with an id
      *
      * @param string $sId    The unique identifier of the view renderer
@@ -161,55 +161,55 @@ 
      *
      * @return void
      */
-    public function setDefaultRenderer(string $sId, string $sExtension, Closure $xClosure): void
-    {
-        $this->setDefaultNamespace($sId);
-        $this->addNamespace($sId, '', $sExtension, $sId);
-        $this->addRenderer($sId, $xClosure);
-    }
+public function setDefaultRenderer(string $sId, string $sExtension, Closure $xClosure): void
+{
+$this->setDefaultNamespace($sId);
+$this->addNamespace($sId, '', $sExtension, $sId);
+$this->addRenderer($sId, $xClosure);
+}
 
-    /**
+/**
      * Get the view renderer for a given namespace
      *
      * @param string $sNamespace    The namespace name
      *
      * @return ViewInterface|null
      */
-    public function getNamespaceRenderer(string $sNamespace): ?ViewInterface
-    {
-        if(!isset($this->aNamespaces[$sNamespace]))
-        {
-            return null;
-        }
-        // Return the view renderer with the configured id
-        return $this->getRenderer($this->aNamespaces[$sNamespace]['renderer']);
-    }
+public function getNamespaceRenderer(string $sNamespace): ?ViewInterface
+{
+if(!isset($this->aNamespaces[$sNamespace]))
+{
+return null;
+}
+// Return the view renderer with the configured id
+return $this->getRenderer($this->aNamespaces[$sNamespace]['renderer']);
+}
 
-    /**
+/**
      * Set the default namespace
      *
      * @param string $sDefaultNamespace
      */
-    public function setDefaultNamespace(string $sDefaultNamespace): void
-    {
-        $this->sDefaultNamespace = $sDefaultNamespace;
-    }
+public function setDefaultNamespace(string $sDefaultNamespace): void
+{
+$this->sDefaultNamespace = $sDefaultNamespace;
+}
 
-    /**
+/**
      * Get the current store or create a new store
      *
      * @return Store
      */
-    protected function store(): Store
-    {
-        if(!$this->xStore)
-        {
-            $this->xStore = new Store();
-        }
-        return $this->xStore;
-    }
+protected function store(): Store
+{
+if(!$this->xStore)
+{
+$this->xStore = new Store();
+}
+return $this->xStore;
+}
 
-    /**
+/**
      * Make a piece of data available for the rendered view
      *
      * @param string $sName    The data name
@@ -217,13 +217,13 @@ 
      *
      * @return ViewRenderer
      */
-    public function set(string $sName, $xValue): ViewRenderer
-    {
-        $this->store()->with($sName, $xValue);
-        return $this;
-    }
+public function set(string $sName, $xValue): ViewRenderer
+{
+$this->store()->with($sName, $xValue);
+return $this;
+}
 
-    /**
+/**
      * Make a piece of data available for all views
      *
      * @param string $sName    The data name
@@ -231,29 +231,29 @@ 
      *
      * @return ViewRenderer
      */
-    public function share(string $sName, $xValue): ViewRenderer
-    {
-        $this->aViewData[$sName] = $xValue;
-        return $this;
-    }
+public function share(string $sName, $xValue): ViewRenderer
+{
+$this->aViewData[$sName] = $xValue;
+return $this;
+}
 
-    /**
+/**
      * Make an array of data available for all views
      *
      * @param array $aValues    The data values
      *
      * @return ViewRenderer
      */
-    public function shareValues(array $aValues): ViewRenderer
-    {
-        foreach($aValues as $sName => $xValue)
-        {
-            $this->share($sName, $xValue);
-        }
-        return $this;
-    }
+public function shareValues(array $aValues): ViewRenderer
+{
+foreach($aValues as $sName => $xValue)
+{
+$this->share($sName, $xValue);
+}
+return $this;
+}
 
-    /**
+/**
      * Render a view using a store
      *
      * The store returned by this function will later be used with the make() method to render the view.
@@ -263,32 +263,32 @@ 
      *
      * @return Store   A store populated with the view data
      */
-    public function render(string $sViewName, array $aViewData = []): Store
-    {
-        $xStore = $this->store();
-        // Get the default view namespace
-        $sNamespace = $this->sDefaultNamespace;
-        // Get the namespace from the view name
-        $nSeparatorPosition = strrpos($sViewName, '::');
-        if($nSeparatorPosition !== false)
-        {
-            $sNamespace = substr($sViewName, 0, $nSeparatorPosition);
-            $sViewName = substr($sViewName, $nSeparatorPosition + 2);
-        }
+public function render(string $sViewName, array $aViewData = []): Store
+{
+$xStore = $this->store();
+// Get the default view namespace
+$sNamespace = $this->sDefaultNamespace;
+// Get the namespace from the view name
+$nSeparatorPosition = strrpos($sViewName, '::');
+if($nSeparatorPosition !== false)
+{
+$sNamespace = substr($sViewName, 0, $nSeparatorPosition);
+$sViewName = substr($sViewName, $nSeparatorPosition + 2);
+}
 
-        $xRenderer = $this->getNamespaceRenderer($sNamespace);
-        if(!$xRenderer)
-        {
-            // Cannot render a view if there's no renderer corresponding to the namespace.
-            return $this->xEmptyStore;
-        }
+$xRenderer = $this->getNamespaceRenderer($sNamespace);
+if(!$xRenderer)
+{
+// Cannot render a view if there's no renderer corresponding to the namespace.
+return $this->xEmptyStore;
+}
 
-        $xStore->setData(array_merge($this->aViewData, $aViewData))
-            ->setView($xRenderer, $sNamespace, $sViewName);
+$xStore->setData(array_merge($this->aViewData, $aViewData))
+->setView($xRenderer, $sNamespace, $sViewName);
 
-        // Set the store to null so a new store will be created for the next view.
-        $this->xStore = null;
-        // Return the store
-        return $xStore;
-    }
+// Set the store to null so a new store will be created for the next view.
+$this->xStore = null;
+// Return the store
+return $xStore;
+}
 }

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

Switch Indentation +133 added lines, -133 removed lines

@@ -22,213 +22,213 @@
 
 class Metadata
 {
-    /**
+/**
      * @var array<string, array<string, Data\AbstractData>>
      */
-    private array $aAttributes = [
-        'exclude' => [],
-        'export' => [],
-        'container' => [],
-        'databag' => [],
-        'callback' => [],
-        'before' => [],
-        'after' => [],
-        'upload' => [],
-    ];
-
-    /**
+private array $aAttributes = [
+'exclude' => [],
+'export' => [],
+'container' => [],
+'databag' => [],
+'callback' => [],
+'before' => [],
+'after' => [],
+'upload' => [],
+];
+
+/**
      * @return array<string, array<string, Data\AbstractData>>
      */
-    public function getAttributes(): array
-    {
-        return $this->aAttributes;
-    }
+public function getAttributes(): array
+{
+return $this->aAttributes;
+}
 
-    /**
+/**
      * @param string $sMethod
      *
      * @return Data\ExcludeData
      */
-    public function exclude(string $sMethod = '*'): Data\ExcludeData
-    {
-        return $this->aAttributes['exclude'][$sMethod] ??
-            $this->aAttributes['exclude'][$sMethod] = new Data\ExcludeData();
-    }
+public function exclude(string $sMethod = '*'): Data\ExcludeData
+{
+return $this->aAttributes['exclude'][$sMethod] ??
+$this->aAttributes['exclude'][$sMethod] = new Data\ExcludeData();
+}
 
-    /**
+/**
      * @param string $sMethod
      *
      * @return Data\ExportData
      */
-    public function export(string $sMethod = '*'): Data\ExportData
-    {
-        $sMethod = '*'; // On classes only
-        return $this->aAttributes['export'][$sMethod] ??
-            $this->aAttributes['export'][$sMethod] = new Data\ExportData();
-    }
+public function export(string $sMethod = '*'): Data\ExportData
+{
+$sMethod = '*'; // On classes only
+return $this->aAttributes['export'][$sMethod] ??
+$this->aAttributes['export'][$sMethod] = new Data\ExportData();
+}
 
-    /**
+/**
      * @param string $sMethod
      *
      * @return Data\ContainerData
      */
-    public function container(string $sMethod = '*'): Data\ContainerData
-    {
-        return $this->aAttributes['container'][$sMethod] ??
-            $this->aAttributes['container'][$sMethod] = new Data\ContainerData();
-    }
+public function container(string $sMethod = '*'): Data\ContainerData
+{
+return $this->aAttributes['container'][$sMethod] ??
+$this->aAttributes['container'][$sMethod] = new Data\ContainerData();
+}
 
-    /**
+/**
      * @param string $sMethod
      *
      * @return Data\DatabagData
      */
-    public function databag(string $sMethod = '*'): Data\DatabagData
-    {
-        return $this->aAttributes['databag'][$sMethod] ??
-            $this->aAttributes['databag'][$sMethod] = new Data\DatabagData();
-    }
+public function databag(string $sMethod = '*'): Data\DatabagData
+{
+return $this->aAttributes['databag'][$sMethod] ??
+$this->aAttributes['databag'][$sMethod] = new Data\DatabagData();
+}
 
-    /**
+/**
      * @param string $sMethod
      *
      * @return Data\CallbackData
      */
-    public function callback(string $sMethod = '*'): Data\CallbackData
-    {
-        return $this->aAttributes['callback'][$sMethod] ??
-            $this->aAttributes['callback'][$sMethod] = new Data\CallbackData();
-    }
+public function callback(string $sMethod = '*'): Data\CallbackData
+{
+return $this->aAttributes['callback'][$sMethod] ??
+$this->aAttributes['callback'][$sMethod] = new Data\CallbackData();
+}
 
-    /**
+/**
      * @param string $sMethod
      *
      * @return Data\BeforeData
      */
-    public function before(string $sMethod = '*'): Data\BeforeData
-    {
-        return $this->aAttributes['before'][$sMethod] ??
-            $this->aAttributes['before'][$sMethod] = new Data\BeforeData();
-    }
+public function before(string $sMethod = '*'): Data\BeforeData
+{
+return $this->aAttributes['before'][$sMethod] ??
+$this->aAttributes['before'][$sMethod] = new Data\BeforeData();
+}
 
-    /**
+/**
      * @param string $sMethod
      *
      * @return Data\AfterData
      */
-    public function after(string $sMethod = '*'): Data\AfterData
-    {
-        return $this->aAttributes['after'][$sMethod] ??
-            $this->aAttributes['after'][$sMethod] = new Data\AfterData();
-    }
+public function after(string $sMethod = '*'): Data\AfterData
+{
+return $this->aAttributes['after'][$sMethod] ??
+$this->aAttributes['after'][$sMethod] = new Data\AfterData();
+}
 
-    /**
+/**
      * @param string $sMethod
      *
      * @return Data\UploadData
      */
-    public function upload(string $sMethod = '*'): Data\UploadData
-    {
-        return $this->aAttributes['upload'][$sMethod] ??
-            $this->aAttributes['upload'][$sMethod] = new Data\UploadData();
-    }
+public function upload(string $sMethod = '*'): Data\UploadData
+{
+return $this->aAttributes['upload'][$sMethod] ??
+$this->aAttributes['upload'][$sMethod] = new Data\UploadData();
+}
 
-    /**
+/**
      * True if the class is excluded
      *
      * @return bool
      */
-    public function isExcluded(): bool
-    {
-        $xData = $this->aAttributes['exclude']['*'] ?? null;
-        return $xData !== null && $xData->getValue() === true;
-    }
+public function isExcluded(): bool
+{
+$xData = $this->aAttributes['exclude']['*'] ?? null;
+return $xData !== null && $xData->getValue() === true;
+}
 
-    /**
+/**
      * Get the properties of the class methods
      *
      * @return array
      */
-    public function getProperties(): array
+public function getProperties(): array
+{
+$aProperties = [];
+$aClassProperties = [];
+foreach($this->aAttributes as $sType => $aValues)
+{
+if($sType === 'exclude')
+{
+    continue;
+}
+
+foreach($aValues as $sMethod => $xData)
+{
+    if($sMethod === '*')
     {
-        $aProperties = [];
-        $aClassProperties = [];
-        foreach($this->aAttributes as $sType => $aValues)
-        {
-            if($sType === 'exclude')
-            {
-                continue;
-            }
-
-            foreach($aValues as $sMethod => $xData)
-            {
-                if($sMethod === '*')
-                {
-                    $aClassProperties[$xData->getName()] = $xData->getValue();
-                    continue;
-                }
-                $aProperties[$sMethod][$xData->getName()] = $xData->getValue();
-            }
-        }
-
-        if(count($aClassProperties) > 0)
-        {
-            $aProperties['*'] = $aClassProperties;
-        }
-
-        return $aProperties;
+        $aClassProperties[$xData->getName()] = $xData->getValue();
+        continue;
     }
+    $aProperties[$sMethod][$xData->getName()] = $xData->getValue();
+}
+}
 
-    /**
+if(count($aClassProperties) > 0)
+{
+$aProperties['*'] = $aClassProperties;
+}
+
+return $aProperties;
+}
+
+/**
      * Get the methods in the export attributes
      *
      * @return array
      */
-    public function getExportMethods(): array
-    {
-        /** @var array<Data\ExcludeData> */
-        $aAttributes = $this->aAttributes['exclude'];
-        $aExcludeMethods = array_keys($aAttributes);
-        $aExcludeMethods = array_values(array_filter($aExcludeMethods,
-            fn(string $sName) => $sName !== '*' &&
-                $aAttributes[$sName]->getValue() === true));
-
-        /** @var Data\ExportData|null */
-        $xExportData = $this->aAttributes['export']['*'] ?? null;
-        $aExportMethods = $xExportData?->getValue() ?? [];
-
-        $aExceptMethods = $aExportMethods['except'] ?? [];
-        $aExportMethods['except'] = array_merge($aExcludeMethods, $aExceptMethods);
-        return $aExportMethods;
-    }
+public function getExportMethods(): array
+{
+/** @var array<Data\ExcludeData> */
+$aAttributes = $this->aAttributes['exclude'];
+$aExcludeMethods = array_keys($aAttributes);
+$aExcludeMethods = array_values(array_filter($aExcludeMethods,
+fn(string $sName) => $sName !== '*' &&
+    $aAttributes[$sName]->getValue() === true));
+
+/** @var Data\ExportData|null */
+$xExportData = $this->aAttributes['export']['*'] ?? null;
+$aExportMethods = $xExportData?->getValue() ?? [];
+
+$aExceptMethods = $aExportMethods['except'] ?? [];
+$aExportMethods['except'] = array_merge($aExcludeMethods, $aExceptMethods);
+return $aExportMethods;
+}
 
-    /**
+/**
      * Get the exluded methods
      *
      * @return array
      */
-    public function getExceptMethods(): array
-    {
-        return $this->getExportMethods()['except'];
-    }
+public function getExceptMethods(): array
+{
+return $this->getExportMethods()['except'];
+}
 
-    /**
+/**
      * Get the export base methods
      *
      * @return array
      */
-    public function getExportBaseMethods(): array
-    {
-        return $this->getExportMethods()['base'] ?? [];
-    }
+public function getExportBaseMethods(): array
+{
+return $this->getExportMethods()['base'] ?? [];
+}
 
-    /**
+/**
      * Get the export only methods
      *
      * @return array
      */
-    public function getExportOnlyMethods(): array
-    {
-        return $this->getExportMethods()['only'] ?? [];
-    }
+public function getExportOnlyMethods(): array
+{
+return $this->getExportMethods()['only'] ?? [];
+}
 }

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 array
      */
-    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 array
      */
-    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/App/Metadata/Data/ContainerData.php

Switch Indentation +47 added lines, -47 removed lines

@@ -21,81 +21,81 @@
 
 class ContainerData extends AbstractData
 {
-    /**
+/**
      * The properties to get from the container
      *
      * @var array
      */
-    protected $aProperties = [];
+protected $aProperties = [];
 
-    /**
+/**
      * @return string
      */
-    public function getName(): string
-    {
-        return '__di';
-    }
+public function getName(): string
+{
+return '__di';
+}
 
-    /**
+/**
      * @return mixed
      */
-    public function getValue(): mixed
-    {
-        return $this->aProperties;
-    }
+public function getValue(): mixed
+{
+return $this->aProperties;
+}
 
-    /**
+/**
      * @param string $sAttr
      *
      * @return void
      */
-    protected function validateAttr(string $sAttr): void
-    {
-        if(preg_match('/^[a-zA-Z][a-zA-Z0-9_]*$/', $sAttr) > 0)
-        {
-            return;
-        }
-        throw new SetupException("$sAttr is not a valid \"attr\" value for di");
-    }
+protected function validateAttr(string $sAttr): void
+{
+if(preg_match('/^[a-zA-Z][a-zA-Z0-9_]*$/', $sAttr) > 0)
+{
+return;
+}
+throw new SetupException("$sAttr is not a valid \"attr\" value for di");
+}
 
-    /**
+/**
      * @param string $sClass
      *
      * @return void
      */
-    protected function validateClass(string $sClass): void
-    {
-        if(preg_match('/^(\\\)?([a-zA-Z][a-zA-Z0-9_]*)(\\\[a-zA-Z][a-zA-Z0-9_]*)*$/', $sClass) > 0)
-        {
-            return;
-        }
-        throw new SetupException("$sClass is not a valid \"class\" value for di");
-    }
+protected function validateClass(string $sClass): void
+{
+if(preg_match('/^(\\\)?([a-zA-Z][a-zA-Z0-9_]*)(\\\[a-zA-Z][a-zA-Z0-9_]*)*$/', $sClass) > 0)
+{
+return;
+}
+throw new SetupException("$sClass is not a valid \"class\" value for di");
+}
 
-    /**
+/**
      * @param string $sAttr
      * @param string $sClass
      *
      * @return void
      */
-    public function addValue(string $sAttr, string $sClass): void
-    {
-        $this->validateAttr($sAttr);
-        $this->validateClass($sClass);
+public function addValue(string $sAttr, string $sClass): void
+{
+$this->validateAttr($sAttr);
+$this->validateClass($sClass);
 
-        $this->aProperties[$sAttr] = $sClass;
-    }
+$this->aProperties[$sAttr] = $sClass;
+}
 
-    /**
+/**
      * @inheritDoc
      */
-    public function encode(string $sVarName): array
-    {
-        $aCalls = [];
-        foreach($this->aProperties as $sAttr => $sClass)
-        {
-            $aCalls[] = "{$sVarName}->addValue('$sAttr', '" . addslashes($sClass) . "');";
-        }
-        return $aCalls;
-    }
+public function encode(string $sVarName): array
+{
+$aCalls = [];
+foreach($this->aProperties as $sAttr => $sClass)
+{
+$aCalls[] = "{$sVarName}->addValue('$sAttr', '" . addslashes($sClass) . "');";
+}
+return $aCalls;
+}
 }

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

Switch Indentation +11 added lines, -11 removed lines

@@ -18,32 +18,32 @@
 
 abstract class AbstractData
 {
-    /**
+/**
      * Generate the PHP code to populate a Metadata object
      *
      * @param string $sVarName
      *
      * @return array
      */
-    abstract public function encode(string $sVarName): array;
+abstract public function encode(string $sVarName): array;
 
-    /**
+/**
      * @return string
      */
-    abstract public function getName(): string;
+abstract public function getName(): string;
 
-    /**
+/**
      * @return mixed
      */
-    abstract public function getValue(): mixed;
+abstract public function getValue(): mixed;
 
-    /**
+/**
      * @param string $sMethod
      *
      * @return bool
      */
-    protected function validateMethod(string $sMethod): bool
-    {
-        return preg_match('/^[a-zA-Z][a-zA-Z0-9_]*$/', $sMethod) > 0;
-    }
+protected function validateMethod(string $sMethod): bool
+{
+return preg_match('/^[a-zA-Z][a-zA-Z0-9_]*$/', $sMethod) > 0;
+}
 }

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|null : 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);
+}
 }

jaxon-core/src/Plugin/AbstractPackage.php

Switch Indentation +45 added lines, -45 removed lines

@@ -19,46 +19,46 @@ 
 
 abstract class AbstractPackage extends AbstractCodeGenerator
 {
-    /**
+/**
      * The configuration options of the package
      *
      * @var Config
      */
-    protected $xPkgConfig;
+protected $xPkgConfig;
 
-    /**
+/**
      * The view renderer
      *
      * @var ViewRenderer
      */
-    protected $xRenderer;
+protected $xRenderer;
 
-    /**
+/**
      * Get the path to the config file, or the config options in an array.
      *
      * @return string|array
      */
-    abstract public static function config(): string|array;
+abstract public static function config(): string|array;
 
-    /**
+/**
      * Get the package config object
      *
      * @return Config
      */
-    final public function getConfig(): Config
-    {
-        return $this->xPkgConfig;
-    }
+final public function getConfig(): Config
+{
+return $this->xPkgConfig;
+}
 
-    /**
+/**
      * This method is automatically called after the package instance is created and configured.
      *
      * @return void
      */
-    protected function init(): void
-    {}
+protected function init(): void
+{}
 
-    /**
+/**
      * Get the value of a given package option
      *
      * @param string $sOption    The option name
@@ -66,59 +66,59 @@ 
      *
      * @return mixed
      */
-    final public function getOption(string $sOption, $xDefault = null): mixed
-    {
-        return $this->xPkgConfig->getOption($sOption, $xDefault);
-    }
+final public function getOption(string $sOption, $xDefault = null): mixed
+{
+return $this->xPkgConfig->getOption($sOption, $xDefault);
+}
 
-    /**
+/**
      * Get the view renderer
      *
      * @return ViewRenderer
      */
-    final public function view(): ViewRenderer
-    {
-        return $this->xRenderer;
-    }
+final public function view(): ViewRenderer
+{
+return $this->xRenderer;
+}
 
-    /**
+/**
      * @inheritDoc
      */
-    final public function getHash(): string
-    {
-        // Packages do not generate hash on their own. So we make this method final.
-        return '';
-    }
+final public function getHash(): string
+{
+// Packages do not generate hash on their own. So we make this method final.
+return '';
+}
 
-    /**
+/**
      * Get the HTML code of the package home page
      *
      * @return string|Stringable
      */
-    public function getHtml(): string|Stringable
-    {
-        return '';
-    }
+public function getHtml(): string|Stringable
+{
+return '';
+}
 
-    /**
+/**
      * Get the HTML code of the package home page
      *
      * This method is an alias for getHtml().
      *
      * @return string|Stringable
      */
-    public function html(): string|Stringable
-    {
-        return $this->getHtml();
-    }
+public function html(): string|Stringable
+{
+return $this->getHtml();
+}
 
-    /**
+/**
      * Get the Js code of the ready() callback
      *
      * @return string|Stringable
      */
-    public function getReadyScript(): string|Stringable
-    {
-        return '';
-    }
+public function getReadyScript(): string|Stringable
+{
+return '';
+}
 }