jaxon-php / jaxon-mono

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

Switch Indentation +145 added lines, -145 removed lines

@@ -28,35 +28,35 @@ 
 

 class UploadManager

 {

-    /**

+/**

      * The id of the upload field in the form

      *

      * @var string

      */

-    protected $sUploadFieldId = '';

+protected $sUploadFieldId = '';

 

-    /**

+/**

      * A user defined function to transform uploaded file names

      *

      * @var Closure

      */

-    protected $cNameSanitizer = null;

+protected $cNameSanitizer = null;

 

-    /**

+/**

      * @var array

      */

-    private $errorMessages = [

-        0 => 'There is no error, the file uploaded with success',

-        1 => 'The uploaded file exceeds the upload_max_filesize directive in php.ini',

-        2 => 'The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form',

-        3 => 'The uploaded file was only partially uploaded',

-        4 => 'No file was uploaded',

-        6 => 'Missing a temporary folder',

-        7 => 'Failed to write file to disk.',

-        8 => 'A PHP extension stopped the file upload.',

-    ];

-

-    /**

+private $errorMessages = [

+0 => 'There is no error, the file uploaded with success',

+1 => 'The uploaded file exceeds the upload_max_filesize directive in php.ini',

+2 => 'The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form',

+3 => 'The uploaded file was only partially uploaded',

+4 => 'No file was uploaded',

+6 => 'Missing a temporary folder',

+7 => 'Failed to write file to disk.',

+8 => 'A PHP extension stopped the file upload.',

+];

+

+/**

      * The constructor

      *

      * @param LoggerInterface $xLogger

@@ -65,49 +65,49 @@ 
      * @param FileStorage $xFileStorage

      * @param FileNameInterface $xFileName

      */

-    public function __construct(private LoggerInterface $xLogger,

-        private Validator $xValidator, private Translator $xTranslator,

-        private FileStorage $xFileStorage, private FileNameInterface $xFileName)

-    {

-        // This feature is not yet implemented

-        $this->setUploadFieldId('');

-    }

-

-    /**

+public function __construct(private LoggerInterface $xLogger,

+private Validator $xValidator, private Translator $xTranslator,

+private FileStorage $xFileStorage, private FileNameInterface $xFileName)

+{

+// This feature is not yet implemented

+$this->setUploadFieldId('');

+}

+

+/**

      * Generate a random name

      *

      * @return string

      */

-    protected function randomName(): string

-    {

-        return $this->xFileName->random(16);

-    }

+protected function randomName(): string

+{

+return $this->xFileName->random(16);

+}

 

-    /**

+/**

      * Set the id of the upload field in the form

      *

      * @param string $sUploadFieldId

      *

      * @return void

      */

-    public function setUploadFieldId(string $sUploadFieldId): void

-    {

-        $this->sUploadFieldId = $sUploadFieldId;

-    }

+public function setUploadFieldId(string $sUploadFieldId): void

+{

+$this->sUploadFieldId = $sUploadFieldId;

+}

 

-    /**

+/**

      * Filter uploaded file name

      *

      * @param Closure $cNameSanitizer    The closure which filters filenames

      *

      * @return void

      */

-    public function setNameSanitizer(Closure $cNameSanitizer): void

-    {

-        $this->cNameSanitizer = $cNameSanitizer;

-    }

+public function setNameSanitizer(Closure $cNameSanitizer): void

+{

+$this->cNameSanitizer = $cNameSanitizer;

+}

 

-    /**

+/**

      * Make sure the upload dir exists and is writable

      *

      * @param Filesystem $xFilesystem

@@ -116,25 +116,25 @@ 
      * @return string

      * @throws RequestException

      */

-    private function _makeUploadDir(Filesystem $xFilesystem, string $sUploadDir): string

-    {

-        try

-        {

-            $xFilesystem->createDirectory($sUploadDir);

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

-            {

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

-            }

-            return $sUploadDir;

-        }

-        catch(FilesystemException $e)

-        {

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

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

-        }

-    }

-

-    /**

+private function _makeUploadDir(Filesystem $xFilesystem, string $sUploadDir): string

+{

+try

+{

+$xFilesystem->createDirectory($sUploadDir);

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

+{

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

+}

+return $sUploadDir;

+}

+catch(FilesystemException $e)

+{

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

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

+}

+}

+

+/**

      * Get the path to the upload dir

      *

      * @param string $sField

@@ -142,13 +142,13 @@ 
      * @return string

      * @throws RequestException

      */

-    private function getUploadDir(string $sField): string

-    {

-        $xFileSystem = $this->xFileStorage->filesystem($sField);

-        return $this->_makeUploadDir($xFileSystem, $this->randomName() . '/');

-    }

+private function getUploadDir(string $sField): string

+{

+$xFileSystem = $this->xFileStorage->filesystem($sField);

+return $this->_makeUploadDir($xFileSystem, $this->randomName() . '/');

+}

 

-    /**

+/**

      * Check uploaded files

      *

      * @param UploadedFile $xHttpFile

@@ -158,43 +158,43 @@ 
      * @return array

      * @throws RequestException

      */

-    private function makeUploadedFile(UploadedFile $xHttpFile, string $sUploadDir, string $sField): array

-    {

-        // Check the uploaded file validity

-        $nErrorCode = $xHttpFile->getError();

-        if($nErrorCode !== UPLOAD_ERR_OK)

-        {

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

-                'code' => $nErrorCode,

-                'message' => $this->errorMessages[$nErrorCode],

-            ]);

-            $sMessage = $this->xTranslator->trans('errors.upload.failed', [

-                'name' => $sField,

-            ]);

-            throw new RequestException($sMessage);

-        }

