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), $c->g(ConfigManager::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), $c->g(ConfigManager::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/Manager/UploadManager.php

Braces +2 added lines, -4 removed lines

@@ -138,8 +138,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'));

@@ -238,8 +237,7 @@ 
             {

                 $aFiles['user']->filesystem()->write($aFiles['user']->path(), $aFiles['temp']->getStream());

             }

-        }

-        catch(FilesystemException $e)

+        } catch(FilesystemException $e)

         {

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

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

Spacing +10 added lines, -10 removed lines

@@ -133,13 +133,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'));

@@ -173,7 +173,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,

@@ -184,7 +184,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);

         }

@@ -192,7 +192,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());

         }

@@ -217,16 +217,16 @@ 
 

         $aUserFiles = [];

         $this->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)

             {

                 $aUserFiles[$sField][] = $this->makeUploadedFile($xHttpFile, $sUploadDir, $sField);

             }

@@ -234,12 +234,12 @@ 
         // Copy the uploaded files from the temp dir to the user dir

         try

         {

-            foreach($this->aAllFiles as $aFiles)

+            foreach ($this->aAllFiles as $aFiles)

             {

                 $aFiles['user']->filesystem()->write($aFiles['user']->path(), $aFiles['temp']->getStream());

             }

         }

-        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 +138 added lines, -138 removed lines

@@ -31,42 +31,42 @@ 
 

 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;

 

-    /**

+/**

      * A flat list of all uploaded files

      *

      * @var array

      */

-    private $aAllFiles = [];

+private $aAllFiles = [];

 

-    /**

+/**

      * @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

@@ -76,50 +76,50 @@ 
      * @param FileNameInterface $xFileName

      * @param ConfigManager $xConfigManager

      */

-    public function __construct(private LoggerInterface $xLogger,

-        private Validator $xValidator, private Translator $xTranslator,

-        private FileStorage $xFileStorage, private FileNameInterface $xFileName,

-        private ConfigManager $xConfigManager)

-    {

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

+private ConfigManager $xConfigManager)

+{

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

@@ -128,25 +128,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

@@ -154,12 +154,12 @@ 
      * @return string

      * @throws RequestException

      */

-    private function getUploadDir(string $sField): string

-    {

-        return $this->_makeUploadDir($this->xFileStorage->filesystem($sField), $this->randomName() . '/');

-    }

+private function getUploadDir(string $sField): string

+{

+return $this->_makeUploadDir($this->xFileStorage->filesystem($sField), $this->randomName() . '/');

+}

 

-    /**

+/**

      * Check uploaded files

      *

      * @param UploadedFile $xHttpFile

@@ -169,40 +169,40 @@ 
      * @return File

      * @throws RequestException

      */

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

-    {

-        // 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],

-            ]);

-            throw new RequestException($this->xTranslator->trans('errors.upload.failed', ['name' => $sField]));

-        }

-

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

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

-        return $xFile;

-    }

-

-    /**

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

+{

+// 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],

+]);

+throw new RequestException($this->xTranslator->trans('errors.upload.failed', ['name' => $sField]));

+}

+

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

+$this->aAllFiles[] = ['temp' => $xHttpFile, 'user' => $xFile];

+return $xFile;

+}

+

+/**

      * Read uploaded files info from HTTP request data

      *

      * @param ServerRequestInterface $xRequest

@@ -210,40 +210,40 @@ 
      * @return array

      * @throws RequestException

      */

-    public function readFromHttpData(ServerRequestInterface $xRequest): array

-    {

-        // Get the uploaded files

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

-

-        $aUserFiles = [];

-        $this->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)

-            {

-                $aUserFiles[$sField][] = $this->makeUploadedFile($xHttpFile, $sUploadDir, $sField);

-            }

-        }

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

-        try

-        {

-            foreach($this->aAllFiles as $aFiles)

-            {

-                $aFiles['user']->filesystem()->write($aFiles['user']->path(), $aFiles['temp']->getStream());

-            }

-        }

-        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 = [];

+$this->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)

+{

+    $aUserFiles[$sField][] = $this->makeUploadedFile($xHttpFile, $sUploadDir, $sField);

+}

+}

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

+try

+{

+foreach($this->aAllFiles as $aFiles)

+{

+    $aFiles['user']->filesystem()->write($aFiles['user']->path(), $aFiles['temp']->getStream());

+}

+}

+catch(FilesystemException $e)

+{

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

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

+}

+return $aUserFiles;

+}

 }

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/App/Metadata/Data/HookData.php

Spacing +2 added lines, -2 removed lines

@@ -54,7 +54,7 @@ 
      */
     protected function validateMethod(string $sMethod): void
     {
-        if(preg_match('/^[a-zA-Z][a-zA-Z0-9_]*$/', $sMethod) > 0)
+        if (preg_match('/^[a-zA-Z][a-zA-Z0-9_]*$/', $sMethod) > 0)
         {
             return;
         }
@@ -81,7 +81,7 @@ 
     public function encode(string $sVarName): array
     {
         $aCalls = [];
-        foreach($this->aCalls as $sMethod => $aParams)
+        foreach ($this->aCalls as $sMethod => $aParams)
         {
             $sParams = addslashes(json_encode($aParams));
             $aCalls[] = "{$sVarName}->addCall('$sMethod', json_decode(\"$sParams\", true));";

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