jaxon-php / jaxon-mono

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 '';
+}
 }

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

Spacing +20 added lines, -22 removed lines

@@ -109,7 +109,7 @@ 
      */
     public function addCodeGenerator(string $sClassName, int $nPriority): void
     {
-        while(isset($this->aCodeGenerators[$nPriority]))
+        while (isset($this->aCodeGenerators[$nPriority]))
         {
             $nPriority++;
         }
@@ -163,33 +163,33 @@ 
      */
     private function generatePluginCodes(CodeGeneratorInterface $xGenerator): void
     {
-        if(!is_subclass_of($xGenerator, AbstractPlugin::class) ||
+        if (!is_subclass_of($xGenerator, AbstractPlugin::class) ||
             $this->xAssetManager->shallIncludeAssets($xGenerator))
         {
             // HTML tags for CSS
-            if(($sCss = trim($xGenerator->getCss(), " \n")) !== '')
+            if (($sCss = trim($xGenerator->getCss(), " \n")) !== '')
             {
                 $this->aCss[] = $sCss;
             }
             // HTML tags for js
-            if(($sJs = trim($xGenerator->getJs(), " \n")) !== '')
+            if (($sJs = trim($xGenerator->getJs(), " \n")) !== '')
             {
                 $this->aJs[] = $sJs;
             }
         }
 
         // Additional js codes
-        if(($xJsCode = $xGenerator->getJsCode()) !== null)
+        if (($xJsCode = $xGenerator->getJsCode()) !== null)
         {
-            if(($sJs = trim($xJsCode->sJs, " \n")) !== '')
+            if (($sJs = trim($xJsCode->sJs, " \n")) !== '')
             {
                 $this->aCodeJs[] = $sJs;
             }
-            if(($sJsBefore = trim($xJsCode->sJsBefore, " \n")) !== '')
+            if (($sJsBefore = trim($xJsCode->sJsBefore, " \n")) !== '')
             {
                 $this->aCodeJsBefore[] = $sJsBefore;
             }
-            if(($sJsAfter = trim($xJsCode->sJsAfter, " \n")) !== '')
+            if (($sJsAfter = trim($xJsCode->sJsAfter, " \n")) !== '')
             {
                 $this->aCodeJsAfter[] = $sJsAfter;
             }
@@ -205,7 +205,7 @@ 
      */
     private function generateCodes(): void
     {
-        if($this->bGenerated)
+        if ($this->bGenerated)
         {
             return;
         }
@@ -216,7 +216,7 @@ 
         // Sort the code generators by ascending priority
         ksort($this->aCodeGenerators);
 
-        foreach($this->aCodeGenerators as $sClassName)
+        foreach ($this->aCodeGenerators as $sClassName)
         {
             $this->generatePluginCodes($this->getCodeGenerator($sClassName));
         }
@@ -262,11 +262,11 @@ 
     public function getJsScript(): string
     {
         $aJsScripts = [];
-        foreach($this->aCodeGenerators as $sClassName)
+        foreach ($this->aCodeGenerators as $sClassName)
         {
             $xGenerator = $this->getCodeGenerator($sClassName);
             // Javascript code
-            if(($sJsScript = trim($xGenerator->getScript(), " \n")) !== '')
+            if (($sJsScript = trim($xGenerator->getScript(), " \n")) !== '')
             {
                 $aJsScripts[] = $sJsScript;
             }
@@ -283,38 +283,36 @@ 
     private function renderCodes(bool $bIncludeJs, bool $bIncludeCss): array
     {
         $aCodes = [];
-        if($bIncludeCss)
+        if ($bIncludeCss)
         {
             $aCodes[] = $this->getCss();
         }
-        if($bIncludeJs)
+        if ($bIncludeJs)
         {
             $aCodes[] = $this->getJs();
         }
 
-        $sUrl = !$this->xAssetManager->shallCreateJsFiles() ? '' :
-            $this->xAssetManager->createJsFiles($this);
+        $sUrl = !$this->xAssetManager->shallCreateJsFiles() ? '' : $this->xAssetManager->createJsFiles($this);
         // Wrap the js code into the corresponding HTML tag.
         $aCodes[] = $sUrl !== '' ?
-            $this->render('include.js', ['sUrl' => $sUrl]) :
-            $this->render('wrapper.js', ['sScript' => $this->getJsScript()]);
+            $this->render('include.js', ['sUrl' => $sUrl]) : $this->render('wrapper.js', ['sScript' => $this->getJsScript()]);
 
         // Wrap the js codes into HTML tags.
-        if(count($this->aCodeJsBefore) > 0)
+        if (count($this->aCodeJsBefore) > 0)
         {
             $sScript = implode("\n\n", $this->aCodeJsBefore);
             $aCodes[] = $this->render('wrapper.js', ['sScript' => $sScript]);
         }
-        if(count($this->aCodeJs) > 0)
+        if (count($this->aCodeJs) > 0)
         {
             $sScript = implode("\n\n", $this->aCodeJs);
             $aCodes[] = $this->render('wrapper.js', ['sScript' => $sScript]);
         }
-        if(count($this->aCodeJsFiles) > 0)
+        if (count($this->aCodeJsFiles) > 0)
         {
             $aCodes[] = $this->render('includes.js', ['aUrls' => $this->aCodeJsFiles]);
         }
-        if(count($this->aCodeJsAfter) > 0)
+        if (count($this->aCodeJsAfter) > 0)
         {
             $sScript = implode("\n\n", $this->aCodeJsAfter);
             $aCodes[] = $this->render('wrapper.js', ['sScript' => $sScript]);

jaxon-upload/src/Manager/UploadManager.php

Spacing +10 added lines, -10 removed lines

@@ -121,13 +121,13 @@ 
         try

         {

             $xFilesystem->createDirectory($sUploadDir);

-            if(!$xFilesystem->directoryExists($sUploadDir))

+            if (!$xFilesystem->directoryExists($sUploadDir))

             {

                 throw new RequestException($this->xTranslator->trans('errors.upload.access'));

             }

             return $sUploadDir;

         }

-        catch(FilesystemException $e)

+        catch (FilesystemException $e)

         {

             $this->xLogger->error('Filesystem error.', ['message' => $e->getMessage()]);

             throw new RequestException($this->xTranslator->trans('errors.upload.access'));

@@ -162,7 +162,7 @@ 
     {

         // Check the uploaded file validity

         $nErrorCode = $xHttpFile->getError();

-        if($nErrorCode !== UPLOAD_ERR_OK)

+        if ($nErrorCode !== UPLOAD_ERR_OK)

         {

             $this->xLogger->error('File upload error.', [

                 'code' => $nErrorCode,

@@ -176,7 +176,7 @@ 
 

         // Filename without the extension. Needs to be sanitized.

         $sName = pathinfo($xHttpFile->getClientFilename(), PATHINFO_FILENAME);

-        if($this->cNameSanitizer !== null)

+        if ($this->cNameSanitizer !== null)

         {

             $sName = (string)call_user_func($this->cNameSanitizer,

                 $sName, $sField, $this->sUploadFieldId);

@@ -185,7 +185,7 @@ 
         // Set the user file data

         $xFile = File::fromHttpFile($this->xFileStorage->filesystem($sField), $xHttpFile, $sUploadDir, $sName);

         // Verify file validity (format, size)

-        if(!$this->xValidator->validateUploadedFile($sField, $xFile))

+        if (!$this->xValidator->validateUploadedFile($sField, $xFile))

         {

             throw new RequestException($this->xValidator->getErrorMessage());

         }

@@ -209,16 +209,16 @@ 
 

         $aUserFiles = [];

         $aAllFiles = []; // A flat list of all uploaded files

-        foreach($aTempFiles as $sField => $aFiles)

+        foreach ($aTempFiles as $sField => $aFiles)

         {

             $aUserFiles[$sField] = [];

             // Get the path to the upload dir

             $sUploadDir = $this->getUploadDir($sField);

-            if(!is_array($aFiles))

+            if (!is_array($aFiles))

             {

                 $aFiles = [$aFiles];

             }

-            foreach($aFiles as $xHttpFile)

+            foreach ($aFiles as $xHttpFile)

             {

                 $aFile = $this->makeUploadedFile($xHttpFile, $sUploadDir, $sField);

                 $aUserFiles[$sField][] = $aFile['user'];

@@ -229,14 +229,14 @@ 
         // Copy the uploaded files from the temp dir to the user dir

         try

         {

-            foreach($aAllFiles as $aFiles)

+            foreach ($aAllFiles as $aFiles)

             {

                 $sPath = $aFiles['user']->path();

                 $xContent = $aFiles['temp']->getStream();

                 $aFiles['user']->filesystem()->write($sPath, $xContent);

             }

         }

-        catch(FilesystemException $e)

+        catch (FilesystemException $e)

         {

             $this->xLogger->error('Filesystem error.', ['message' => $e->getMessage()]);

             throw new RequestException($this->xTranslator->trans('errors.upload.access'));

Braces +2 added lines, -4 removed lines

@@ -126,8 +126,7 @@ 
                 throw new RequestException($this->xTranslator->trans('errors.upload.access'));

             }

             return $sUploadDir;

-        }

-        catch(FilesystemException $e)

+        } catch(FilesystemException $e)

         {

             $this->xLogger->error('Filesystem error.', ['message' => $e->getMessage()]);

             throw new RequestException($this->xTranslator->trans('errors.upload.access'));

@@ -235,8 +234,7 @@ 
                 $xContent = $aFiles['temp']->getStream();

                 $aFiles['user']->filesystem()->write($sPath, $xContent);

             }

-        }

-        catch(FilesystemException $e)

+        } catch(FilesystemException $e)

         {

             $this->xLogger->error('Filesystem error.', ['message' => $e->getMessage()]);

             throw new RequestException($this->xTranslator->trans('errors.upload.access'));