-

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

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

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

-        {

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

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

-        }

-

-        // 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))

-        {

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

-        }

-

-        // All's right, save the file for copy.

-        return ['temp' => $xHttpFile, 'user' => $xFile];

-    }

-

-    /**

+private function makeUploadedFile(UploadedFile $xHttpFile, string $sUploadDir, string $sField): array

+{

+// Check the uploaded file validity

+$nErrorCode = $xHttpFile->getError();

+if($nErrorCode !== UPLOAD_ERR_OK)

+{

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

+    'code' => $nErrorCode,

+    'message' => $this->errorMessages[$nErrorCode],

+]);

+$sMessage = $this->xTranslator->trans('errors.upload.failed', [

+    'name' => $sField,

+]);

+throw new RequestException($sMessage);

+}

+

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

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

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

+{

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

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

+}

+

+// 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))

+{

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

+}

+

+// All's right, save the file for copy.

+return ['temp' => $xHttpFile, 'user' => $xFile];

+}

+

+/**

      * Read uploaded files info from HTTP request data

      *

      * @param ServerRequestInterface $xRequest

@@ -202,46 +202,46 @@ 
      * @return array

      * @throws RequestException

      */

-    public function readFromHttpData(ServerRequestInterface $xRequest): array

-    {

-        // Get the uploaded files

-        $aTempFiles = $xRequest->getUploadedFiles();

-

-        $aUserFiles = [];

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

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

-        {

-            $aUserFiles[$sField] = [];

-            // Get the path to the upload dir

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

-            if(!is_array($aFiles))

-            {

-                $aFiles = [$aFiles];

-            }

-            foreach($aFiles as $xHttpFile)

-            {

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

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

-                $aAllFiles[] = $aFile;

-            }

-        }

-

-        // Copy the uploaded files from the temp dir to the user dir

-        try

-        {

-            foreach($aAllFiles as $aFiles)

-            {

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

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

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

-            }

-        }

-        catch(FilesystemException $e)

-        {

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

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

-        }

-

-        return $aUserFiles;

-    }

+public function readFromHttpData(ServerRequestInterface $xRequest): array

+{

+// Get the uploaded files

+$aTempFiles = $xRequest->getUploadedFiles();

+

+$aUserFiles = [];

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

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

+{

+$aUserFiles[$sField] = [];

+// Get the path to the upload dir

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

+if(!is_array($aFiles))

+{

+    $aFiles = [$aFiles];

+}

+foreach($aFiles as $xHttpFile)

+{

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

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

+    $aAllFiles[] = $aFile;

+}

+}

+

+// Copy the uploaded files from the temp dir to the user dir

+try

+{

+foreach($aAllFiles as $aFiles)

+{

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

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

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

+}

+}

+catch(FilesystemException $e)

+{

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

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

+}

+

+return $aUserFiles;

+}

 }

jaxon-core/src/Response/NodeResponse.php

Switch Indentation +85 added lines, -85 removed lines

