jaxon-php / jaxon-mono

jaxon-upload/src/register.php

Spacing +4 added lines, -4 removed lines

@@ -24,7 +24,7 @@ 
 {
     $jaxon = jaxon();
     $di = $jaxon->di();
-    if($di->h(UploadHandler::class))
+    if ($di->h(UploadHandler::class))
     {
         return;
     }
@@ -76,7 +76,7 @@ 
         $xUploadHandler = $di->g(UploadHandler::class);
         // The HTTP request
         $xRequest = $di->getRequest();
-        if($xUploadHandler->canProcessRequest($xRequest))
+        if ($xUploadHandler->canProcessRequest($xRequest))
         {
             $xUploadHandler->processRequest($xRequest);
         }
@@ -92,7 +92,7 @@ 
 {
     $jaxon = jaxon();
     $jaxon->callback()->boot(function() use($jaxon) {
-        if($jaxon->getOption('core.upload.enabled'))
+        if ($jaxon->getOption('core.upload.enabled'))
         {
             registerUpload();
         }
@@ -102,7 +102,7 @@ 
 function register()
 {
     // Do nothing if running in cli.
-    if(php_sapi_name() !== 'cli')
+    if (php_sapi_name() !== 'cli')
     {
         _register();
     };

Switch Indentation +66 added lines, -66 removed lines

@@ -22,63 +22,63 @@ 
  */
 function registerUpload(): void
 {
-    $jaxon = jaxon();
-    $di = $jaxon->di();
-    if($di->h(UploadHandler::class))
-    {
-        return;
-    }
+$jaxon = jaxon();
+$di = $jaxon->di();
+if($di->h(UploadHandler::class))
+{
+return;
+}
 
-    // Upload file and dir name generator
-    $di->set(FileNameInterface::class, function() {
-        return new class implements FileNameInterface
-        {
-            public function random(int $nLength): string
-            {
-                return bin2hex(random_bytes((int)($nLength / 2)));
-            }
-        };
-    });
-    // Upload validator
-    $di->set(Validator::class, function($c) {
-        return new Validator($c->g(ConfigManager::class), $c->g(Translator::class));
-    });
-    // File storage
-    $di->set(FileStorage::class, function($c) {
-        return  new FileStorage($c->g(ConfigManager::class), $c->g(Translator::class));
-    });
-    // File upload manager
-    $di->set(UploadManager::class, function($c) {
-        // Translation directory
-        $sTranslationDir = dirname(__DIR__) . '/translations';
-        // Load the upload translations
-        $xTranslator = $c->g(Translator::class);
-        $xTranslator->loadTranslations("$sTranslationDir/en/upload.php", 'en');
-        $xTranslator->loadTranslations("$sTranslationDir/fr/upload.php", 'fr');
-        $xTranslator->loadTranslations("$sTranslationDir/es/upload.php", 'es');
+// Upload file and dir name generator
+$di->set(FileNameInterface::class, function() {
+return new class implements FileNameInterface
+{
+public function random(int $nLength): string
+{
+    return bin2hex(random_bytes((int)($nLength / 2)));
+}
+};
+});
+// Upload validator
+$di->set(Validator::class, function($c) {
+return new Validator($c->g(ConfigManager::class), $c->g(Translator::class));
+});
+// File storage
+$di->set(FileStorage::class, function($c) {
+return  new FileStorage($c->g(ConfigManager::class), $c->g(Translator::class));
+});
+// File upload manager
+$di->set(UploadManager::class, function($c) {
+// Translation directory
+$sTranslationDir = dirname(__DIR__) . '/translations';
+// Load the upload translations
+$xTranslator = $c->g(Translator::class);
+$xTranslator->loadTranslations("$sTranslationDir/en/upload.php", 'en');
+$xTranslator->loadTranslations("$sTranslationDir/fr/upload.php", 'fr');
+$xTranslator->loadTranslations("$sTranslationDir/es/upload.php", 'es');
 
-        return new UploadManager($c->g(LoggerInterface::class), $c->g(Validator::class),
-            $xTranslator, $c->g(FileStorage::class),
-            $c->g(FileNameInterface::class));
-    });
-    // File upload plugin
-    $di->set(UploadHandler::class, function($c) {
-        return new UploadHandler($c->g(FileStorage::class), $c->g(UploadManager::class));
-    });
-    // Set alias on the interface
-    $di->alias(UploadHandlerInterface::class, UploadHandler::class);
+return new UploadManager($c->g(LoggerInterface::class), $c->g(Validator::class),
+$xTranslator, $c->g(FileStorage::class),
+$c->g(FileNameInterface::class));
+});
+// File upload plugin
+$di->set(UploadHandler::class, function($c) {
+return new UploadHandler($c->g(FileStorage::class), $c->g(UploadManager::class));
+});
+// Set alias on the interface
+$di->alias(UploadHandlerInterface::class, UploadHandler::class);
 
-    // Set a callback to process uploaded files in the incoming requests.
-    $jaxon->callback()->before(function() use($di) {
-        /** @var UploadHandler */
-        $xUploadHandler = $di->g(UploadHandler::class);
-        // The HTTP request
-        $xRequest = $di->getRequest();
-        if($xUploadHandler->canProcessRequest($xRequest))
-        {
-            $xUploadHandler->processRequest($xRequest);
-        }
-    });
+// Set a callback to process uploaded files in the incoming requests.
+$jaxon->callback()->before(function() use($di) {
+/** @var UploadHandler */
+$xUploadHandler = $di->g(UploadHandler::class);
+// The HTTP request
+$xRequest = $di->getRequest();
+if($xUploadHandler->canProcessRequest($xRequest))
+{
+$xUploadHandler->processRequest($xRequest);
+}
+});
 }
 
 /**
@@ -88,22 +88,22 @@ 
  */
 function _register(): void
 {
-    $jaxon = jaxon();
-    $jaxon->callback()->boot(function() use($jaxon) {
-        if($jaxon->getOption('core.upload.enabled'))
-        {
-            registerUpload();
-        }
-    });
+$jaxon = jaxon();
+$jaxon->callback()->boot(function() use($jaxon) {
+if($jaxon->getOption('core.upload.enabled'))
+{
+registerUpload();
+}
+});
 }
 
 function register()
 {
-    // Do nothing if running in cli.
-    if(php_sapi_name() !== 'cli')
-    {
-        _register();
-    };
+// Do nothing if running in cli.
+if(php_sapi_name() !== 'cli')
+{
+_register();
+};
 }
 
 register();

jaxon-upload/src/Manager/Validator.php

Spacing +6 added lines, -6 removed lines

@@ -97,7 +97,7 @@ 
     {

         $xDefault = $this->xConfigManager->getOption('upload.default.' . $sProperty);

         $aAllowed = $this->xConfigManager->getOption('upload.files.' . $sVarName . '.' . $sProperty, $xDefault);

-        if(is_array($aAllowed) && !in_array($sValue, $aAllowed))

+        if (is_array($aAllowed) && !in_array($sValue, $aAllowed))

         {

             $this->sErrorMessage = $this->xTranslator->trans('errors.upload.' . $sField, [$sField => $sValue]);

             return false;

@@ -118,7 +118,7 @@ 
     {

         $xDefault = $this->xConfigManager->getOption('upload.default.' . $sProperty, 0);

         $nSize = $this->xConfigManager->getOption('upload.files.' . $sVarName . '.' . $sProperty, $xDefault);

-        if($nSize > 0 && (

+        if ($nSize > 0 && (

             ($sProperty == 'max-size' && $nFileSize > $nSize) ||

             ($sProperty == 'min-size' && $nFileSize < $nSize)))

         {

@@ -140,25 +140,25 @@ 
     {

         $this->sErrorMessage = '';

         // Verify the file extension

-        if(!$this->validateFileProperty($sVarName, $xFile->type(), 'types', 'type'))

+        if (!$this->validateFileProperty($sVarName, $xFile->type(), 'types', 'type'))

         {

             return false;

         }

 

         // Verify the file extension

-        if(!$this->validateFileProperty($sVarName, $xFile->extension(), 'extensions', 'extension'))

+        if (!$this->validateFileProperty($sVarName, $xFile->extension(), 'extensions', 'extension'))

         {

             return false;

         }

 

         // Verify the max size

-        if(!$this->validateFileSize($sVarName, $xFile->size(), 'max-size'))

+        if (!$this->validateFileSize($sVarName, $xFile->size(), 'max-size'))

         {

             return false;

         }

 

         // Verify the min size

-        if(!$this->validateFileSize($sVarName, $xFile->size(), 'min-size'))

+        if (!$this->validateFileSize($sVarName, $xFile->size(), 'min-size'))

         {

             return false;

         }

Switch Indentation +76 added lines, -76 removed lines

@@ -30,46 +30,46 @@ 
 

 class Validator

 {

-    /**

+/**

      * The config manager

      *

      * @var ConfigManager

      */

-    protected $xConfigManager;

+protected $xConfigManager;

 

-    /**

+/**

      * The translator

      *

      * @var Translator

      */

-    protected $xTranslator;

+protected $xTranslator;

 

-    /**

+/**

      * The last error message

      *

      * @var string

      */

-    protected $sErrorMessage;

+protected $sErrorMessage;

 

-    public function __construct(ConfigManager $xConfigManager, Translator $xTranslator)

-    {

-        // Set the config manager

-        $this->xConfigManager = $xConfigManager;

-        // Set the translator

-        $this->xTranslator = $xTranslator;

-    }

+public function __construct(ConfigManager $xConfigManager, Translator $xTranslator)

+{

+// Set the config manager

+$this->xConfigManager = $xConfigManager;

+// Set the translator

+$this->xTranslator = $xTranslator;

+}

 

-    /**

+/**

      * Get the last error message

      *

      * @return string

      */

-    public function getErrorMessage(): string

-    {

-        return $this->sErrorMessage;

-    }

+public function getErrorMessage(): string

+{

+return $this->sErrorMessage;

+}

 

-    /**

+/**

      * Validate a property of an uploaded file

      *

      * @param string $sVarName    The uploaded file variable name

@@ -79,19 +79,19 @@ 
      *

      * @return bool

      */

-    private function validateFileProperty(string $sVarName, string $sValue, string $sProperty, string $sField): bool

-    {

-        $xDefault = $this->xConfigManager->getOption('upload.default.' . $sProperty);

-        $aAllowed = $this->xConfigManager->getOption('upload.files.' . $sVarName . '.' . $sProperty, $xDefault);

-        if(is_array($aAllowed) && !in_array($sValue, $aAllowed))

-        {

-            $this->sErrorMessage = $this->xTranslator->trans('errors.upload.' . $sField, [$sField => $sValue]);

-            return false;

-        }

-        return true;

-    }

-

-    /**

+private function validateFileProperty(string $sVarName, string $sValue, string $sProperty, string $sField): bool

+{

+$xDefault = $this->xConfigManager->getOption('upload.default.' . $sProperty);

+$aAllowed = $this->xConfigManager->getOption('upload.files.' . $sVarName . '.' . $sProperty, $xDefault);

+if(is_array($aAllowed) && !in_array($sValue, $aAllowed))

+{

+$this->sErrorMessage = $this->xTranslator->trans('errors.upload.' . $sField, [$sField => $sValue]);

+return false;

+}

+return true;

+}

+

+/**

      * Validate the size of an uploaded file

      *

      * @param string $sVarName    The uploaded file variable name

@@ -100,21 +100,21 @@ 
      *

      * @return bool

      */

-    private function validateFileSize(string $sVarName, int $nFileSize, string $sProperty): bool

-    {

-        $xDefault = $this->xConfigManager->getOption('upload.default.' . $sProperty, 0);

-        $nSize = $this->xConfigManager->getOption('upload.files.' . $sVarName . '.' . $sProperty, $xDefault);

-        if($nSize > 0 && (

-            ($sProperty == 'max-size' && $nFileSize > $nSize) ||

-            ($sProperty == 'min-size' && $nFileSize < $nSize)))

-        {

-            $this->sErrorMessage = $this->xTranslator->trans('errors.upload.' . $sProperty, ['size' => $nFileSize]);

-            return false;

-        }

-        return true;

-    }

-

-    /**

+private function validateFileSize(string $sVarName, int $nFileSize, string $sProperty): bool

+{

+$xDefault = $this->xConfigManager->getOption('upload.default.' . $sProperty, 0);

+$nSize = $this->xConfigManager->getOption('upload.files.' . $sVarName . '.' . $sProperty, $xDefault);

+if($nSize > 0 && (

+($sProperty == 'max-size' && $nFileSize > $nSize) ||

+($sProperty == 'min-size' && $nFileSize < $nSize)))

+{

+$this->sErrorMessage = $this->xTranslator->trans('errors.upload.' . $sProperty, ['size' => $nFileSize]);

+return false;

+}

+return true;

+}

+

+/**

      * Validate an uploaded file

      *

      * @param string $sVarName    The uploaded file variable name

@@ -122,33 +122,33 @@ 
      *

      * @return bool

      */

-    public function validateUploadedFile(string $sVarName, File $xFile): bool

-    {

-        $this->sErrorMessage = '';

-        // Verify the file extension

-        if(!$this->validateFileProperty($sVarName, $xFile->type(), 'types', 'type'))

-        {

-            return false;

-        }

-

-        // Verify the file extension

-        if(!$this->validateFileProperty($sVarName, $xFile->extension(), 'extensions', 'extension'))

-        {

-            return false;

-        }

-

-        // Verify the max size

-        if(!$this->validateFileSize($sVarName, $xFile->size(), 'max-size'))

-        {

-            return false;

-        }

-

-        // Verify the min size

-        if(!$this->validateFileSize($sVarName, $xFile->size(), 'min-size'))

-        {

-            return false;

-        }

-

-        return true;

-    }

+public function validateUploadedFile(string $sVarName, File $xFile): bool

+{

+$this->sErrorMessage = '';

+// Verify the file extension

+if(!$this->validateFileProperty($sVarName, $xFile->type(), 'types', 'type'))

+{

+return false;

+}

+

+// Verify the file extension

+if(!$this->validateFileProperty($sVarName, $xFile->extension(), 'extensions', 'extension'))

+{

+return false;

+}

+

+// Verify the max size

+if(!$this->validateFileSize($sVarName, $xFile->size(), 'max-size'))

+{

+return false;

+}

+

+// Verify the min size

+if(!$this->validateFileSize($sVarName, $xFile->size(), 'min-size'))

+{

+return false;

+}

+

+return true;

+}

 }

jaxon-upload/src/Manager/File.php

Switch Indentation +64 added lines, -64 removed lines

@@ -22,56 +22,56 @@ 
 

 class File implements FileInterface

 {

-    /**

+/**

      * The uploaded file type

      *

      * @var string

      */

-    protected $sType;

+protected $sType;

 

-    /**

+/**

      * The uploaded file name, without the extension and sanitized

      *

      * @var string

      */

-    protected $sName;

+protected $sName;

 

-    /**

+/**

      * The uploaded file name, with the extension

      *

      * @var string

      */

-    protected $sFilename;

+protected $sFilename;

 

-    /**

+/**

      * The uploaded file path

      *

      * @var string

      */

-    protected $sPath;

+protected $sPath;

 

-    /**

+/**

      * The uploaded file size

      *

      * @var int

      */

-    protected $nSize;

+protected $nSize;

 

-    /**

+/**

      * The uploaded file extension

      *

      * @var string

      */

-    protected $sExtension;

+protected $sExtension;

 

-    /**

+/**

      * The filesystem where the file is stored

      *

      * @var Filesystem

      */

-    protected $xFilesystem;

+protected $xFilesystem;

 

-    /**

+/**

      * Create an instance of this class using data from an uploaded file.

      *

      * @param Filesystem $xFilesystem

@@ -81,87 +81,87 @@ 
      *

      * @return File

      */

-    public static function fromHttpFile(Filesystem $xFilesystem,

-        UploadedFile $xHttpFile, string $sUploadDir, string $sName): File

-    {

-        $xFile = new File();

-        $xFile->xFilesystem = $xFilesystem;

-        $xFile->sType = $xHttpFile->getClientMediaType();

-        $xFile->sName = $sName;

-        $xFile->sFilename = $xHttpFile->getClientFilename();

-        $xFile->sExtension = pathinfo($xFile->sFilename, PATHINFO_EXTENSION);

-        $xFile->nSize = $xHttpFile->getSize();

-        $xFile->sPath = $sUploadDir . $xFile->sName . '.' . $xFile->sExtension;

-        return $xFile;

-    }

-

-    /**

+public static function fromHttpFile(Filesystem $xFilesystem,

+UploadedFile $xHttpFile, string $sUploadDir, string $sName): File

+{

+$xFile = new File();

+$xFile->xFilesystem = $xFilesystem;

+$xFile->sType = $xHttpFile->getClientMediaType();

+$xFile->sName = $sName;

+$xFile->sFilename = $xHttpFile->getClientFilename();

+$xFile->sExtension = pathinfo($xFile->sFilename, PATHINFO_EXTENSION);

+$xFile->nSize = $xHttpFile->getSize();

+$xFile->sPath = $sUploadDir . $xFile->sName . '.' . $xFile->sExtension;

+return $xFile;

+}

+

+/**

      * Get the filesystem where the file is stored

      *

      * @return Filesystem

      */

-    public function filesystem(): Filesystem

-    {

-        return $this->xFilesystem;

-    }

+public function filesystem(): Filesystem

+{

+return $this->xFilesystem;

+}

 

-    /**

+/**

      * Get the uploaded file type

      *

      * @return string

      */

-    public function type(): string

-    {

-        return $this->sType;

-    }

+public function type(): string

+{

+return $this->sType;

+}

 

-    /**

+/**

      * Get the uploaded file name, without the extension and slugified

      *

      * @return string

      */

-    public function name(): string

-    {

-        return $this->sName;

-    }

+public function name(): string

+{

+return $this->sName;

+}

 

-    /**

+/**

      * Get the uploaded file name, with the extension

      *

      * @return string

      */

-    public function filename(): string

-    {

-        return $this->sFilename;

-    }

+public function filename(): string

+{

+return $this->sFilename;

+}

 

-    /**

+/**

      * Get the uploaded file path

      *

      * @return string

      */

-    public function path(): string

-    {

-        return $this->sPath;

-    }

+public function path(): string

+{

+return $this->sPath;

+}

 

-    /**

+/**

      * Get the uploaded file size

      *

      * @return int

      */

-    public function size(): int

-    {

-        return $this->nSize;

-    }

+public function size(): int

+{

+return $this->nSize;

+}

 

-    /**

+/**

      * Get the uploaded file extension

      *

      * @return string

      */

-    public function extension(): string

-    {

-        return $this->sExtension;

-    }

+public function extension(): string

+{

+return $this->sExtension;

+}

 }

jaxon-upload/src/Manager/FileNameInterface.php

Switch Indentation +2 added lines, -2 removed lines

@@ -4,12 +4,12 @@
 
 interface FileNameInterface
 {
-    /**
+/**
      * Generate a random name for a file or dir
      *
      * @param int $nLength
      *
      * @return string
      */
-    public function random(int $nLength): string;
+public function random(int $nLength): string;
 }

jaxon-upload/src/UploadHandler.php

Switch Indentation +33 added lines, -33 removed lines

@@ -25,58 +25,58 @@ 
 
 class UploadHandler implements UploadHandlerInterface
 {
-    /**
+/**
      * The uploaded files copied in the user dir
      *
      * @var array
      */
-    private $aUserFiles = [];
+private $aUserFiles = [];
 
-    /**
+/**
      * The constructor
      *
      * @param FileStorage $xFileStorage
      * @param UploadManager $xUploadManager
      */
-    public function __construct(private FileStorage $xFileStorage,
-        private UploadManager $xUploadManager)
-    {}
+public function __construct(private FileStorage $xFileStorage,
+private UploadManager $xUploadManager)
+{}
 
-    /**
+/**
      * Set the uploaded file name sanitizer
      *
      * @param Closure $cSanitizer    The closure
      *
      * @return void
      */
-    public function sanitizer(Closure $cSanitizer): void
-    {
-        $this->xUploadManager->setNameSanitizer($cSanitizer);
-    }
+public function sanitizer(Closure $cSanitizer): void
+{
+$this->xUploadManager->setNameSanitizer($cSanitizer);
+}
 
-    /**
+/**
      * Get the uploaded files
      *
      * @return array
      */
-    public function files(): array
-    {
-        return $this->aUserFiles;
-    }
+public function files(): array
+{
+return $this->aUserFiles;
+}
 
-    /**
+/**
      * Check if the current request contains uploaded files
      *
      * @param ServerRequestInterface $xRequest
      *
      * @return bool
      */
-    public function canProcessRequest(ServerRequestInterface $xRequest): bool
-    {
-        return count($xRequest->getUploadedFiles()) > 0;
-    }
+public function canProcessRequest(ServerRequestInterface $xRequest): bool
+{
+return count($xRequest->getUploadedFiles()) > 0;
+}
 
-    /**
+/**
      * Process the uploaded files in the HTTP request
      *
      * @param ServerRequestInterface $xRequest
@@ -84,21 +84,21 @@ 
      * @return bool
      * @throws RequestException
      */
-    public function processRequest(ServerRequestInterface $xRequest): bool
-    {
-        // Copy the uploaded files from the HTTP request.
-        $this->aUserFiles = $this->xUploadManager->readFromHttpData($xRequest);
-        return true;
-    }
+public function processRequest(ServerRequestInterface $xRequest): bool
+{
+// Copy the uploaded files from the HTTP request.
+$this->aUserFiles = $this->xUploadManager->readFromHttpData($xRequest);
+return true;
+}
 
-    /**
+/**
      * @param string $sStorage
      * @param Closure $cFactory
      *
      * @return void
      */
-    public function registerStorageAdapter(string $sStorage, Closure $cFactory): void
-    {
-        $this->xFileStorage->registerAdapter($sStorage, $cFactory);
-    }
+public function registerStorageAdapter(string $sStorage, Closure $cFactory): void
+{
+$this->xFileStorage->registerAdapter($sStorage, $cFactory);
+}
 }

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

Spacing +1 added lines, -1 removed lines

@@ -50,7 +50,7 @@
      */
     protected function validateName(string $sName): void
     {
-        if(preg_match('/^[a-zA-Z][a-zA-Z0-9_\-\.]*$/', $sName) > 0)
+        if (preg_match('/^[a-zA-Z][a-zA-Z0-9_\-\.]*$/', $sName) > 0)
         {
             return;
         }

jaxon-core/src/Plugin/AbstractRequestPlugin.php

Switch Indentation +7 added lines, -7 removed lines

@@ -30,16 +30,16 @@
 
 abstract class AbstractRequestPlugin extends AbstractPlugin implements CallableRegistryInterface, RequestHandlerInterface
 {
-    /**
+/**
      * @var Target
      */
-    protected $xTarget = null;
+protected $xTarget = null;
 
-    /**
+/**
      * @inheritDoc
      */
-    public function getTarget(): ?Target
-    {
-        return $this->xTarget;
-    }
+public function getTarget(): ?Target
+{
+return $this->xTarget;
+}
 }

jaxon-core/src/Plugin/RequestHandlerInterface.php

Switch Indentation +8 added lines, -8 removed lines

@@ -7,21 +7,21 @@ 
 
 interface RequestHandlerInterface
 {
-    /**
+/**
      * Get the target function or class and method
      *
      * @return Target|null
      */
-    public function getTarget(): ?Target;
+public function getTarget(): ?Target;
 
-    /**
+/**
      * @param ServerRequestInterface $xRequest
      *
      * @return Target
      */
-    public function setTarget(ServerRequestInterface $xRequest): Target;
+public function setTarget(ServerRequestInterface $xRequest): Target;
 
-    /**
+/**
      * Check if this plugin can process the current request
      *
      * Called by the <Jaxon\Plugin\RequestManager> when a request has been received to determine
@@ -31,9 +31,9 @@ 
      *
      * @return bool
      */
-    public static function canProcessRequest(ServerRequestInterface $xRequest): bool;
+public static function canProcessRequest(ServerRequestInterface $xRequest): bool;
 
-    /**
+/**
      * Process the current request
      *
      * Called by the <Jaxon\Plugin\RequestManager> when a request is being processed.
@@ -42,5 +42,5 @@ 
      *
      * @return void
      */
-    public function processRequest(): void;
+public function processRequest(): void;
 }

jaxon-annotations/tests/TestAnnotation/AttrAnnotationTest.php

Spacing +1 added lines, -1 removed lines

@@ -45,7 +45,7 @@
         $aFiles = scandir($this->sCacheDir);
         foreach ($aFiles as $sFile)
         {
-            if($sFile !== '.' && $sFile !== '..')
+            if ($sFile !== '.' && $sFile !== '..')
             {
                 @unlink($this->sCacheDir . DIRECTORY_SEPARATOR . $sFile);
             }