@@ -28,40 +28,40 @@ 
 
 class NodeResponse extends AjaxResponse
 {
-    /**
+/**
      * @var array
      */
-    private $aComponent = [];
+private $aComponent = [];
 
-    /**
+/**
      * The constructor
      *
      * @param ResponseManager $xManager
      * @param PluginManager $xPluginManager
      * @param JxnCall $xJxnCall
      */
-    public function __construct(ResponseManager $xManager,
-        PluginManager $xPluginManager, JxnCall $xJxnCall)
-    {
-        parent::__construct($xManager, $xPluginManager);
-        // The js class name is also the component name.
-        $this->aComponent['name'] = $this->str($xJxnCall->_class());
-    }
+public function __construct(ResponseManager $xManager,
+PluginManager $xPluginManager, JxnCall $xJxnCall)
+{
+parent::__construct($xManager, $xPluginManager);
+// The js class name is also the component name.
+$this->aComponent['name'] = $this->str($xJxnCall->_class());
+}
 
-    /**
+/**
      * Set the component item
      *
      * @param string $sItem
      *
      * @return self
      */
-    public function item(string $sItem = 'main'): self
-    {
-        $this->aComponent['item'] = $this->str($sItem);
-        return $this;
-    }
+public function item(string $sItem = 'main'): self
+{
+$this->aComponent['item'] = $this->str($sItem);
+return $this;
+}
 
-    /**
+/**
      * Add a response command to the array of commands
      *
      * @param string $sName    The command name
@@ -70,15 +70,15 @@ 
      *
      * @return Command
      */
-    public function addCommand(string $sName, array|JsonSerializable $aArgs = [],
-        bool $bRemoveEmpty = false): Command
-    {
-        return $this->xManager
-            ->addCommand($sName, $aArgs, $bRemoveEmpty)
-            ->setComponent($this->aComponent);
-    }
+public function addCommand(string $sName, array|JsonSerializable $aArgs = [],
+bool $bRemoveEmpty = false): Command
+{
+return $this->xManager
+->addCommand($sName, $aArgs, $bRemoveEmpty)
+->setComponent($this->aComponent);
+}
 
-    /**
+/**
      * Add a command to assign the specified value to the given element's attribute
      *
      * @param string $sAttribute    The attribute to be assigned
@@ -86,16 +86,16 @@ 
      *
      * @return self
      */
-    public function assign(string $sAttribute, string $sValue): self
-    {
-        $this->addCommand('node.assign', [
-            'attr' => $this->str($sAttribute),
-            'value' => $this->str($sValue),
-        ]);
-        return $this;
-    }
+public function assign(string $sAttribute, string $sValue): self
+{
+$this->addCommand('node.assign', [
+'attr' => $this->str($sAttribute),
+'value' => $this->str($sValue),
+]);
+return $this;
+}
 
-    /**
+/**
      * Add a command to assign the specified HTML content to the given element
      *
      * This is a shortcut for assign() on the innerHTML attribute.
@@ -104,12 +104,12 @@ 
      *
      * @return self
      */
-    public function html(string $sValue): self
-    {
-        return $this->assign('innerHTML', $sValue);
-    }
+public function html(string $sValue): self
+{
+return $this->assign('innerHTML', $sValue);
+}
 
-    /**
+/**
      * Add a command to assign the specified value to the given CSS attribute
      *
      * @param string $sCssAttribute    The CSS attribute to be assigned
@@ -117,12 +117,12 @@ 
      *
      * @return self
      */
-    public function style(string $sCssAttribute, string $sValue): self
-    {
-        return $this->assign("style.$sCssAttribute", $sValue);
-    }
+public function style(string $sCssAttribute, string $sValue): self
+{
+return $this->assign("style.$sCssAttribute", $sValue);
+}
 
-    /**
+/**
      * Add a command to append the specified data to the given element's attribute
      *
      * @param string $sAttribute    The name of the attribute to be appended to
@@ -130,16 +130,16 @@ 
      *
      * @return self
      */
-    public function append(string $sAttribute, string $sValue): self
-    {
-        $this->addCommand('node.append', [
-            'attr' => $this->str($sAttribute),
-            'value' => $this->str($sValue),
-        ]);
-        return $this;
-    }
+public function append(string $sAttribute, string $sValue): self
+{
+$this->addCommand('node.append', [
+'attr' => $this->str($sAttribute),
+'value' => $this->str($sValue),
+]);
+return $this;
+}
 
-    /**
+/**
      * Add a command to prepend the specified data to the given element's attribute
      *
      * @param string $sAttribute    The name of the attribute to be prepended to
@@ -147,16 +147,16 @@ 
      *
      * @return self
      */
-    public function prepend(string $sAttribute, string $sValue): self
-    {
-        $this->addCommand('node.prepend', [
-            'attr' => $this->str($sAttribute),
-            'value' => $this->str($sValue),
-        ]);
-        return $this;
-    }
+public function prepend(string $sAttribute, string $sValue): self
+{
+$this->addCommand('node.prepend', [
+'attr' => $this->str($sAttribute),
+'value' => $this->str($sValue),
+]);
+return $this;
+}
 
-    /**
+/**
      * Add a command to replace a specified value with another value within the given element's attribute
      *
      * @param string $sAttribute    The attribute to be updated
@@ -165,39 +165,39 @@ 
      *
      * @return self
      */
-    public function replace(string $sAttribute, string $sSearch, string $sReplace): self
-    {
-        $this->addCommand('node.replace', [
-            'attr' => $this->str($sAttribute),
-            'search' => $this->str($sSearch),
-            'replace' => $this->str($sReplace),
-        ]);
-        return $this;
-    }
+public function replace(string $sAttribute, string $sSearch, string $sReplace): self
+{
+$this->addCommand('node.replace', [
+'attr' => $this->str($sAttribute),
+'search' => $this->str($sSearch),
+'replace' => $this->str($sReplace),
+]);
+return $this;
+}
 
-    /**
+/**
      * Add a command to clear the specified attribute of the given element
      *
      * @param string $sAttribute    The attribute to be cleared
      *
      * @return self
      */
-    public function clear(string $sAttribute = 'innerHTML'): self
-    {
-        $this->addCommand('node.clear', [
-            'attr' => $this->str($sAttribute),
-        ]);
-        return $this;
-    }
+public function clear(string $sAttribute = 'innerHTML'): self
+{
+$this->addCommand('node.clear', [
+'attr' => $this->str($sAttribute),
+]);
+return $this;
+}
 
-    /**
+/**
      * Add a command to remove an element from the document
      *
      * @return self
      */
-    public function remove(): self
-    {
-        $this->addCommand('node.remove', []);
-        return $this;
-    }
+public function remove(): self
+{
+$this->addCommand('node.remove', []);
+return $this;
+}
 }

jaxon-core/src/Response/AjaxResponse.php

Switch Indentation +93 added lines, -93 removed lines

@@ -41,52 +41,52 @@ 
 
 abstract class AjaxResponse extends AbstractResponse
 {
-    /**
+/**
      * @inheritDoc
      */
-    public function getContentType(): string
-    {
-        return 'application/json';
-    }
+public function getContentType(): string
+{
+return 'application/json';
+}
 
-    /**
+/**
      * @inheritDoc
      */
-    public function getOutput(): string
-    {
-        return json_encode(['jxn' => ['commands' => $this->xManager->getCommands()]]);
-    }
+public function getOutput(): string
+{
+return json_encode(['jxn' => ['commands' => $this->xManager->getCommands()]]);
+}
 
-    /**
+/**
      * Add a command to call the specified javascript function with the given (optional) parameters
      *
      * @param string $sFunc    The name of the function to call
      *
      * @return self
      */
-    public function call(string $sFunc): self
-    {
-        $aArgs = func_get_args();
-        array_shift($aArgs);
-        $this->xManager->addCommand('script.exec.call',
-            ['func' => $this->str($sFunc), 'args' => $aArgs]);
-        return $this;
-    }
-
-    /**
+public function call(string $sFunc): self
+{
+$aArgs = func_get_args();
+array_shift($aArgs);
+$this->xManager->addCommand('script.exec.call',
+['func' => $this->str($sFunc), 'args' => $aArgs]);
+return $this;
+}
+
+/**
      * Add a command to execute the specified json expression
      *
      * @param JsExpr $xJsExpr    The json expression to execute
      *
      * @return self
      */
-    public function exec(JsExpr $xJsExpr): self
-    {
-        $this->xManager->addCommand('script.exec.expr', ['expr' => $xJsExpr]);
-        return $this;
-    }
+public function exec(JsExpr $xJsExpr): self
+{
+$this->xManager->addCommand('script.exec.expr', ['expr' => $xJsExpr]);
+return $this;
+}
 
-    /**
+/**
      * Response command that prompts user with [ok] [cancel] style message box
      *
      * The provided closure will be called with a response object as unique parameter.
@@ -100,14 +100,14 @@ 
      *
      * @return self
      */
-    public function confirm(Closure $fConfirm, string $sQuestion, array $aArgs = []): self
-    {
-        $this->xManager->addConfirmCommand('dialog.confirm',
-            fn() => $fConfirm($this), $sQuestion, $aArgs);
-        return $this;
-    }
-
-    /**
+public function confirm(Closure $fConfirm, string $sQuestion, array $aArgs = []): self
+{
+$this->xManager->addConfirmCommand('dialog.confirm',
+fn() => $fConfirm($this), $sQuestion, $aArgs);
+return $this;
+}
+
+/**
      * Add a command to display an alert message to the user
      *
      * @param string $sMessage    The message to be displayed
@@ -115,26 +115,26 @@ 
      *
      * @return self
      */
-    public function alert(string $sMessage, array $aArgs = []): self
-    {
-        $this->xManager->addAlertCommand('dialog.alert.show', $sMessage, $aArgs);
-        return $this;
-    }
+public function alert(string $sMessage, array $aArgs = []): self
+{
+$this->xManager->addAlertCommand('dialog.alert.show', $sMessage, $aArgs);
+return $this;
+}
 
-    /**
+/**
      * Add a command to display a debug message to the user
      *
      * @param string $sMessage    The message to be displayed
      *
      * @return self
      */
-    public function debug(string $sMessage): self
-    {
-        $this->xManager->addCommand('script.debug', ['message' => $this->str($sMessage)]);
-        return $this;
-    }
+public function debug(string $sMessage): self
+{
+$this->xManager->addCommand('script.debug', ['message' => $this->str($sMessage)]);
+return $this;
+}
 
-    /**
+/**
      * Add a command to ask the browser to navigate to the specified URL
      *
      * @param string $sURL    The relative or fully qualified URL
@@ -142,16 +142,16 @@ 
      *
      * @return self
      */
-    public function redirect(string $sURL, int $nDelay = 0): self
-    {
-        $this->xManager->addCommand('script.redirect', [
-            'delay' => $nDelay,
-            'url' => $this->xPluginManager->getParameterReader()->parseUrl($sURL),
-        ]);
-        return $this;
-    }
-
-    /**
+public function redirect(string $sURL, int $nDelay = 0): self
+{
+$this->xManager->addCommand('script.redirect', [
+'delay' => $nDelay,
+'url' => $this->xPluginManager->getParameterReader()->parseUrl($sURL),
+]);
+return $this;
+}
+
+/**
      * Add a command to make Jaxon to pause execution of the response commands,
      * returning control to the browser so it can perform other commands asynchronously.
      *
@@ -161,13 +161,13 @@ 
      *
      * @return self
      */
-    public function sleep(int $tenths): self
-    {
-        $this->xManager->addCommand('script.sleep', ['duration' => $tenths]);
-        return $this;
-    }
+public function sleep(int $tenths): self
+{
+$this->xManager->addCommand('script.sleep', ['duration' => $tenths]);
+return $this;
+}
 
-    /**
+/**
      * Create a JQuery selector expression, and link it to the current response.
      *
      * @param string $sPath    The jQuery selector path
@@ -175,48 +175,48 @@ 
      *
      * @return JqSelectorCall
      */
-    public function jq(string $sPath = '', $xContext = null): JqSelectorCall
-    {
-        return $this->plugin(ScriptPlugin::class)->jq($sPath, $xContext);
-    }
+public function jq(string $sPath = '', $xContext = null): JqSelectorCall
+{
+return $this->plugin(ScriptPlugin::class)->jq($sPath, $xContext);
+}
 
-    /**
+/**
      * Create a Javascript object expression, and link it to the current response.
      *
      * @param string $sObject
      *
      * @return JsObjectCall
      */
-    public function jo(string $sObject = ''): JsObjectCall
-    {
-        return $this->plugin(ScriptPlugin::class)->jo($sObject);
-    }
+public function jo(string $sObject = ''): JsObjectCall
+{
+return $this->plugin(ScriptPlugin::class)->jo($sObject);
+}
 
-    /**
+/**
      * Create a Javascript element selector expression, and link it to the current response.
      *
      * @param string $sElementId
      *
      * @return JsSelectorCall
      */
-    public function je(string $sElementId = ''): JsSelectorCall
-    {
-        return $this->plugin(ScriptPlugin::class)->je($sElementId);
-    }
+public function je(string $sElementId = ''): JsSelectorCall
+{
+return $this->plugin(ScriptPlugin::class)->je($sElementId);
+}
 
-    /**
+/**
      * Get the databag with a given name
      *
      * @param string $sName
      *
      * @return DatabagContext
      */
-    public function bag(string $sName): DatabagContext
-    {
-        return $this->plugin(DatabagPlugin::class)->bag($sName);
-    }
+public function bag(string $sName): DatabagContext
+{
+return $this->plugin(DatabagPlugin::class)->bag($sName);
+}
 
-    /**
+/**
      * Render an HTML pagination control.
      *
      * @param int $nPageNumber     The current page number
@@ -225,19 +225,19 @@ 
      *
      * @return Paginator
      */
-    public function paginator(int $nPageNumber, int $nItemsPerPage, int $nTotalItems): Paginator
-    {
-        return $this->plugin(PaginatorPlugin::class)
-            ->paginator($nPageNumber, $nItemsPerPage, $nTotalItems);
-    }
+public function paginator(int $nPageNumber, int $nItemsPerPage, int $nTotalItems): Paginator
+{
+return $this->plugin(PaginatorPlugin::class)
+->paginator($nPageNumber, $nItemsPerPage, $nTotalItems);
+}
 
-    /**
+/**
      * Convert this response to a PSR7 response object
      *
      * @return PsrResponseInterface
      */
-    public function toPsr(): PsrResponseInterface
-    {
-        return $this->plugin(PsrPlugin::class)->ajaxResponse();
-    }
+public function toPsr(): PsrResponseInterface
+{
+return $this->plugin(PsrPlugin::class)->ajaxResponse();
+}
 }

jaxon-core/src/Response/Response.php

Switch Indentation +169 added lines, -169 removed lines

@@ -26,7 +26,7 @@ 
 
 class Response extends AjaxResponse
 {
-    /**
+/**
      * Add a command to assign the specified value to the given element's attribute
      *
      * @param string $sTarget    The id of the html element on the browser
@@ -35,17 +35,17 @@ 
      *
      * @return self
      */
-    public function assign(string $sTarget, string $sAttribute, string $sValue): self
-    {
-        $this->xManager->addCommand('node.assign', [
-            'id' => $this->str($sTarget),
-            'attr' => $this->str($sAttribute),
-            'value' => $this->str($sValue),
-        ]);
-        return $this;
-    }
+public function assign(string $sTarget, string $sAttribute, string $sValue): self
+{
+$this->xManager->addCommand('node.assign', [
+'id' => $this->str($sTarget),
+'attr' => $this->str($sAttribute),
+'value' => $this->str($sValue),
+]);
+return $this;
+}
 
-    /**
+/**
      * Add a command to assign the specified HTML content to the given element
      *
      * This is a shortcut for assign() on the innerHTML attribute.
@@ -55,12 +55,12 @@ 
      *
      * @return self
      */
-    public function html(string $sTarget, string $sValue): self
-    {
-        return $this->assign($sTarget, 'innerHTML', $sValue);
-    }
+public function html(string $sTarget, string $sValue): self
+{
+return $this->assign($sTarget, 'innerHTML', $sValue);
+}
 
-    /**
+/**
      * Add a command to assign the specified value to the given CSS attribute
      *
      * @param string $sTarget    The id of the html element on the browser
@@ -69,12 +69,12 @@ 
      *
      * @return self
      */
-    public function style(string $sTarget, string $sCssAttribute, string $sValue): self
-    {
-        return $this->assign($sTarget, "style.$sCssAttribute", $sValue);
-    }
+public function style(string $sTarget, string $sCssAttribute, string $sValue): self
+{
+return $this->assign($sTarget, "style.$sCssAttribute", $sValue);
+}
 
-    /**
+/**
      * Add a command to append the specified data to the given element's attribute
      *
      * @param string $sTarget    The id of the element to be updated
@@ -83,17 +83,17 @@ 
      *
      * @return self
      */
-    public function append(string $sTarget, string $sAttribute, string $sValue): self
-    {
-        $this->xManager->addCommand('node.append', [
-            'id' => $this->str($sTarget),
-            'attr' => $this->str($sAttribute),
-            'value' => $this->str($sValue),
-        ]);
-        return $this;
-    }
+public function append(string $sTarget, string $sAttribute, string $sValue): self
+{
+$this->xManager->addCommand('node.append', [
+'id' => $this->str($sTarget),
+'attr' => $this->str($sAttribute),
+'value' => $this->str($sValue),
+]);
+return $this;
+}
 
-    /**
+/**
      * Add a command to prepend the specified data to the given element's attribute
      *
      * @param string $sTarget    The id of the element to be updated
@@ -102,17 +102,17 @@ 
      *
      * @return self
      */
-    public function prepend(string $sTarget, string $sAttribute, string $sValue): self
-    {
-        $this->xManager->addCommand('node.prepend', [
-            'id' => $this->str($sTarget),
-            'attr' => $this->str($sAttribute),
-            'value' => $this->str($sValue),
-        ]);
-        return $this;
-    }
+public function prepend(string $sTarget, string $sAttribute, string $sValue): self
+{
+$this->xManager->addCommand('node.prepend', [
+'id' => $this->str($sTarget),
+'attr' => $this->str($sAttribute),
+'value' => $this->str($sValue),
+]);
+return $this;
+}
 
-    /**
+/**
      * Add a command to replace a specified value with another value within the given element's attribute
      *
      * @param string $sTarget    The id of the element to update
@@ -122,19 +122,19 @@ 
      *
      * @return self
      */
-    public function replace(string $sTarget, string $sAttribute,
-        string $sSearch, string $sReplace): self
-    {
-        $this->xManager->addCommand('node.replace', [
-            'id' => $this->str($sTarget),
-            'attr' => $this->str($sAttribute),
-            'search' => $this->str($sSearch),
-            'replace' => $this->str($sReplace),
-        ]);
-        return $this;
-    }
+public function replace(string $sTarget, string $sAttribute,
+string $sSearch, string $sReplace): self
+{
+$this->xManager->addCommand('node.replace', [
+'id' => $this->str($sTarget),
+'attr' => $this->str($sAttribute),
+'search' => $this->str($sSearch),
+'replace' => $this->str($sReplace),
+]);
+return $this;
+}
 
-    /**
+/**
      * Add a command to clear the specified attribute of the given element
      *
      * @param string $sTarget    The id of the element to be updated.
@@ -142,31 +142,31 @@ 
      *
      * @return self
      */
-    public function clear(string $sTarget, string $sAttribute = 'innerHTML'): self
-    {
-        $this->xManager->addCommand('node.clear', [
-            'id' => $this->str($sTarget),
-            'attr' => $this->str($sAttribute),
-        ]);
-        return $this;
-    }
+public function clear(string $sTarget, string $sAttribute = 'innerHTML'): self
+{
+$this->xManager->addCommand('node.clear', [
+'id' => $this->str($sTarget),
+'attr' => $this->str($sAttribute),
+]);
+return $this;
+}
 
-    /**
+/**
      * Add a command to remove an element from the document
      *
      * @param string $sTarget    The id of the element to be removed
      *
      * @return self
      */
-    public function remove(string $sTarget): self
-    {
-        $this->xManager->addCommand('node.remove', [
-            'id' => $this->str($sTarget),
-        ]);
-        return $this;
-    }
+public function remove(string $sTarget): self
+{
+$this->xManager->addCommand('node.remove', [
+'id' => $this->str($sTarget),
+]);
+return $this;
+}
 
-    /**
+/**
      * Add a command to bind an element to a component
      *
      * @param string $sTarget   The id of the element
@@ -175,21 +175,21 @@ 
      *
      * @return self
      */
-    public function bind(string $sTarget, JxnCall $xCall, string $sItem = ''): self
-    {
-        $this->xManager->addCommand('node.bind', [
-            'id' => $this->str($sTarget),
-            'component' => !$sItem ? [
-                'name' => $xCall->_class(),
-            ] : [
-                'name' => $xCall->_class(),
-                'item' => $this->str($sItem),
-            ],
-        ]);
-        return $this;
-    }
+public function bind(string $sTarget, JxnCall $xCall, string $sItem = ''): self
+{
+$this->xManager->addCommand('node.bind', [
+'id' => $this->str($sTarget),
+'component' => !$sItem ? [
+    'name' => $xCall->_class(),
+] : [
+    'name' => $xCall->_class(),
+    'item' => $this->str($sItem),
+],
+]);
+return $this;
+}
 
-    /**
+/**
      * Add a command to create a new element on the browser
      * @deprecated DOM element creation functions are deprecated
      *
@@ -199,19 +199,19 @@ 
      *
      * @return self
      */
-    public function create(string $sParent, string $sTag, string $sId): self
-    {
-        $this->xManager->addCommand('node.create', [
-            'id' => $this->str($sParent),
-            'tag' => [
-                'name' => $this->str($sTag),
-                'id' => $this->str($sId),
-            ],
-        ]);
-        return $this;
-    }
+public function create(string $sParent, string $sTag, string $sId): self
+{
+$this->xManager->addCommand('node.create', [
+'id' => $this->str($sParent),
+'tag' => [
+    'name' => $this->str($sTag),
+    'id' => $this->str($sId),
+],
+]);
+return $this;
+}
 
-    /**
+/**
      * Add a command to insert a new element just prior to the specified element
      * @deprecated DOM element creation functions are deprecated
      *
@@ -221,19 +221,19 @@ 
      *
      * @return self
      */
-    public function insertBefore(string $sBefore, string $sTag, string $sId): self
-    {
-        $this->xManager->addCommand('node.insert.before', [
-            'id' => $this->str($sBefore),
-            'tag' => [
-                'name' => $this->str($sTag),
-                'id' => $this->str($sId),
-            ],
-        ]);
-        return $this;
-    }
+public function insertBefore(string $sBefore, string $sTag, string $sId): self
+{
+$this->xManager->addCommand('node.insert.before', [
+'id' => $this->str($sBefore),
+'tag' => [
+    'name' => $this->str($sTag),
+    'id' => $this->str($sId),
+],
+]);
+return $this;
+}
 
-    /**
+/**
      * Add a command to insert a new element just prior to the specified element
      * This is an alias for insertBefore.
      * @deprecated DOM element creation functions are deprecated
@@ -244,12 +244,12 @@ 
      *
      * @return self
      */
-    public function insert(string $sBefore, string $sTag, string $sId): self
-    {
-        return $this->insertBefore($sBefore, $sTag, $sId);
-    }
+public function insert(string $sBefore, string $sTag, string $sId): self
+{
+return $this->insertBefore($sBefore, $sTag, $sId);
+}
 
-    /**
+/**
      * Add a command to insert a new element after the specified
      * @deprecated DOM element creation functions are deprecated
      *
@@ -259,19 +259,19 @@ 
      *
      * @return self
      */
-    public function insertAfter(string $sAfter, string $sTag, string $sId): self
-    {
-        $this->xManager->addCommand('node.insert.after', [
-            'id' => $this->str($sAfter),
-            'tag' => [
-                'name' => $this->str($sTag),
-                'id' => $this->str($sId),
-            ],
-        ]);
-        return $this;
-    }
+public function insertAfter(string $sAfter, string $sTag, string $sId): self
+{
+$this->xManager->addCommand('node.insert.after', [
+'id' => $this->str($sAfter),
+'tag' => [
+    'name' => $this->str($sTag),
+    'id' => $this->str($sId),
+],
+]);
+return $this;
+}
 
-    /**
+/**
      * Add a command to set an event handler on the specified element
      * This handler can take custom parameters, and is is executed in a specific context.
      * @deprecated Event handler functions are deprecated
@@ -282,17 +282,17 @@ 
      *
      * @return self
      */
-    public function setEventHandler(string $sTarget, string $sEvent, JsExpr $xCall): self
-    {
-        $this->xManager->addCommand('handler.event.set', [
-            'id' => $this->str($sTarget),
-            'event' => $this->str($sEvent),
-            'func' => $xCall,
-        ]);
-        return $this;
-    }
+public function setEventHandler(string $sTarget, string $sEvent, JsExpr $xCall): self
+{
+$this->xManager->addCommand('handler.event.set', [
+'id' => $this->str($sTarget),
+'event' => $this->str($sEvent),
+'func' => $xCall,
+]);
+return $this;
+}
 
-    /**
+/**
      * Add a command to set a click handler on the browser
      * @deprecated Event handler functions are deprecated
      *
@@ -301,12 +301,12 @@ 
      *
      * @return self
      */
-    public function onClick(string $sTarget, JsExpr $xCall): self
-    {
-        return $this->setEventHandler($sTarget, 'onclick', $xCall);
-    }
+public function onClick(string $sTarget, JsExpr $xCall): self
+{
+return $this->setEventHandler($sTarget, 'onclick', $xCall);
+}
 
-    /**
+/**
      * Add a command to add an event handler on the specified element
      * This handler can take custom parameters, and is is executed in a specific context.
      * @deprecated Event handler functions are deprecated
@@ -317,17 +317,17 @@ 
      *
      * @return self
      */
-    public function addEventHandler(string $sTarget, string $sEvent, JsExpr $xCall): self
-    {
-        $this->xManager->addCommand('handler.event.add', [
-            'id' => $this->str($sTarget),
-            'event' => $this->str($sEvent),
-            'func' => $xCall,
-        ]);
-        return $this;
-    }
+public function addEventHandler(string $sTarget, string $sEvent, JsExpr $xCall): self
+{
+$this->xManager->addCommand('handler.event.add', [
+'id' => $this->str($sTarget),
+'event' => $this->str($sEvent),
+'func' => $xCall,
+]);
+return $this;
+}
 
-    /**
+/**
      * Add a command to install an event handler on the specified element
      * You can add more than one event handler to an element's event using this method.
      * @deprecated Event handler functions are deprecated
@@ -338,17 +338,17 @@ 
      *
      * @return self
      */
-    public function addHandler(string $sTarget, string $sEvent, string $sHandler): self
-    {
-        $this->xManager->addCommand('handler.add', [
-            'id' => $this->str($sTarget),
-            'event' => $this->str($sEvent),
-            'func' => $this->str($sHandler),
-        ]);
-        return $this;
-    }
+public function addHandler(string $sTarget, string $sEvent, string $sHandler): self
+{
+$this->xManager->addCommand('handler.add', [
+'id' => $this->str($sTarget),
+'event' => $this->str($sEvent),
+'func' => $this->str($sHandler),
+]);
+return $this;
+}
 
-    /**
+/**
      * Add a command to remove an event handler from an element
      * @deprecated Event handler functions are deprecated
      *
@@ -358,13 +358,13 @@ 
      *
      * @return self
      */
-    public function removeHandler(string $sTarget, string $sEvent, string $sHandler): self
-    {
-        $this->xManager->addCommand('handler.remove', [
-            'id' => $this->str($sTarget),
-            'event' => $this->str($sEvent),
-            'func' => $this->str($sHandler),
-        ]);
-        return $this;
-    }
+public function removeHandler(string $sTarget, string $sEvent, string $sHandler): self
+{
+$this->xManager->addCommand('handler.remove', [
+'id' => $this->str($sTarget),
+'event' => $this->str($sEvent),
+'func' => $this->str($sHandler),
+]);
+return $this;
+}
 }

jaxon-core/src/Plugin/AbstractResponsePlugin.php

Switch Indentation +4 added lines, -4 removed lines

@@ -27,13 +27,13 @@
 
 abstract class AbstractResponsePlugin extends AbstractPlugin implements ResponsePluginInterface
 {
-    use ResponsePluginTrait;
+use ResponsePluginTrait;
 
-    /**
+/**
      * Initialize the plugin
      *
      * @return void
      */
-    protected function init(): void
-    {}
+protected function init(): void
+{}
 }

jaxon-core/src/Plugin/PluginInterface.php

Switch Indentation +2 added lines, -2 removed lines

@@ -4,10 +4,10 @@
 
 interface PluginInterface
 {
-    /**
+/**
      * Get a unique name to identify the plugin.
      *
      * @return string
      */
-    public function getName(): string;
+public function getName(): string;
 }

jaxon-core/src/Script/ParameterFactory.php

Switch Indentation +45 added lines, -45 removed lines

@@ -19,109 +19,109 @@
 
 class ParameterFactory
 {
-    /**
+/**
      * Make a parameter of type form values
      *
      * @param string $sFormId    The id of the HTML form
      *
      * @return array
      */
-    public function form(string $sFormId): array
-    {
-        return (new HtmlReader($sFormId))->form();
-    }
+public function form(string $sFormId): array
+{
+return (new HtmlReader($sFormId))->form();
+}
 
-    /**
+/**
      * Make a parameter of type input value
      *
      * @param string $sInputId    the id of the HTML input element
      *
      * @return TypedValue
      */
-    public function input(string $sInputId): TypedValue
-    {
-        return (new HtmlReader($sInputId))->input();
-    }
+public function input(string $sInputId): TypedValue
+{
+return (new HtmlReader($sInputId))->input();
+}
 
-    /**
+/**
      * Make a parameter of type checked value
      *
      * @param string $sInputId    the name of the HTML form element
      *
      * @return array
      */
-    public function checked(string $sInputId): array
-    {
-        return (new HtmlReader($sInputId))->checked();
-    }
+public function checked(string $sInputId): array
+{
+return (new HtmlReader($sInputId))->checked();
+}
 
-    /**
+/**
      * Make a parameter of type select
      *
      * @param string $sInputId    the name of the HTML form element
      *
      * @return TypedValue
      */
-    public function select(string $sInputId): TypedValue
-    {
-        return $this->input($sInputId);
-    }
+public function select(string $sInputId): TypedValue
+{
+return $this->input($sInputId);
+}
 
-    /**
+/**
      * Make a parameter of type inner html
      *
      * @param string $sElementId    the id of the HTML element
      *
      * @return TypedValue
      */
-    public function html(string $sElementId): TypedValue
-    {
-        return (new HtmlReader($sElementId))->html();
-    }
+public function html(string $sElementId): TypedValue
+{
+return (new HtmlReader($sElementId))->html();
+}
 
-    /**
+/**
      * Make a parameter of type quoted string
      *
      * @param string $sValue    the value of the parameter
      *
      * @return TypedValue
      */
-    public function string(string $sValue): TypedValue
-    {
-        return TypedValue::make($sValue);
-    }
+public function string(string $sValue): TypedValue
+{
+return TypedValue::make($sValue);
+}
 
-    /**
+/**
      * Make a parameter of type numeric
      *
      * @param int $nValue    the value of the parameter
      *
      * @return TypedValue
      */
-    public function numeric(int $nValue): TypedValue
-    {
-        return TypedValue::make($nValue);
-    }
+public function numeric(int $nValue): TypedValue
+{
+return TypedValue::make($nValue);
+}
 
-    /**
+/**
      * Make a parameter of type numeric
      *
      * @param int $nValue    the value of the parameter
      *
      * @return TypedValue
      */
-    public function int(int $nValue): TypedValue
-    {
-        return $this->numeric($nValue);
-    }
+public function int(int $nValue): TypedValue
+{
+return $this->numeric($nValue);
+}
 
-    /**
+/**
      * Make a parameter of type page number
      *
      * @return TypedValue
      */
-    public function page(): TypedValue
-    {
-        return TypedValue::page();
-    }
+public function page(): TypedValue
+{
+return TypedValue::page();
+}
 }

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

Spacing +5 added lines, -5 removed lines

@@ -45,16 +45,16 @@ 
         $xType = $xParameter->getType();
         $sParameterName = '$' . $xParameter->getName();
         // Check the parameter class first.
-        if($xType instanceof ReflectionNamedType)
+        if ($xType instanceof ReflectionNamedType)
         {
             $sParameterType = $xType->getName();
             // The class + the name
-            if($this->cn()->has("$sParameterType $sParameterName"))
+            if ($this->cn()->has("$sParameterType $sParameterName"))
             {
                 return $this->cn()->get("$sParameterType $sParameterName");
             }
             // The class only
-            if($this->cn()->has($sParameterType))
+            if ($this->cn()->has($sParameterType))
             {
                 return $this->cn()->get($sParameterType);
             }
@@ -74,13 +74,13 @@ 
      */
     public function make(string|ReflectionClass $xClass): mixed
     {
-        if(is_string($xClass))
+        if (is_string($xClass))
         {
             // Create the reflection class instance
             $xClass = new ReflectionClass($xClass);
         }
         // Use the Reflection class to get the parameters of the constructor
-        if(($constructor = $xClass->getConstructor()) === null)
+        if (($constructor = $xClass->getConstructor()) === null)
         {
             return $xClass->newInstance();
         }