jaxon-php / jaxon-mono

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

Switch Indentation +207 added lines, -207 removed lines

@@ -31,75 +31,75 @@ 
 
 class CodeGenerator
 {
-    /**
+/**
      * @var AssetManager
      */
-    private $xAssetManager;
+private $xAssetManager;
 
-    /**
+/**
      * The classes that generate code
      *
      * @var array<string>
      */
-    protected $aCodeGenerators = [];
+protected $aCodeGenerators = [];
 
-    /**
+/**
      * @var string
      */
-    protected $sJsOptions;
+protected $sJsOptions;
 
-    /**
+/**
      * @var array
      */
-    protected $aCss = [];
+protected $aCss = [];
 
-    /**
+/**
      * @var array
      */
-    protected $aJs = [];
+protected $aJs = [];
 
-    /**
+/**
      * @var array
      */
-    protected $aCodeJs = [];
+protected $aCodeJs = [];
 
-    /**
+/**
      * @var array
      */
-    protected $aCodeJsBefore = [];
+protected $aCodeJsBefore = [];
 
-    /**
+/**
      * @var array
      */
-    protected $aCodeJsAfter = [];
+protected $aCodeJsAfter = [];
 
-    /**
+/**
      * @var array
      */
-    protected $aCodeJsFiles = [];
+protected $aCodeJsFiles = [];
 
-    /**
+/**
      * @var bool
      */
-    protected $bGenerated = false;
+protected $bGenerated = false;
 
-    /**
+/**
      * The constructor
      *
      * @param string $sVersion
      * @param Container $di
      * @param TemplateEngine $xTemplateEngine
      */
-    public function __construct(private string $sVersion, private Container $di,
-        private TemplateEngine $xTemplateEngine)
-    {
-        // The Jaxon library config is on top.
-        $this->addCodeGenerator(ConfigScriptGenerator::class, 0);
-        // The ready script comes after.
-        $this->addCodeGenerator(ReadyScriptGenerator::class, 200);
-    }
-
-    /**
+public function __construct(private string $sVersion, private Container $di,
+private TemplateEngine $xTemplateEngine)
+{
+// The Jaxon library config is on top.
+$this->addCodeGenerator(ConfigScriptGenerator::class, 0);
+// The ready script comes after.
+$this->addCodeGenerator(ReadyScriptGenerator::class, 200);
+}
+
+/**
      * Add a code generator to the list
      *
      * @param string $sClassName    The code generator class
@@ -107,39 +107,39 @@ 
      *
      * @return void
      */
-    public function addCodeGenerator(string $sClassName, int $nPriority): void
-    {
-        while(isset($this->aCodeGenerators[$nPriority]))
-        {
-            $nPriority++;
-        }
-        $this->aCodeGenerators[$nPriority] = $sClassName;
-    }
-
-    /**
+public function addCodeGenerator(string $sClassName, int $nPriority): void
+{
+while(isset($this->aCodeGenerators[$nPriority]))
+{
+$nPriority++;
+}
+$this->aCodeGenerators[$nPriority] = $sClassName;
+}
+
+/**
      * @param string $sClassName
      *
      * @return CodeGeneratorInterface
      */
-    private function getCodeGenerator(string $sClassName): CodeGeneratorInterface
-    {
-        return $this->di->g($sClassName);
-    }
+private function getCodeGenerator(string $sClassName): CodeGeneratorInterface
+{
+return $this->di->g($sClassName);
+}
 
-    /**
+/**
      * Generate a hash for all the javascript code generated by the library
      *
      * @return string
      */
-    public function getHash(): string
-    {
-        $aHashes = array_map(fn($sClassName) =>
-            $this->getCodeGenerator($sClassName)->getHash(), $this->aCodeGenerators);
-        $aHashes[] = $this->sVersion;
-        return md5(implode('', $aHashes));
-    }
-
-    /**
+public function getHash(): string
+{
+$aHashes = array_map(fn($sClassName) =>
+$this->getCodeGenerator($sClassName)->getHash(), $this->aCodeGenerators);
+$aHashes[] = $this->sVersion;
+return md5(implode('', $aHashes));
+}
+
+/**
      * Render a template in the 'plugins' subdir
      *
      * @param string $sTemplate    The template filename
@@ -147,185 +147,185 @@ 
      *
      * @return string
      */
-    private function render(string $sTemplate, array $aVars = []): string
-    {
-        $aVars['sJsOptions'] = $this->sJsOptions;
-        return $this->xTemplateEngine->render("jaxon::plugins/$sTemplate", $aVars);
-    }
+private function render(string $sTemplate, array $aVars = []): string
+{
+$aVars['sJsOptions'] = $this->sJsOptions;
+return $this->xTemplateEngine->render("jaxon::plugins/$sTemplate", $aVars);
+}
 
-    /**
+/**
      * Generate the Jaxon CSS and js codes for a given plugin
      *
      * @param CodeGeneratorInterface $xGenerator
      *
      * @return void
      */
-    private function generatePluginCodes(CodeGeneratorInterface $xGenerator): void
-    {
-        if(!is_subclass_of($xGenerator, AbstractPlugin::class) ||
-            $this->xAssetManager->shallIncludeAssets($xGenerator))
-        {
-            // HTML tags for CSS
-            if(($sCss = trim($xGenerator->getCss(), " \n")) !== '')
-            {
-                $this->aCss[] = $sCss;
-            }
-            // HTML tags for js
-            if(($sJs = trim($xGenerator->getJs(), " \n")) !== '')
-            {
-                $this->aJs[] = $sJs;
-            }
-        }
-
-        // Additional js codes
-        if(($xJsCode = $xGenerator->getJsCode()) !== null)
-        {
-            if(($sJs = trim($xJsCode->sJs, " \n")) !== '')
-            {
-                $this->aCodeJs[] = $sJs;
-            }
-            if(($sJsBefore = trim($xJsCode->sJsBefore, " \n")) !== '')
-            {
-                $this->aCodeJsBefore[] = $sJsBefore;
-            }
-            if(($sJsAfter = trim($xJsCode->sJsAfter, " \n")) !== '')
-            {
-                $this->aCodeJsAfter[] = $sJsAfter;
-            }
-            $this->aCodeJsFiles = array_merge($this->aCodeJsFiles, $xJsCode->aFiles);
-        }
-    }
-
-    /**
+private function generatePluginCodes(CodeGeneratorInterface $xGenerator): void
+{
+if(!is_subclass_of($xGenerator, AbstractPlugin::class) ||
+$this->xAssetManager->shallIncludeAssets($xGenerator))
+{
+// HTML tags for CSS
+if(($sCss = trim($xGenerator->getCss(), " \n")) !== '')
+{
+    $this->aCss[] = $sCss;
+}
+// HTML tags for js
+if(($sJs = trim($xGenerator->getJs(), " \n")) !== '')
+{
+    $this->aJs[] = $sJs;
+}
+}
+
+// Additional js codes
+if(($xJsCode = $xGenerator->getJsCode()) !== null)
+{
+if(($sJs = trim($xJsCode->sJs, " \n")) !== '')
+{
+    $this->aCodeJs[] = $sJs;
+}
+if(($sJsBefore = trim($xJsCode->sJsBefore, " \n")) !== '')
+{
+    $this->aCodeJsBefore[] = $sJsBefore;
+}
+if(($sJsAfter = trim($xJsCode->sJsAfter, " \n")) !== '')
+{
+    $this->aCodeJsAfter[] = $sJsAfter;
+}
+$this->aCodeJsFiles = array_merge($this->aCodeJsFiles, $xJsCode->aFiles);
+}
+}
+
+/**
      * Generate the Jaxon CSS ans js codes
      *
      * @return void
      * @throws UriException
      */
-    private function generateCodes(): void
-    {
-        if($this->bGenerated)
-        {
-            return;
-        }
-
-        // We need the library to have been bootstrapped.
-        $this->di->getBootstrap()->onBoot();
-
-        // Sort the code generators by ascending priority
-        ksort($this->aCodeGenerators);
-
-        // Cannot be injected because of dependency loop.
-        $this->xAssetManager = $this->di->getAssetManager();
-
-        $this->sJsOptions = $this->xAssetManager->getJsOptions();
-        foreach($this->aCodeGenerators as $sClassName)
-        {
-            $this->generatePluginCodes($this->getCodeGenerator($sClassName));
-        }
-
-        // Load the Jaxon lib js files, after the other libs js files.
-        $this->aJs[] = trim($this->render('includes.js', [
-            'aUrls' => $this->xAssetManager->getJsLibFiles(),
-        ]));
-
-        // The codes are already generated.
-        $this->bGenerated = true;
-    }
-
-    /**
+private function generateCodes(): void
+{
+if($this->bGenerated)
+{
+return;
+}
+
+// We need the library to have been bootstrapped.
+$this->di->getBootstrap()->onBoot();
+
+// Sort the code generators by ascending priority
+ksort($this->aCodeGenerators);
+
+// Cannot be injected because of dependency loop.
+$this->xAssetManager = $this->di->getAssetManager();
+
+$this->sJsOptions = $this->xAssetManager->getJsOptions();
+foreach($this->aCodeGenerators as $sClassName)
+{
+$this->generatePluginCodes($this->getCodeGenerator($sClassName));
+}
+
+// Load the Jaxon lib js files, after the other libs js files.
+$this->aJs[] = trim($this->render('includes.js', [
+'aUrls' => $this->xAssetManager->getJsLibFiles(),
+]));
+
+// The codes are already generated.
+$this->bGenerated = true;
+}
+
+/**
      * Get the HTML tags to include Jaxon CSS code and files into the page
      *
      * @return string
      * @throws UriException
      */
-    public function getCss(): string
-    {
-        $this->generateCodes();
-        return implode("\n\n", $this->aCss);
-    }
+public function getCss(): string
+{
+$this->generateCodes();
+return implode("\n\n", $this->aCss);
+}
 
-    /**
+/**
      * Get the HTML tags to include Jaxon javascript files into the page
      *
      * @return string
      * @throws UriException
      */
-    public function getJs(): string
-    {
-        $this->generateCodes();
-        return implode("\n\n", $this->aJs);
-    }
+public function getJs(): string
+{
+$this->generateCodes();
+return implode("\n\n", $this->aJs);
+}
 
-    /**
+/**
      * Get the Javascript code
      *
      * @return string
      */
-    public function getJsScript(): string
-    {
-        $aJsScripts = [];
-        foreach($this->aCodeGenerators as $sClassName)
-        {
-            $xGenerator = $this->getCodeGenerator($sClassName);
-            // Javascript code
-            if(($sJsScript = trim($xGenerator->getScript(), " \n")) !== '')
-            {
-                $aJsScripts[] = $sJsScript;
-            }
-        }
-        return implode("\n\n", $aJsScripts);
-    }
-
-    /**
+public function getJsScript(): string
+{
+$aJsScripts = [];
+foreach($this->aCodeGenerators as $sClassName)
+{
+$xGenerator = $this->getCodeGenerator($sClassName);
+// Javascript code
+if(($sJsScript = trim($xGenerator->getScript(), " \n")) !== '')
+{
+    $aJsScripts[] = $sJsScript;
+}
+}
+return implode("\n\n", $aJsScripts);
+}
+
+/**
      * @param bool $bIncludeJs Also get the JS files
      * @param bool $bIncludeCss Also get the CSS files
      *
      * @return array<string>
      */
-    private function renderCodes(bool $bIncludeJs, bool $bIncludeCss): array
-    {
-        $aCodes = [];
-        if($bIncludeCss)
-        {
-            $aCodes[] = $this->getCss();
-        }
-        if($bIncludeJs)
-        {
-            $aCodes[] = $this->getJs();
-        }
-
-        $sUrl = !$this->xAssetManager->shallCreateJsFiles() ? '' :
-            $this->xAssetManager->createJsFiles($this);
-        // Wrap the js code into the corresponding HTML tag.
-        $aCodes[] = $sUrl !== '' ?
-            $this->render('include.js', ['sUrl' => $sUrl]) :
-            $this->render('wrapper.js', ['sScript' => $this->getJsScript()]);
-
-        // Wrap the js codes into HTML tags.
-        if(count($this->aCodeJsBefore) > 0)
-        {
-            $sScript = implode("\n\n", $this->aCodeJsBefore);
-            $aCodes[] = $this->render('wrapper.js', ['sScript' => $sScript]);
-        }
-        if(count($this->aCodeJs) > 0)
-        {
-            $sScript = implode("\n\n", $this->aCodeJs);
-            $aCodes[] = $this->render('wrapper.js', ['sScript' => $sScript]);
-        }
-        if(count($this->aCodeJsFiles) > 0)
-        {
-            $aCodes[] = $this->render('includes.js', ['aUrls' => $this->aCodeJsFiles]);
-        }
-        if(count($this->aCodeJsAfter) > 0)
-        {
-            $sScript = implode("\n\n", $this->aCodeJsAfter);
-            $aCodes[] = $this->render('wrapper.js', ['sScript' => $sScript]);
-        }
-        return $aCodes;
-    }
-
-    /**
+private function renderCodes(bool $bIncludeJs, bool $bIncludeCss): array
+{
+$aCodes = [];
+if($bIncludeCss)
+{
+$aCodes[] = $this->getCss();
+}
+if($bIncludeJs)
+{
+$aCodes[] = $this->getJs();
+}
+
+$sUrl = !$this->xAssetManager->shallCreateJsFiles() ? '' :
+$this->xAssetManager->createJsFiles($this);
+// Wrap the js code into the corresponding HTML tag.
+$aCodes[] = $sUrl !== '' ?
+$this->render('include.js', ['sUrl' => $sUrl]) :
+$this->render('wrapper.js', ['sScript' => $this->getJsScript()]);
+
+// Wrap the js codes into HTML tags.
+if(count($this->aCodeJsBefore) > 0)
+{
+$sScript = implode("\n\n", $this->aCodeJsBefore);
+$aCodes[] = $this->render('wrapper.js', ['sScript' => $sScript]);
+}
+if(count($this->aCodeJs) > 0)
+{
+$sScript = implode("\n\n", $this->aCodeJs);
+$aCodes[] = $this->render('wrapper.js', ['sScript' => $sScript]);
+}
+if(count($this->aCodeJsFiles) > 0)
+{
+$aCodes[] = $this->render('includes.js', ['aUrls' => $this->aCodeJsFiles]);
+}
+if(count($this->aCodeJsAfter) > 0)
+{
+$sScript = implode("\n\n", $this->aCodeJsAfter);
+$aCodes[] = $this->render('wrapper.js', ['sScript' => $sScript]);
+}
+return $aCodes;
+}
+
+/**
      * Get the javascript code to be sent to the browser
      *
      * @param bool $bIncludeJs Also get the JS files
@@ -334,10 +334,10 @@ 
      * @return string
      * @throws UriException
      */
-    public function getScript(bool $bIncludeJs, bool $bIncludeCss): string
-    {
-        $this->generateCodes();
-        $aCodes = $this->renderCodes($bIncludeJs, $bIncludeCss);
-        return implode("\n\n", $aCodes);
-    }
+public function getScript(bool $bIncludeJs, bool $bIncludeCss): string
+{
+$this->generateCodes();
+$aCodes = $this->renderCodes($bIncludeJs, $bIncludeCss);
+return implode("\n\n", $aCodes);
+}
 }

Spacing +20 added lines, -22 removed lines

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

jaxon-core/templates/callables/objects.js.php

Spacing +1 added lines, -1 removed lines

@@ -2,7 +2,7 @@
   rc: (name, method, parameters, options = {}) => jaxon.request({ type: 'class', name, method }, { parameters, ...options}),

   rf: (name, parameters, options = {}) => jaxon.request({ type: 'func', name }, { parameters, ...options}),

 <?php

-foreach($this->aCallableNames as $nIndex => $sName):

+foreach ($this->aCallableNames as $nIndex => $sName):

   echo "  c$nIndex: '$sName',\n";

 endforeach

 ?>

jaxon-core/templates/plugins/config.js.php

Spacing +6 added lines, -6 removed lines

@@ -6,24 +6,24 @@
 jaxon.config.defaultMethod = '<?php echo $this->sDefaultMethod ?>';
 jaxon.config.responseType = '<?php echo $this->sResponseType ?>';
 
-<?php if($this->nResponseQueueSize > 0): ?>
+<?php if ($this->nResponseQueueSize > 0): ?>
 jaxon.config.responseQueueSize = <?php echo $this->nResponseQueueSize ?>;
 <?php endif ?>
 
-<?php if($this->bLoggingEnabled): ?>
+<?php if ($this->bLoggingEnabled): ?>
 jaxon.debug.logger = '<?php echo Jaxon\rq(Jaxon\App\Component\Logger::class)->_class() ?>';
 <?php endif ?>
 
-<?php if($this->bDebug): ?>
+<?php if ($this->bDebug): ?>
 jaxon.debug.active = true;
-<?php if($this->sDebugOutputID): ?>
+<?php if ($this->sDebugOutputID): ?>
 jaxon.debug.outputID = '<?php echo $this->sDebugOutputID ?>';
 <?php endif ?>
-<?php if($this->bVerboseDebug): ?>
+<?php if ($this->bVerboseDebug): ?>
 jaxon.debug.verbose.active = true;
 <?php endif ?>
 <?php endif ?>
 
-<?php if($this->sCsrfMetaName): ?>
+<?php if ($this->sCsrfMetaName): ?>
 jaxon.setCsrf('<?php echo $this->sCsrfMetaName ?>');
 <?php endif ?>

jaxon-upload/tests/TestUpload/UploadHandlerTest.php

Switch Indentation +551 added lines, -551 removed lines

@@ -21,605 +21,605 @@
 
 class UploadHandlerTest extends TestCase
 {
-    /**
+/**
      * @var string
      */
-    protected $sNameWhite;
+protected $sNameWhite;
 
-    /**
+/**
      * @var string
      */
-    protected $sPathWhite;
+protected $sPathWhite;
 
-    /**
+/**
      * @var int
      */
-    protected $sSizeWhite;
+protected $sSizeWhite;
 
-    /**
+/**
      * @var string
      */
-    protected $sNameBlue;
+protected $sNameBlue;
 
-    /**
+/**
      * @var string
      */
-    protected $sPathBlue;
+protected $sPathBlue;
 
-    /**
+/**
      * @var int
      */
-    protected $sSizeBlue;
+protected $sSizeBlue;
 
-    /**
+/**
      * @throws SetupException
      */
-    public function setUp(): void
-    {
-        jaxon()->di()->getPluginManager()->registerPlugins();
-        _register();
-        jaxon()->setOption('core.upload.enabled', true);
-        jaxon()->setOption('core.response.send', false);
-
-        $tmpDir = __DIR__ . '/../upload/tmp';
-        @mkdir($tmpDir);
-
-        $sSrcWhite = __DIR__ . '/../upload/src/white.png';
-        $this->sNameWhite = 'white.png';
-        $this->sPathWhite = "$tmpDir/{$this->sNameWhite}";
-        $this->sSizeWhite = filesize($sSrcWhite);
-        // Copy the file to the temp dir.
-        @copy($sSrcWhite, $this->sPathWhite);
-
-        $sSrcBlue = __DIR__ . '/../upload/src/blue.png';
-        $this->sNameBlue = 'blue.png';
-        $this->sPathBlue = "$tmpDir/{$this->sNameBlue}";
-        $this->sSizeBlue = filesize($sSrcBlue);
-        // Copy the file to the temp dir.
-        @copy($sSrcBlue, $this->sPathBlue);
-
-        jaxon()->register(Jaxon::CALLABLE_CLASS, 'SampleUpload', __DIR__ . '/../src/sample.php');
-        jaxon()->di()->getBootstrap()->onBoot();
-    }
-
-    /**
+public function setUp(): void
+{
+jaxon()->di()->getPluginManager()->registerPlugins();
+_register();
+jaxon()->setOption('core.upload.enabled', true);
+jaxon()->setOption('core.response.send', false);
+
+$tmpDir = __DIR__ . '/../upload/tmp';
+@mkdir($tmpDir);
+
+$sSrcWhite = __DIR__ . '/../upload/src/white.png';
+$this->sNameWhite = 'white.png';
+$this->sPathWhite = "$tmpDir/{$this->sNameWhite}";
+$this->sSizeWhite = filesize($sSrcWhite);
+// Copy the file to the temp dir.
+@copy($sSrcWhite, $this->sPathWhite);
+
+$sSrcBlue = __DIR__ . '/../upload/src/blue.png';
+$this->sNameBlue = 'blue.png';
+$this->sPathBlue = "$tmpDir/{$this->sNameBlue}";
+$this->sSizeBlue = filesize($sSrcBlue);
+// Copy the file to the temp dir.
+@copy($sSrcBlue, $this->sPathBlue);
+
+jaxon()->register(Jaxon::CALLABLE_CLASS, 'SampleUpload', __DIR__ . '/../src/sample.php');
+jaxon()->di()->getBootstrap()->onBoot();
+}
+
+/**
      * @throws SetupException
      */
-    public function tearDown(): void
-    {
-        jaxon()->reset();
-        parent::tearDown();
-    }
+public function tearDown(): void
+{
+jaxon()->reset();
+parent::tearDown();
+}
 
-    /**
+/**
      * @throws RequestException
      */
-    public function testAjaxUpload()
-    {
-        jaxon()->setOption('upload.default.dir', __DIR__ . '/../upload/dst');
-        // Send a request to the registered class
-        jaxon()->di()->set(ServerRequestInterface::class, function($c) {
-            return $c->g(ServerRequestCreator::class)
-                ->fromGlobals()
-                ->withParsedBody([
-                    'jxncall' => json_encode([
-                        'type' => 'class',
-                        'name' => 'SampleUpload',
-                        'method' => 'myMethod',
-                        'args' => [],
-                    ]),
-                ])
-                ->withUploadedFiles([
-                    'image' => new UploadedFile($this->sPathWhite, $this->sSizeWhite,
-                        UPLOAD_ERR_OK, $this->sNameWhite, 'png'),
-                ])
-                ->withMethod('POST');
-        });
-
-        $this->assertTrue(jaxon()->di()->getRequestHandler()->canProcessRequest());
-        $this->assertTrue(jaxon()->di()->getUploadHandler()->canProcessRequest(jaxon()->di()->getRequest()));
-        jaxon()->processRequest();
-
-        // Uploaded files
-        $aFiles = jaxon()->upload()->files();
-        $this->assertCount(1, $aFiles);
-        $this->assertCount(1, $aFiles['image']);
-        $xFile = $aFiles['image'][0];
-        $this->assertEquals('white', $xFile->name());
-        $this->assertEquals($this->sNameWhite, $xFile->filename());
-        $this->assertEquals('png', $xFile->type());
-        $this->assertEquals('png', $xFile->extension());
-    }
-
-    /**
+public function testAjaxUpload()
+{
+jaxon()->setOption('upload.default.dir', __DIR__ . '/../upload/dst');
+// Send a request to the registered class
+jaxon()->di()->set(ServerRequestInterface::class, function($c) {
+return $c->g(ServerRequestCreator::class)
+    ->fromGlobals()
+    ->withParsedBody([
+        'jxncall' => json_encode([
+            'type' => 'class',
+            'name' => 'SampleUpload',
+            'method' => 'myMethod',
+            'args' => [],
+        ]),
+    ])
+    ->withUploadedFiles([
+        'image' => new UploadedFile($this->sPathWhite, $this->sSizeWhite,
+            UPLOAD_ERR_OK, $this->sNameWhite, 'png'),
+    ])
+    ->withMethod('POST');
+});
+
+$this->assertTrue(jaxon()->di()->getRequestHandler()->canProcessRequest());
+$this->assertTrue(jaxon()->di()->getUploadHandler()->canProcessRequest(jaxon()->di()->getRequest()));
+jaxon()->processRequest();
+
+// Uploaded files
+$aFiles = jaxon()->upload()->files();
+$this->assertCount(1, $aFiles);
+$this->assertCount(1, $aFiles['image']);
+$xFile = $aFiles['image'][0];
+$this->assertEquals('white', $xFile->name());
+$this->assertEquals($this->sNameWhite, $xFile->filename());
+$this->assertEquals('png', $xFile->type());
+$this->assertEquals('png', $xFile->extension());
+}
+
+/**
      * @throws RequestException
      */
-    public function testAjaxUploadMultipleFiles()
-    {
-        jaxon()->setOption('upload.default.dir', __DIR__ . '/../upload/dst');
-        // Send a request to the registered class
-        jaxon()->di()->set(ServerRequestInterface::class, function($c) {
-            return $c->g(ServerRequestCreator::class)
-                ->fromGlobals()
-                ->withParsedBody([
-                    'jxncall' => json_encode([
-                        'type' => 'class',
-                        'name' => 'SampleUpload',
-                        'method' => 'myMethod',
-                        'args' => [],
-                    ]),
-                ])
-                ->withUploadedFiles([
-                    'image' => [
-                        new UploadedFile($this->sPathWhite, $this->sSizeWhite,
-                            UPLOAD_ERR_OK, $this->sNameWhite, 'png'),
-                        new UploadedFile($this->sPathBlue, $this->sSizeBlue,
-                            UPLOAD_ERR_OK, $this->sNameBlue, 'png'),
-                    ],
-                ])
-                ->withMethod('POST');
-        });
-
-        $this->assertTrue(jaxon()->di()->getRequestHandler()->canProcessRequest());
-        $this->assertTrue(jaxon()->di()->getUploadHandler()->canProcessRequest(jaxon()->di()->getRequest()));
-        jaxon()->processRequest();
-
-        // Uploaded files
-        $aFiles = jaxon()->upload()->files();
-        $this->assertCount(1, $aFiles);
-        $this->assertCount(2, $aFiles['image']);
-        $xFile = $aFiles['image'][0];
-        $this->assertEquals('white', $xFile->name());
-        $this->assertEquals($this->sNameWhite, $xFile->filename());
-        $this->assertEquals('png', $xFile->type());
-        $this->assertEquals('png', $xFile->extension());
-        $xFile = $aFiles['image'][1];
-        $this->assertEquals('blue', $xFile->name());
-        $this->assertEquals($this->sNameBlue, $xFile->filename());
-        $this->assertEquals('png', $xFile->type());
-        $this->assertEquals('png', $xFile->extension());
-    }
-
-    /**
+public function testAjaxUploadMultipleFiles()
+{
+jaxon()->setOption('upload.default.dir', __DIR__ . '/../upload/dst');
+// Send a request to the registered class
+jaxon()->di()->set(ServerRequestInterface::class, function($c) {
+return $c->g(ServerRequestCreator::class)
+    ->fromGlobals()
+    ->withParsedBody([
+        'jxncall' => json_encode([
+            'type' => 'class',
+            'name' => 'SampleUpload',
+            'method' => 'myMethod',
+            'args' => [],
+        ]),
+    ])
+    ->withUploadedFiles([
+        'image' => [
+            new UploadedFile($this->sPathWhite, $this->sSizeWhite,
+                UPLOAD_ERR_OK, $this->sNameWhite, 'png'),
+            new UploadedFile($this->sPathBlue, $this->sSizeBlue,
+                UPLOAD_ERR_OK, $this->sNameBlue, 'png'),
+        ],
+    ])
+    ->withMethod('POST');
+});
+
+$this->assertTrue(jaxon()->di()->getRequestHandler()->canProcessRequest());
+$this->assertTrue(jaxon()->di()->getUploadHandler()->canProcessRequest(jaxon()->di()->getRequest()));
+jaxon()->processRequest();
+
+// Uploaded files
+$aFiles = jaxon()->upload()->files();
+$this->assertCount(1, $aFiles);
+$this->assertCount(2, $aFiles['image']);
+$xFile = $aFiles['image'][0];
+$this->assertEquals('white', $xFile->name());
+$this->assertEquals($this->sNameWhite, $xFile->filename());
+$this->assertEquals('png', $xFile->type());
+$this->assertEquals('png', $xFile->extension());
+$xFile = $aFiles['image'][1];
+$this->assertEquals('blue', $xFile->name());
+$this->assertEquals($this->sNameBlue, $xFile->filename());
+$this->assertEquals('png', $xFile->type());
+$this->assertEquals('png', $xFile->extension());
+}
+
+/**
      * @throws RequestException
      */
-    public function testAjaxUploadMultipleNames()
-    {
-        jaxon()->setOption('upload.default.dir', __DIR__ . '/../upload/dst');
-        // Send a request to the registered class
-        jaxon()->di()->set(ServerRequestInterface::class, function($c) {
-            return $c->g(ServerRequestCreator::class)
-                ->fromGlobals()
-                ->withParsedBody([
-                    'jxncall' => json_encode([
-                        'type' => 'class',
-                        'name' => 'SampleUpload',
-                        'method' => 'myMethod',
-                        'args' => [],
-                    ]),
-                ])
-                ->withUploadedFiles([
-                    'white' => [
-                        new UploadedFile($this->sPathWhite, $this->sSizeWhite,
-                            UPLOAD_ERR_OK, $this->sNameWhite, 'png'),
-                    ],
-                    'blue' => [
-                        new UploadedFile($this->sPathBlue, $this->sSizeBlue,
-                            UPLOAD_ERR_OK, $this->sNameBlue, 'png'),
-                    ],
-                ])
-                ->withMethod('POST');
-        });
-
-        $this->assertTrue(jaxon()->di()->getRequestHandler()->canProcessRequest());
-        $this->assertTrue(jaxon()->di()->getUploadHandler()->canProcessRequest(jaxon()->di()->getRequest()));
-        jaxon()->processRequest();
-
-        // Uploaded files
-        $aFiles = jaxon()->upload()->files();
-        $this->assertCount(2, $aFiles);
-        $this->assertCount(1, $aFiles['white']);
-        $this->assertCount(1, $aFiles['blue']);
-        $xFile = $aFiles['white'][0];
-        $this->assertEquals('white', $xFile->name());
-        $this->assertEquals($this->sNameWhite, $xFile->filename());
-        $this->assertEquals('png', $xFile->type());
-        $this->assertEquals('png', $xFile->extension());
-        $xFile = $aFiles['blue'][0];
-        $this->assertEquals('blue', $xFile->name());
-        $this->assertEquals($this->sNameBlue, $xFile->filename());
-        $this->assertEquals('png', $xFile->type());
-        $this->assertEquals('png', $xFile->extension());
-    }
-
-    /**
+public function testAjaxUploadMultipleNames()
+{
+jaxon()->setOption('upload.default.dir', __DIR__ . '/../upload/dst');
+// Send a request to the registered class
+jaxon()->di()->set(ServerRequestInterface::class, function($c) {
+return $c->g(ServerRequestCreator::class)
+    ->fromGlobals()
+    ->withParsedBody([
+        'jxncall' => json_encode([
+            'type' => 'class',
+            'name' => 'SampleUpload',
+            'method' => 'myMethod',
+            'args' => [],
+        ]),
+    ])
+    ->withUploadedFiles([
+        'white' => [
+            new UploadedFile($this->sPathWhite, $this->sSizeWhite,
+                UPLOAD_ERR_OK, $this->sNameWhite, 'png'),
+        ],
+        'blue' => [
+            new UploadedFile($this->sPathBlue, $this->sSizeBlue,
+                UPLOAD_ERR_OK, $this->sNameBlue, 'png'),
+        ],
+    ])
+    ->withMethod('POST');
+});
+
+$this->assertTrue(jaxon()->di()->getRequestHandler()->canProcessRequest());
+$this->assertTrue(jaxon()->di()->getUploadHandler()->canProcessRequest(jaxon()->di()->getRequest()));
+jaxon()->processRequest();
+
+// Uploaded files
+$aFiles = jaxon()->upload()->files();
+$this->assertCount(2, $aFiles);
+$this->assertCount(1, $aFiles['white']);
+$this->assertCount(1, $aFiles['blue']);
+$xFile = $aFiles['white'][0];
+$this->assertEquals('white', $xFile->name());
+$this->assertEquals($this->sNameWhite, $xFile->filename());
+$this->assertEquals('png', $xFile->type());
+$this->assertEquals('png', $xFile->extension());
+$xFile = $aFiles['blue'][0];
+$this->assertEquals('blue', $xFile->name());
+$this->assertEquals($this->sNameBlue, $xFile->filename());
+$this->assertEquals('png', $xFile->type());
+$this->assertEquals('png', $xFile->extension());
+}
+
+/**
      * @throws RequestException
      */
-    public function testAjaxUploadNameSanitizer()
-    {
-        jaxon()->setOption('upload.default.dir', __DIR__ . '/../upload/dst');
-        jaxon()->upload()->sanitizer(function($sFilename, $sVarName) {
-            return $sVarName === 'image' ? 'img_' . $sFilename : $sFilename;
-        });
-        // Send a request to the registered class
-        jaxon()->di()->set(ServerRequestInterface::class, function($c) {
-            return $c->g(ServerRequestCreator::class)
-                ->fromGlobals()
-                ->withParsedBody([
-                    'jxncall' => json_encode([
-                        'type' => 'class',
-                        'name' => 'SampleUpload',
-                        'method' => 'myMethod',
-                        'args' => [],
-                    ]),
-                ])
-                ->withUploadedFiles([
-                    'image' => new UploadedFile($this->sPathWhite, $this->sSizeWhite,
-                        UPLOAD_ERR_OK, $this->sNameWhite, 'png'),
-                ])
-                ->withMethod('POST');
-        });
-
-        $this->assertTrue(jaxon()->di()->getRequestHandler()->canProcessRequest());
-        $this->assertTrue(jaxon()->di()->getUploadHandler()->canProcessRequest(jaxon()->di()->getRequest()));
-        jaxon()->processRequest();
-
-        // Uploaded files
-        $aFiles = jaxon()->upload()->files();
-        $this->assertCount(1, $aFiles);
-        $this->assertCount(1, $aFiles['image']);
-        $xFile = $aFiles['image'][0];
-        $this->assertEquals('img_white', $xFile->name());
-        $this->assertEquals('png', $xFile->type());
-        $this->assertEquals('png', $xFile->extension());
-        $this->assertEquals($this->sNameWhite, $xFile->filename());
-    }
-
-    /**
+public function testAjaxUploadNameSanitizer()
+{
+jaxon()->setOption('upload.default.dir', __DIR__ . '/../upload/dst');
+jaxon()->upload()->sanitizer(function($sFilename, $sVarName) {
+return $sVarName === 'image' ? 'img_' . $sFilename : $sFilename;
+});
+// Send a request to the registered class
+jaxon()->di()->set(ServerRequestInterface::class, function($c) {
+return $c->g(ServerRequestCreator::class)
+    ->fromGlobals()
+    ->withParsedBody([
+        'jxncall' => json_encode([
+            'type' => 'class',
+            'name' => 'SampleUpload',
+            'method' => 'myMethod',
+            'args' => [],
+        ]),
+    ])
+    ->withUploadedFiles([
+        'image' => new UploadedFile($this->sPathWhite, $this->sSizeWhite,
+            UPLOAD_ERR_OK, $this->sNameWhite, 'png'),
+    ])
+    ->withMethod('POST');
+});
+
+$this->assertTrue(jaxon()->di()->getRequestHandler()->canProcessRequest());
+$this->assertTrue(jaxon()->di()->getUploadHandler()->canProcessRequest(jaxon()->di()->getRequest()));
+jaxon()->processRequest();
+
+// Uploaded files
+$aFiles = jaxon()->upload()->files();
+$this->assertCount(1, $aFiles);
+$this->assertCount(1, $aFiles['image']);
+$xFile = $aFiles['image'][0];
+$this->assertEquals('img_white', $xFile->name());
+$this->assertEquals('png', $xFile->type());
+$this->assertEquals('png', $xFile->extension());
+$this->assertEquals($this->sNameWhite, $xFile->filename());
+}
+
+/**
      * @throws RequestException
      */
-    public function testUploadFileTypeValidationOk()
-    {
-        jaxon()->setOption('upload.default.dir', __DIR__ . '/../upload/dst');
-        jaxon()->setOption('upload.default.types', ['png']);
-        // Send a request to the registered class
-        jaxon()->di()->set(ServerRequestInterface::class, function($c) {
-            return $c->g(ServerRequestCreator::class)
-                ->fromGlobals()
-                ->withParsedBody([
-                    'jxncall' => json_encode([
-                        'type' => 'class',
-                        'name' => 'SampleUpload',
-                        'method' => 'myMethod',
-                        'args' => [],
-                    ]),
-                ])
-                ->withUploadedFiles([
-                    'image' => new UploadedFile($this->sPathWhite, $this->sSizeWhite,
-                        UPLOAD_ERR_OK, $this->sNameWhite, 'png'),
-                ])
-                ->withMethod('POST');
-        });
-
-        $this->assertTrue(jaxon()->di()->getRequestHandler()->canProcessRequest());
-        $this->assertTrue(jaxon()->di()->getUploadHandler()->canProcessRequest(jaxon()->di()->getRequest()));
-        jaxon()->processRequest();
-
-        // Return the file name for the next test
-        $aFiles = jaxon()->upload()->files();
-        $this->assertCount(1, $aFiles);
-        $this->assertCount(1, $aFiles['image']);
-        $xFile = $aFiles['image'][0];
-        $this->assertEquals('white', $xFile->name());
-        $this->assertEquals($this->sNameWhite, $xFile->filename());
-    }
-
-    /**
+public function testUploadFileTypeValidationOk()
+{
+jaxon()->setOption('upload.default.dir', __DIR__ . '/../upload/dst');
+jaxon()->setOption('upload.default.types', ['png']);
+// Send a request to the registered class
+jaxon()->di()->set(ServerRequestInterface::class, function($c) {
+return $c->g(ServerRequestCreator::class)
+    ->fromGlobals()
+    ->withParsedBody([
+        'jxncall' => json_encode([
+            'type' => 'class',
+            'name' => 'SampleUpload',
+            'method' => 'myMethod',
+            'args' => [],
+        ]),
+    ])
+    ->withUploadedFiles([
+        'image' => new UploadedFile($this->sPathWhite, $this->sSizeWhite,
+            UPLOAD_ERR_OK, $this->sNameWhite, 'png'),
+    ])
+    ->withMethod('POST');
+});
+
+$this->assertTrue(jaxon()->di()->getRequestHandler()->canProcessRequest());
+$this->assertTrue(jaxon()->di()->getUploadHandler()->canProcessRequest(jaxon()->di()->getRequest()));
+jaxon()->processRequest();
+
+// Return the file name for the next test
+$aFiles = jaxon()->upload()->files();
+$this->assertCount(1, $aFiles);
+$this->assertCount(1, $aFiles['image']);
+$xFile = $aFiles['image'][0];
+$this->assertEquals('white', $xFile->name());
+$this->assertEquals($this->sNameWhite, $xFile->filename());
+}
+
+/**
      * @throws RequestException
      */
-    public function testUploadFileTypeValidationError()
-    {
-        jaxon()->setOption('upload.default.dir', __DIR__ . '/../upload/dst');
-        jaxon()->setOption('upload.default.types', ['jpg']);
-        // Send a request to the registered class
-        jaxon()->di()->set(ServerRequestInterface::class, function($c) {
-            return $c->g(ServerRequestCreator::class)
-                ->fromGlobals()
-                ->withParsedBody([
-                    'jxncall' => json_encode([
-                        'type' => 'class',
-                        'name' => 'SampleUpload',
-                        'method' => 'myMethod',
-                        'args' => [],
-                    ]),
-                ])
-                ->withUploadedFiles([
-                    'image' => new UploadedFile($this->sPathWhite, $this->sSizeWhite,
-                        UPLOAD_ERR_OK, $this->sNameWhite, 'png'),
-                ])
-                ->withMethod('POST');
-        });
-
-        $this->assertTrue(jaxon()->di()->getRequestHandler()->canProcessRequest());
-        $this->assertTrue(jaxon()->di()->getUploadHandler()->canProcessRequest(jaxon()->di()->getRequest()));
-        $this->expectException(RequestException::class);
-        jaxon()->processRequest();
-    }
-
-    /**
+public function testUploadFileTypeValidationError()
+{
+jaxon()->setOption('upload.default.dir', __DIR__ . '/../upload/dst');
+jaxon()->setOption('upload.default.types', ['jpg']);
+// Send a request to the registered class
+jaxon()->di()->set(ServerRequestInterface::class, function($c) {
+return $c->g(ServerRequestCreator::class)
+    ->fromGlobals()
+    ->withParsedBody([
+        'jxncall' => json_encode([
+            'type' => 'class',
+            'name' => 'SampleUpload',
+            'method' => 'myMethod',
+            'args' => [],
+        ]),
+    ])
+    ->withUploadedFiles([
+        'image' => new UploadedFile($this->sPathWhite, $this->sSizeWhite,
+            UPLOAD_ERR_OK, $this->sNameWhite, 'png'),
+    ])
+    ->withMethod('POST');
+});
+
+$this->assertTrue(jaxon()->di()->getRequestHandler()->canProcessRequest());
+$this->assertTrue(jaxon()->di()->getUploadHandler()->canProcessRequest(jaxon()->di()->getRequest()));
+$this->expectException(RequestException::class);
+jaxon()->processRequest();
+}
+
+/**
      * @throws RequestException
      */
-    public function testUploadFileExtensionValidationOk()
-    {
-        jaxon()->setOption('upload.default.dir', __DIR__ . '/../upload/dst');
-        jaxon()->setOption('upload.default.extensions', ['png']);
-        // Send a request to the registered class
-        jaxon()->di()->set(ServerRequestInterface::class, function($c) {
-            return $c->g(ServerRequestCreator::class)
-                ->fromGlobals()
-                ->withParsedBody([
-                    'jxncall' => json_encode([
-                        'type' => 'class',
-                        'name' => 'SampleUpload',
-                        'method' => 'myMethod',
-                        'args' => [],
-                    ]),
-                ])
-                ->withUploadedFiles([
-                    'image' => new UploadedFile($this->sPathWhite, $this->sSizeWhite,
-                        UPLOAD_ERR_OK, $this->sNameWhite, 'png'),
-                ])
-                ->withMethod('POST');
-        });
-
-        $this->assertTrue(jaxon()->di()->getRequestHandler()->canProcessRequest());
-        $this->assertTrue(jaxon()->di()->getUploadHandler()->canProcessRequest(jaxon()->di()->getRequest()));
-        jaxon()->processRequest();
-
-        // Return the file name for the next test
-        $aFiles = jaxon()->upload()->files();
-        $this->assertCount(1, $aFiles);
-        $this->assertCount(1, $aFiles['image']);
-        $xFile = $aFiles['image'][0];
-        $this->assertEquals('white', $xFile->name());
-        $this->assertEquals($this->sNameWhite, $xFile->filename());
-    }
-
-    /**
+public function testUploadFileExtensionValidationOk()
+{
+jaxon()->setOption('upload.default.dir', __DIR__ . '/../upload/dst');
+jaxon()->setOption('upload.default.extensions', ['png']);
+// Send a request to the registered class
+jaxon()->di()->set(ServerRequestInterface::class, function($c) {
+return $c->g(ServerRequestCreator::class)
+    ->fromGlobals()
+    ->withParsedBody([
+        'jxncall' => json_encode([
+            'type' => 'class',
+            'name' => 'SampleUpload',
+            'method' => 'myMethod',
+            'args' => [],
+        ]),
+    ])
+    ->withUploadedFiles([
+        'image' => new UploadedFile($this->sPathWhite, $this->sSizeWhite,
+            UPLOAD_ERR_OK, $this->sNameWhite, 'png'),
+    ])
+    ->withMethod('POST');
+});
+
+$this->assertTrue(jaxon()->di()->getRequestHandler()->canProcessRequest());
+$this->assertTrue(jaxon()->di()->getUploadHandler()->canProcessRequest(jaxon()->di()->getRequest()));
+jaxon()->processRequest();
+
+// Return the file name for the next test
+$aFiles = jaxon()->upload()->files();
+$this->assertCount(1, $aFiles);
+$this->assertCount(1, $aFiles['image']);
+$xFile = $aFiles['image'][0];
+$this->assertEquals('white', $xFile->name());
+$this->assertEquals($this->sNameWhite, $xFile->filename());
+}
+
+/**
      * @throws RequestException
      */
-    public function testUploadFileExtensionValidationError()
-    {
-        jaxon()->setOption('upload.default.dir', __DIR__ . '/../upload/dst');
-        jaxon()->setOption('upload.default.extensions', ['jpg']);
-        // Send a request to the registered class
-        jaxon()->di()->set(ServerRequestInterface::class, function($c) {
-            return $c->g(ServerRequestCreator::class)
-                ->fromGlobals()
-                ->withParsedBody([
-                    'jxncall' => json_encode([
-                        'type' => 'class',
-                        'name' => 'SampleUpload',
-                        'method' => 'myMethod',
-                        'args' => [],
-                    ]),
-                ])
-                ->withUploadedFiles([
-                    'image' => new UploadedFile($this->sPathWhite, $this->sSizeWhite,
-                        UPLOAD_ERR_OK, $this->sNameWhite, 'png'),
-                ])
-                ->withMethod('POST');
-        });
-
-        $this->assertTrue(jaxon()->di()->getRequestHandler()->canProcessRequest());
-        $this->assertTrue(jaxon()->di()->getUploadHandler()->canProcessRequest(jaxon()->di()->getRequest()));
-        $this->expectException(RequestException::class);
-        jaxon()->processRequest();
-    }
-
-    /**
+public function testUploadFileExtensionValidationError()
+{
+jaxon()->setOption('upload.default.dir', __DIR__ . '/../upload/dst');
+jaxon()->setOption('upload.default.extensions', ['jpg']);
+// Send a request to the registered class
+jaxon()->di()->set(ServerRequestInterface::class, function($c) {
+return $c->g(ServerRequestCreator::class)
+    ->fromGlobals()
+    ->withParsedBody([
+        'jxncall' => json_encode([
+            'type' => 'class',
+            'name' => 'SampleUpload',
+            'method' => 'myMethod',
+            'args' => [],
+        ]),
+    ])
+    ->withUploadedFiles([
+        'image' => new UploadedFile($this->sPathWhite, $this->sSizeWhite,
+            UPLOAD_ERR_OK, $this->sNameWhite, 'png'),
+    ])
+    ->withMethod('POST');
+});
+
+$this->assertTrue(jaxon()->di()->getRequestHandler()->canProcessRequest());
+$this->assertTrue(jaxon()->di()->getUploadHandler()->canProcessRequest(jaxon()->di()->getRequest()));
+$this->expectException(RequestException::class);
+jaxon()->processRequest();
+}
+
+/**
      * @throws RequestException
      */
-    public function testUploadFileMaxSizeValidationOk()
-    {
-        jaxon()->setOption('upload.default.dir', __DIR__ . '/../upload/dst');
-        jaxon()->setOption('upload.default.max-size', 30000);
-        // Send a request to the registered class
-        jaxon()->di()->set(ServerRequestInterface::class, function($c) {
-            return $c->g(ServerRequestCreator::class)
-                ->fromGlobals()
-                ->withParsedBody([
-                    'jxncall' => json_encode([
-                        'type' => 'class',
-                        'name' => 'SampleUpload',
-                        'method' => 'myMethod',
-                        'args' => [],
-                    ]),
-                ])
-                ->withUploadedFiles([
-                    'image' => new UploadedFile($this->sPathWhite, $this->sSizeWhite,
-                        UPLOAD_ERR_OK, $this->sNameWhite, 'png'),
-                ])
-                ->withMethod('POST');
-        });
-
-        $this->assertTrue(jaxon()->di()->getRequestHandler()->canProcessRequest());
-        $this->assertTrue(jaxon()->di()->getUploadHandler()->canProcessRequest(jaxon()->di()->getRequest()));
-        jaxon()->processRequest();
-
-        // Return the file name for the next test
-        $aFiles = jaxon()->upload()->files();
-        $this->assertCount(1, $aFiles);
-        $this->assertCount(1, $aFiles['image']);
-        $xFile = $aFiles['image'][0];
-        $this->assertEquals('white', $xFile->name());
-        $this->assertEquals($this->sNameWhite, $xFile->filename());
-    }
-
-    /**
+public function testUploadFileMaxSizeValidationOk()
+{
+jaxon()->setOption('upload.default.dir', __DIR__ . '/../upload/dst');
+jaxon()->setOption('upload.default.max-size', 30000);
+// Send a request to the registered class
+jaxon()->di()->set(ServerRequestInterface::class, function($c) {
+return $c->g(ServerRequestCreator::class)
+    ->fromGlobals()
+    ->withParsedBody([
+        'jxncall' => json_encode([
+            'type' => 'class',
+            'name' => 'SampleUpload',
+            'method' => 'myMethod',
+            'args' => [],
+        ]),
+    ])
+    ->withUploadedFiles([
+        'image' => new UploadedFile($this->sPathWhite, $this->sSizeWhite,
+            UPLOAD_ERR_OK, $this->sNameWhite, 'png'),
+    ])
+    ->withMethod('POST');
+});
+
+$this->assertTrue(jaxon()->di()->getRequestHandler()->canProcessRequest());
+$this->assertTrue(jaxon()->di()->getUploadHandler()->canProcessRequest(jaxon()->di()->getRequest()));
+jaxon()->processRequest();
+
+// Return the file name for the next test
+$aFiles = jaxon()->upload()->files();
+$this->assertCount(1, $aFiles);
+$this->assertCount(1, $aFiles['image']);
+$xFile = $aFiles['image'][0];
+$this->assertEquals('white', $xFile->name());
+$this->assertEquals($this->sNameWhite, $xFile->filename());
+}
+
+/**
      * @throws RequestException
      */
-    public function testUploadFileMaxSizeValidationError()
-    {
-        jaxon()->setOption('upload.default.dir', __DIR__ . '/../upload/dst');
-        jaxon()->setOption('upload.default.max-size', 25000);
-        // Send a request to the registered class
-        jaxon()->di()->set(ServerRequestInterface::class, function($c) {
-            return $c->g(ServerRequestCreator::class)
-                ->fromGlobals()
-                ->withParsedBody([
-                    'jxncall' => json_encode([
-                        'type' => 'class',
-                        'name' => 'SampleUpload',
-                        'method' => 'myMethod',
-                        'args' => [],
-                    ]),
-                ])
-                ->withUploadedFiles([
-                    'image' => new UploadedFile($this->sPathWhite, $this->sSizeWhite,
-                        UPLOAD_ERR_OK, $this->sNameWhite, 'png'),
-                ])
-                ->withMethod('POST');
-        });
-
-        $this->assertTrue(jaxon()->di()->getRequestHandler()->canProcessRequest());
-        $this->assertTrue(jaxon()->di()->getUploadHandler()->canProcessRequest(jaxon()->di()->getRequest()));
-        $this->expectException(RequestException::class);
-        jaxon()->processRequest();
-    }
-
-    /**
+public function testUploadFileMaxSizeValidationError()
+{
+jaxon()->setOption('upload.default.dir', __DIR__ . '/../upload/dst');
+jaxon()->setOption('upload.default.max-size', 25000);
+// Send a request to the registered class
+jaxon()->di()->set(ServerRequestInterface::class, function($c) {
+return $c->g(ServerRequestCreator::class)
+    ->fromGlobals()
+    ->withParsedBody([
+        'jxncall' => json_encode([
+            'type' => 'class',
+            'name' => 'SampleUpload',
+            'method' => 'myMethod',
+            'args' => [],
+        ]),
+    ])
+    ->withUploadedFiles([
+        'image' => new UploadedFile($this->sPathWhite, $this->sSizeWhite,
+            UPLOAD_ERR_OK, $this->sNameWhite, 'png'),
+    ])
+    ->withMethod('POST');
+});
+
+$this->assertTrue(jaxon()->di()->getRequestHandler()->canProcessRequest());
+$this->assertTrue(jaxon()->di()->getUploadHandler()->canProcessRequest(jaxon()->di()->getRequest()));
+$this->expectException(RequestException::class);
+jaxon()->processRequest();
+}
+
+/**
      * @throws RequestException
      */
-    public function testUploadFileMinSizeValidationOk()
-    {
-        jaxon()->setOption('upload.default.dir', __DIR__ . '/../upload/dst');
-        jaxon()->setOption('upload.default.min-size', 25000);
-        // Send a request to the registered class
-        jaxon()->di()->set(ServerRequestInterface::class, function($c) {
-            return $c->g(ServerRequestCreator::class)
-                ->fromGlobals()
-                ->withParsedBody([
-                    'jxncall' => json_encode([
-                        'type' => 'class',
-                        'name' => 'SampleUpload',
-                        'method' => 'myMethod',
-                        'args' => [],
-                    ]),
-                ])
-                ->withUploadedFiles([
-                    'image' => new UploadedFile($this->sPathWhite, $this->sSizeWhite,
-                        UPLOAD_ERR_OK, $this->sNameWhite, 'png'),
-                ])
-                ->withMethod('POST');
-        });
-
-        $this->assertTrue(jaxon()->di()->getRequestHandler()->canProcessRequest());
-        $this->assertTrue(jaxon()->di()->getUploadHandler()->canProcessRequest(jaxon()->di()->getRequest()));
-        jaxon()->processRequest();
-
-        // Return the file name for the next test
-        $aFiles = jaxon()->upload()->files();
-        $this->assertCount(1, $aFiles);
-        $this->assertCount(1, $aFiles['image']);
-        $xFile = $aFiles['image'][0];
-        $this->assertEquals('white', $xFile->name());
-        $this->assertEquals($this->sNameWhite, $xFile->filename());
-    }
-
-    /**
+public function testUploadFileMinSizeValidationOk()
+{
+jaxon()->setOption('upload.default.dir', __DIR__ . '/../upload/dst');
+jaxon()->setOption('upload.default.min-size', 25000);
+// Send a request to the registered class
+jaxon()->di()->set(ServerRequestInterface::class, function($c) {
+return $c->g(ServerRequestCreator::class)
+    ->fromGlobals()
+    ->withParsedBody([
+        'jxncall' => json_encode([
+            'type' => 'class',
+            'name' => 'SampleUpload',
+            'method' => 'myMethod',
+            'args' => [],
+        ]),
+    ])
+    ->withUploadedFiles([
+        'image' => new UploadedFile($this->sPathWhite, $this->sSizeWhite,
+            UPLOAD_ERR_OK, $this->sNameWhite, 'png'),
+    ])
+    ->withMethod('POST');
+});
+
+$this->assertTrue(jaxon()->di()->getRequestHandler()->canProcessRequest());
+$this->assertTrue(jaxon()->di()->getUploadHandler()->canProcessRequest(jaxon()->di()->getRequest()));
+jaxon()->processRequest();
+
+// Return the file name for the next test
+$aFiles = jaxon()->upload()->files();
+$this->assertCount(1, $aFiles);
+$this->assertCount(1, $aFiles['image']);
+$xFile = $aFiles['image'][0];
+$this->assertEquals('white', $xFile->name());
+$this->assertEquals($this->sNameWhite, $xFile->filename());
+}
+
+/**
      * @throws RequestException
      */
-    public function testUploadFileMinSizeValidationError()
-    {
-        jaxon()->setOption('upload.default.dir', __DIR__ . '/../upload/dst');
-        jaxon()->setOption('upload.default.min-size', 30000);
-        // Send a request to the registered class
-        jaxon()->di()->set(ServerRequestInterface::class, function($c) {
-            return $c->g(ServerRequestCreator::class)
-                ->fromGlobals()
-                ->withParsedBody([
-                    'jxncall' => json_encode([
-                        'type' => 'class',
-                        'name' => 'SampleUpload',
-                        'method' => 'myMethod',
-                        'args' => [],
-                    ]),
-                ])
-                ->withUploadedFiles([
-                    'image' => new UploadedFile($this->sPathWhite, $this->sSizeWhite,
-                        UPLOAD_ERR_OK, $this->sNameWhite, 'png'),
-                ])
-                ->withMethod('POST');
-        });
-
-        $this->assertTrue(jaxon()->di()->getRequestHandler()->canProcessRequest());
-        $this->assertTrue(jaxon()->di()->getUploadHandler()->canProcessRequest(jaxon()->di()->getRequest()));
-        $this->expectException(RequestException::class);
-        jaxon()->processRequest();
-    }
-
-    /**
+public function testUploadFileMinSizeValidationError()
+{
+jaxon()->setOption('upload.default.dir', __DIR__ . '/../upload/dst');
+jaxon()->setOption('upload.default.min-size', 30000);
+// Send a request to the registered class
+jaxon()->di()->set(ServerRequestInterface::class, function($c) {
+return $c->g(ServerRequestCreator::class)
+    ->fromGlobals()
+    ->withParsedBody([
+        'jxncall' => json_encode([
+            'type' => 'class',
+            'name' => 'SampleUpload',
+            'method' => 'myMethod',
+            'args' => [],
+        ]),
+    ])
+    ->withUploadedFiles([
+        'image' => new UploadedFile($this->sPathWhite, $this->sSizeWhite,
+            UPLOAD_ERR_OK, $this->sNameWhite, 'png'),
+    ])
+    ->withMethod('POST');
+});
+
+$this->assertTrue(jaxon()->di()->getRequestHandler()->canProcessRequest());
+$this->assertTrue(jaxon()->di()->getUploadHandler()->canProcessRequest(jaxon()->di()->getRequest()));
+$this->expectException(RequestException::class);
+jaxon()->processRequest();
+}
+
+/**
      * @throws RequestException
      * @throws SetupException
      */
-    public function testPsrAjaxUpload()
-    {
-        _register();
-        jaxon()->setOption('core.upload.enabled', true);
-        jaxon()->setOption('upload.default.dir', __DIR__ . '/../upload/dst');
-        // Send a request to the registered class
-        $xRequest = jaxon()->di()->g(ServerRequestCreator::class)
-            ->fromGlobals()
-            ->withParsedBody([
-                'jxncall' => json_encode([
-                    'type' => 'class',
-                    'name' => 'SampleUpload',
-                    'method' => 'myMethod',
-                    'args' => [],
-                ]),
-            ])
-            ->withUploadedFiles([
-                'image' => new UploadedFile($this->sPathWhite, $this->sSizeWhite,
-                    UPLOAD_ERR_OK, $this->sNameWhite, 'png'),
-            ])
-            ->withMethod('POST');
-
-        $xPsrConfigMiddleware = jaxon()->psr()->config(__DIR__ . '/../config/psr.php');
-        $xPsrAjaxMiddleware = jaxon()->psr()->ajax();
-        // PSR request handler that does nothing, useful to call the config middleware.
-        $xEmptyRequestHandler = new class implements RequestHandlerInterface
-        {
-            private $xPsr17Factory;
-
-            public function __construct()
-            {
-                $this->xPsr17Factory = new Psr17Factory();
-            }
-
-            public function handle(ServerRequestInterface $request): ResponseInterface
-            {
-                return $this->xPsr17Factory->createResponse();
-            }
-        };
-        // Call the config middleware
-        $xPsrConfigMiddleware->process($xRequest, $xEmptyRequestHandler);
-        // Call the ajax middleware
-        $xPsrResponse = $xPsrAjaxMiddleware->process($xRequest, $xEmptyRequestHandler);
-
-        // Both responses must have the same content and content type
-        $xJaxonResponse = jaxon()->getResponse();
-        $this->assertEquals($xPsrResponse->getBody()->__toString(), $xJaxonResponse->getOutput());
-        $this->assertEquals($xPsrResponse->getHeader('content-type')[0], $xJaxonResponse->getContentType());
-
-        // Uploaded files
-        $aFiles = jaxon()->upload()->files();
-        $this->assertCount(1, $aFiles);
-        $this->assertCount(1, $aFiles['image']);
-        $xFile = $aFiles['image'][0];
-        $this->assertEquals('white', $xFile->name());
-        $this->assertEquals($this->sNameWhite, $xFile->filename());
-        $this->assertEquals('png', $xFile->type());
-        $this->assertEquals('png', $xFile->extension());
-    }
+public function testPsrAjaxUpload()
+{
+_register();
+jaxon()->setOption('core.upload.enabled', true);
+jaxon()->setOption('upload.default.dir', __DIR__ . '/../upload/dst');
+// Send a request to the registered class
+$xRequest = jaxon()->di()->g(ServerRequestCreator::class)
+->fromGlobals()
+->withParsedBody([
+    'jxncall' => json_encode([
+        'type' => 'class',
+        'name' => 'SampleUpload',
+        'method' => 'myMethod',
+        'args' => [],
+    ]),
+])
+->withUploadedFiles([
+    'image' => new UploadedFile($this->sPathWhite, $this->sSizeWhite,
+        UPLOAD_ERR_OK, $this->sNameWhite, 'png'),
+])
+->withMethod('POST');
+
+$xPsrConfigMiddleware = jaxon()->psr()->config(__DIR__ . '/../config/psr.php');
+$xPsrAjaxMiddleware = jaxon()->psr()->ajax();
+// PSR request handler that does nothing, useful to call the config middleware.
+$xEmptyRequestHandler = new class implements RequestHandlerInterface
+{
+private $xPsr17Factory;
+
+public function __construct()
+{
+    $this->xPsr17Factory = new Psr17Factory();
+}
+
+public function handle(ServerRequestInterface $request): ResponseInterface
+{
+    return $this->xPsr17Factory->createResponse();
+}
+};
+// Call the config middleware
+$xPsrConfigMiddleware->process($xRequest, $xEmptyRequestHandler);
+// Call the ajax middleware
+$xPsrResponse = $xPsrAjaxMiddleware->process($xRequest, $xEmptyRequestHandler);
+
+// Both responses must have the same content and content type
+$xJaxonResponse = jaxon()->getResponse();
+$this->assertEquals($xPsrResponse->getBody()->__toString(), $xJaxonResponse->getOutput());
+$this->assertEquals($xPsrResponse->getHeader('content-type')[0], $xJaxonResponse->getContentType());
+
+// Uploaded files
+$aFiles = jaxon()->upload()->files();
+$this->assertCount(1, $aFiles);
+$this->assertCount(1, $aFiles['image']);
+$xFile = $aFiles['image'][0];
+$this->assertEquals('white', $xFile->name());
+$this->assertEquals($this->sNameWhite, $xFile->filename());
+$this->assertEquals('png', $xFile->type());
+$this->assertEquals('png', $xFile->extension());
+}
 }

jaxon-upload/tests/TestUpload/UploadFsLocalTest.php

Switch Indentation +133 added lines, -133 removed lines

@@ -19,166 +19,166 @@
 
 class UploadFsLocalTest extends TestCase
 {
-    /**
+/**
      * @var string
      */
-    protected $sNameWhite;
+protected $sNameWhite;
 
-    /**
+/**
      * @var string
      */
-    protected $sPathWhite;
+protected $sPathWhite;
 
-    /**
+/**
      * @var int
      */
-    protected $sSizeWhite;
+protected $sSizeWhite;
 
-    /**
+/**
      * @var string
      */
-    protected $sNameBlue;
+protected $sNameBlue;
 
-    /**
+/**
      * @var string
      */
-    protected $sPathBlue;
+protected $sPathBlue;
 
-    /**
+/**
      * @var int
      */
-    protected $sSizeBlue;
+protected $sSizeBlue;
 
-    /**
+/**
      * @throws SetupException
      */
-    public function setUp(): void
-    {
-        jaxon()->di()->getPluginManager()->registerPlugins();
-        jaxon()->setOption('core.response.send', false);
-        jaxon()->setOption('upload.default.dir', __DIR__ . '/../upload/dst');
-        _register();
-
-        $tmpDir = __DIR__ . '/../upload/tmp';
-        @mkdir($tmpDir);
-
-        $sSrcWhite = __DIR__ . '/../upload/src/white.png';
-        $this->sNameWhite = 'white.png';
-        $this->sPathWhite = "$tmpDir/{$this->sNameWhite}";
-        $this->sSizeWhite = filesize($sSrcWhite);
-        // Copy the file to the temp dir.
-        @copy($sSrcWhite, $this->sPathWhite);
-
-        $sSrcBlue = __DIR__ . '/../upload/src/blue.png';
-        $this->sNameBlue = 'blue.png';
-        $this->sPathBlue = "$tmpDir/{$this->sNameBlue}";
-        $this->sSizeBlue = filesize($sSrcBlue);
-        // Copy the file to the temp dir.
-        @copy($sSrcBlue, $this->sPathBlue);
-    }
-
-    /**
+public function setUp(): void
+{
+jaxon()->di()->getPluginManager()->registerPlugins();
+jaxon()->setOption('core.response.send', false);
+jaxon()->setOption('upload.default.dir', __DIR__ . '/../upload/dst');
+_register();
+
+$tmpDir = __DIR__ . '/../upload/tmp';
+@mkdir($tmpDir);
+
+$sSrcWhite = __DIR__ . '/../upload/src/white.png';
+$this->sNameWhite = 'white.png';
+$this->sPathWhite = "$tmpDir/{$this->sNameWhite}";
+$this->sSizeWhite = filesize($sSrcWhite);
+// Copy the file to the temp dir.
+@copy($sSrcWhite, $this->sPathWhite);
+
+$sSrcBlue = __DIR__ . '/../upload/src/blue.png';
+$this->sNameBlue = 'blue.png';
+$this->sPathBlue = "$tmpDir/{$this->sNameBlue}";
+$this->sSizeBlue = filesize($sSrcBlue);
+// Copy the file to the temp dir.
+@copy($sSrcBlue, $this->sPathBlue);
+}
+
+/**
      * @throws SetupException
      */
-    public function tearDown(): void
-    {
-        jaxon()->reset();
-        parent::tearDown();
-    }
+public function tearDown(): void
+{
+jaxon()->reset();
+parent::tearDown();
+}
 
-    /**
+/**
      * @throws RequestException
      */
-    public function testHttpUploadDisabled()
-    {
-        jaxon()->setOption('core.upload.enabled', false);
-        jaxon()->register(Jaxon::CALLABLE_CLASS, 'SampleUpload', __DIR__ . '/../src/sample.php');
-        jaxon()->di()->getBootstrap()->onBoot();
-
-        // Send a request to the registered class
-        jaxon()->di()->set(ServerRequestInterface::class, function($c) {
-            return $c->g(ServerRequestCreator::class)
-                ->fromGlobals()
-                ->withUploadedFiles([
-                    'image' => new UploadedFile($this->sPathWhite, $this->sSizeWhite,
-                        UPLOAD_ERR_OK, $this->sNameWhite, 'png'),
-                ])
-                ->withMethod('POST');
-        });
-
-        $this->assertFalse(jaxon()->di()->getRequestHandler()->canProcessRequest());
-    }
-
-    /**
+public function testHttpUploadDisabled()
+{
+jaxon()->setOption('core.upload.enabled', false);
+jaxon()->register(Jaxon::CALLABLE_CLASS, 'SampleUpload', __DIR__ . '/../src/sample.php');
+jaxon()->di()->getBootstrap()->onBoot();
+
+// Send a request to the registered class
+jaxon()->di()->set(ServerRequestInterface::class, function($c) {
+return $c->g(ServerRequestCreator::class)
+    ->fromGlobals()
+    ->withUploadedFiles([
+        'image' => new UploadedFile($this->sPathWhite, $this->sSizeWhite,
+            UPLOAD_ERR_OK, $this->sNameWhite, 'png'),
+    ])
+    ->withMethod('POST');
+});
+
+$this->assertFalse(jaxon()->di()->getRequestHandler()->canProcessRequest());
+}
+
+/**
      * @throws RequestException
      */
-    public function testRequestWithNoPluginNoUpload()
-    {
-        jaxon()->setOption('core.upload.enabled', false);
-        jaxon()->register(Jaxon::CALLABLE_CLASS, 'SampleUpload', __DIR__ . '/../src/sample.php');
-        jaxon()->di()->getBootstrap()->onBoot();
-
-        // Send a request to the registered class
-        jaxon()->di()->set(ServerRequestInterface::class, function($c) {
-            return $c->g(ServerRequestCreator::class)
-                ->fromGlobals()
-                ->withParsedBody([
-                    'jxncall' => json_encode([
-                        'who' => 'Nobody',
-                        'args' => [],
-                    ]),
-                ])
-                ->withMethod('POST');
-        });
-
-        $this->assertFalse(jaxon()->di()->getRequestHandler()->canProcessRequest());
-    }
-
-    /**
+public function testRequestWithNoPluginNoUpload()
+{
+jaxon()->setOption('core.upload.enabled', false);
+jaxon()->register(Jaxon::CALLABLE_CLASS, 'SampleUpload', __DIR__ . '/../src/sample.php');
+jaxon()->di()->getBootstrap()->onBoot();
+
+// Send a request to the registered class
+jaxon()->di()->set(ServerRequestInterface::class, function($c) {
+return $c->g(ServerRequestCreator::class)
+    ->fromGlobals()
+    ->withParsedBody([
+        'jxncall' => json_encode([
+            'who' => 'Nobody',
+            'args' => [],
+        ]),
+    ])
+    ->withMethod('POST');
+});
+
+$this->assertFalse(jaxon()->di()->getRequestHandler()->canProcessRequest());
+}
+
+/**
      * @throws RequestException
      */
-    public function testUploadInMemoryStorage()
-    {
-        jaxon()->setOption('core.upload.enabled', true);
-        jaxon()->setOption('upload.default.storage', 'memory');
-        jaxon()->register(Jaxon::CALLABLE_CLASS, 'SampleUpload', __DIR__ . '/../src/sample.php');
-        jaxon()->di()->getBootstrap()->onBoot();
-
-        // In memory file system adapter
-        jaxon()->upload()->registerStorageAdapter('memory',
-            fn() => new InMemoryFilesystemAdapter());
-
-        // Send a request to the registered class
-        jaxon()->di()->set(ServerRequestInterface::class, function($c) {
-            return $c->g(ServerRequestCreator::class)
-                ->fromGlobals()
-                ->withParsedBody([
-                    'jxncall' => json_encode([
-                        'type' => 'class',
-                        'name' => 'SampleUpload',
-                        'method' => 'myMethod',
-                        'args' => [],
-                    ]),
-                ])
-                ->withUploadedFiles([
-                    'image' => new UploadedFile($this->sPathWhite, $this->sSizeWhite,
-                        UPLOAD_ERR_OK, $this->sNameWhite, 'png'),
-                ])
-                ->withMethod('POST');
-        });
-
-        $this->assertTrue(jaxon()->di()->getRequestHandler()->canProcessRequest());
-        $this->assertTrue(jaxon()->di()->getUploadHandler()->canProcessRequest(jaxon()->di()->getRequest()));
-        jaxon()->processRequest();
-
-        // Uploaded files
-        $aFiles = jaxon()->upload()->files();
-        $this->assertCount(1, $aFiles);
-        $this->assertCount(1, $aFiles['image']);
-        $xFile = $aFiles['image'][0];
-        $this->assertEquals('white', $xFile->name());
-        $this->assertEquals($this->sNameWhite, $xFile->filename());
-        $this->assertEquals('png', $xFile->type());
-        $this->assertEquals('png', $xFile->extension());
-    }
+public function testUploadInMemoryStorage()
+{
+jaxon()->setOption('core.upload.enabled', true);
+jaxon()->setOption('upload.default.storage', 'memory');
+jaxon()->register(Jaxon::CALLABLE_CLASS, 'SampleUpload', __DIR__ . '/../src/sample.php');
+jaxon()->di()->getBootstrap()->onBoot();
+
+// In memory file system adapter
+jaxon()->upload()->registerStorageAdapter('memory',
+fn() => new InMemoryFilesystemAdapter());
+
+// Send a request to the registered class
+jaxon()->di()->set(ServerRequestInterface::class, function($c) {
+return $c->g(ServerRequestCreator::class)
+    ->fromGlobals()
+    ->withParsedBody([
+        'jxncall' => json_encode([
+            'type' => 'class',
+            'name' => 'SampleUpload',
+            'method' => 'myMethod',
+            'args' => [],
+        ]),
+    ])
+    ->withUploadedFiles([
+        'image' => new UploadedFile($this->sPathWhite, $this->sSizeWhite,
+            UPLOAD_ERR_OK, $this->sNameWhite, 'png'),
+    ])
+    ->withMethod('POST');
+});
+
+$this->assertTrue(jaxon()->di()->getRequestHandler()->canProcessRequest());
+$this->assertTrue(jaxon()->di()->getUploadHandler()->canProcessRequest(jaxon()->di()->getRequest()));
+jaxon()->processRequest();
+
+// Uploaded files
+$aFiles = jaxon()->upload()->files();
+$this->assertCount(1, $aFiles);
+$this->assertCount(1, $aFiles['image']);
+$xFile = $aFiles['image'][0];
+$this->assertEquals('white', $xFile->name());
+$this->assertEquals($this->sNameWhite, $xFile->filename());
+$this->assertEquals('png', $xFile->type());
+$this->assertEquals('png', $xFile->extension());
+}
 }

jaxon-upload/tests/TestUpload/UploadTest.php

Switch Indentation +508 added lines, -508 removed lines

@@ -16,561 +16,561 @@
 
 class UploadTest extends TestCase
 {
-    /**
+/**
      * @var string
      */
-    protected $sNameWhite;
+protected $sNameWhite;
 
-    /**
+/**
      * @var string
      */
-    protected $sPathWhite;
+protected $sPathWhite;
 
-    /**
+/**
      * @var int
      */
-    protected $sSizeWhite;
+protected $sSizeWhite;
 
-    /**
+/**
      * @var string
      */
-    protected $sNameBlue;
+protected $sNameBlue;
 
-    /**
+/**
      * @var string
      */
-    protected $sPathBlue;
+protected $sPathBlue;
 
-    /**
+/**
      * @var int
      */
-    protected $sSizeBlue;
+protected $sSizeBlue;
 
-    /**
+/**
      * @throws SetupException
      */
-    public function setUp(): void
-    {
-        _register();
-        jaxon()->setOption('core.upload.enabled', true);
-
-        jaxon()->setOption('core.response.send', false);
-        $tmpDir = __DIR__ . '/../upload/tmp';
-        @mkdir($tmpDir);
-
-        $sSrcWhite = __DIR__ . '/../upload/src/white.png';
-        $this->sNameWhite = 'white.png';
-        $this->sPathWhite = "$tmpDir/{$this->sNameWhite}";
-        $this->sSizeWhite = filesize($sSrcWhite);
-        // Copy the file to the temp dir.
-        @copy($sSrcWhite, $this->sPathWhite);
-
-        $sSrcBlue = __DIR__ . '/../upload/src/blue.png';
-        $this->sNameBlue = 'blue.png';
-        $this->sPathBlue = "$tmpDir/{$this->sNameBlue}";
-        $this->sSizeBlue = filesize($sSrcBlue);
-        // Copy the file to the temp dir.
-        @copy($sSrcBlue, $this->sPathBlue);
-
-        jaxon()->register(Jaxon::CALLABLE_CLASS, 'SampleUpload', __DIR__ . '/../src/sample.php');
-        jaxon()->di()->getBootstrap()->onBoot();
-    }
-
-    /**
+public function setUp(): void
+{
+_register();
+jaxon()->setOption('core.upload.enabled', true);
+
+jaxon()->setOption('core.response.send', false);
+$tmpDir = __DIR__ . '/../upload/tmp';
+@mkdir($tmpDir);
+
+$sSrcWhite = __DIR__ . '/../upload/src/white.png';
+$this->sNameWhite = 'white.png';
+$this->sPathWhite = "$tmpDir/{$this->sNameWhite}";
+$this->sSizeWhite = filesize($sSrcWhite);
+// Copy the file to the temp dir.
+@copy($sSrcWhite, $this->sPathWhite);
+
+$sSrcBlue = __DIR__ . '/../upload/src/blue.png';
+$this->sNameBlue = 'blue.png';
+$this->sPathBlue = "$tmpDir/{$this->sNameBlue}";
+$this->sSizeBlue = filesize($sSrcBlue);
+// Copy the file to the temp dir.
+@copy($sSrcBlue, $this->sPathBlue);
+
+jaxon()->register(Jaxon::CALLABLE_CLASS, 'SampleUpload', __DIR__ . '/../src/sample.php');
+jaxon()->di()->getBootstrap()->onBoot();
+}
+
+/**
      * @throws SetupException
      */
-    public function tearDown(): void
-    {
-        jaxon()->reset();
-        parent::tearDown();
-    }
+public function tearDown(): void
+{
+jaxon()->reset();
+parent::tearDown();
+}
 
-    /**
+/**
      * @throws RequestException
      */
-    public function testAjaxUpload()
-    {
-        jaxon()->setOption('upload.default.dir', __DIR__ . '/../upload/dst');
-        // Send a request to the registered class
-        jaxon()->di()->set(ServerRequestInterface::class, function($c) {
-            return $c->g(ServerRequestCreator::class)
-                ->fromGlobals()
-                ->withParsedBody([
-                    'jxncall' => json_encode([
-                        'type' => 'class',
-                        'name' => 'SampleUpload',
-                        'method' => 'myMethod',
-                        'args' => [],
-                    ]),
-                ])
-                ->withUploadedFiles([
-                    'image' => new UploadedFile($this->sPathWhite, $this->sSizeWhite,
-                        UPLOAD_ERR_OK, $this->sNameWhite, 'png'),
-                ])
-                ->withMethod('POST');
-        });
-
-        $this->assertTrue(jaxon()->di()->getRequestHandler()->canProcessRequest());
-        $this->assertTrue(jaxon()->di()->getUploadHandler()->canProcessRequest(jaxon()->di()->getRequest()));
-        jaxon()->processRequest();
-
-        // Uploaded files
-        $aFiles = jaxon()->upload()->files();
-        $this->assertCount(1, $aFiles);
-        $this->assertCount(1, $aFiles['image']);
-        $xFile = $aFiles['image'][0];
-        $this->assertEquals('white', $xFile->name());
-        $this->assertEquals($this->sNameWhite, $xFile->filename());
-        $this->assertEquals('png', $xFile->type());
-        $this->assertEquals('png', $xFile->extension());
-    }
-
-    /**
+public function testAjaxUpload()
+{
+jaxon()->setOption('upload.default.dir', __DIR__ . '/../upload/dst');
+// Send a request to the registered class
+jaxon()->di()->set(ServerRequestInterface::class, function($c) {
+return $c->g(ServerRequestCreator::class)
+    ->fromGlobals()
+    ->withParsedBody([
+        'jxncall' => json_encode([
+            'type' => 'class',
+            'name' => 'SampleUpload',
+            'method' => 'myMethod',
+            'args' => [],
+        ]),
+    ])
+    ->withUploadedFiles([
+        'image' => new UploadedFile($this->sPathWhite, $this->sSizeWhite,
+            UPLOAD_ERR_OK, $this->sNameWhite, 'png'),
+    ])
+    ->withMethod('POST');
+});
+
+$this->assertTrue(jaxon()->di()->getRequestHandler()->canProcessRequest());
+$this->assertTrue(jaxon()->di()->getUploadHandler()->canProcessRequest(jaxon()->di()->getRequest()));
+jaxon()->processRequest();
+
+// Uploaded files
+$aFiles = jaxon()->upload()->files();
+$this->assertCount(1, $aFiles);
+$this->assertCount(1, $aFiles['image']);
+$xFile = $aFiles['image'][0];
+$this->assertEquals('white', $xFile->name());
+$this->assertEquals($this->sNameWhite, $xFile->filename());
+$this->assertEquals('png', $xFile->type());
+$this->assertEquals('png', $xFile->extension());
+}
+
+/**
      * @throws RequestException
      */
-    public function testAjaxUploadMultipleFiles()
-    {
-        jaxon()->setOption('upload.default.dir', __DIR__ . '/../upload/dst');
-        // Send a request to the registered class
-        jaxon()->di()->set(ServerRequestInterface::class, function($c) {
-            return $c->g(ServerRequestCreator::class)
-                ->fromGlobals()
-                ->withParsedBody([
-                    'jxncall' => json_encode([
-                        'type' => 'class',
-                        'name' => 'SampleUpload',
-                        'method' => 'myMethod',
-                        'args' => [],
-                    ]),
-                ])
-                ->withUploadedFiles([
-                    'image' => [
-                        new UploadedFile($this->sPathWhite, $this->sSizeWhite,
-                            UPLOAD_ERR_OK, $this->sNameWhite, 'png'),
-                        new UploadedFile($this->sPathBlue, $this->sSizeBlue,
-                            UPLOAD_ERR_OK, $this->sNameBlue, 'png'),
-                    ],
-                ])
-                ->withMethod('POST');
-        });
-
-        $this->assertTrue(jaxon()->di()->getRequestHandler()->canProcessRequest());
-        $this->assertTrue(jaxon()->di()->getUploadHandler()->canProcessRequest(jaxon()->di()->getRequest()));
-        jaxon()->processRequest();
-
-        // Uploaded files
-        $aFiles = jaxon()->upload()->files();
-        $this->assertCount(1, $aFiles);
-        $this->assertCount(2, $aFiles['image']);
-        $xFile = $aFiles['image'][0];
-        $this->assertEquals('white', $xFile->name());
-        $this->assertEquals($this->sNameWhite, $xFile->filename());
-        $this->assertEquals('png', $xFile->type());
-        $this->assertEquals('png', $xFile->extension());
-        $xFile = $aFiles['image'][1];
-        $this->assertEquals('blue', $xFile->name());
-        $this->assertEquals($this->sNameBlue, $xFile->filename());
-        $this->assertEquals('png', $xFile->type());
-        $this->assertEquals('png', $xFile->extension());
-    }
-
-    /**
+public function testAjaxUploadMultipleFiles()
+{
+jaxon()->setOption('upload.default.dir', __DIR__ . '/../upload/dst');
+// Send a request to the registered class
+jaxon()->di()->set(ServerRequestInterface::class, function($c) {
+return $c->g(ServerRequestCreator::class)
+    ->fromGlobals()
+    ->withParsedBody([
+        'jxncall' => json_encode([
+            'type' => 'class',
+            'name' => 'SampleUpload',
+            'method' => 'myMethod',
+            'args' => [],
+        ]),
+    ])
+    ->withUploadedFiles([
+        'image' => [
+            new UploadedFile($this->sPathWhite, $this->sSizeWhite,
+                UPLOAD_ERR_OK, $this->sNameWhite, 'png'),
+            new UploadedFile($this->sPathBlue, $this->sSizeBlue,
+                UPLOAD_ERR_OK, $this->sNameBlue, 'png'),
+        ],
+    ])
+    ->withMethod('POST');
+});
+
+$this->assertTrue(jaxon()->di()->getRequestHandler()->canProcessRequest());
+$this->assertTrue(jaxon()->di()->getUploadHandler()->canProcessRequest(jaxon()->di()->getRequest()));
+jaxon()->processRequest();
+
+// Uploaded files
+$aFiles = jaxon()->upload()->files();
+$this->assertCount(1, $aFiles);
+$this->assertCount(2, $aFiles['image']);
+$xFile = $aFiles['image'][0];
+$this->assertEquals('white', $xFile->name());
+$this->assertEquals($this->sNameWhite, $xFile->filename());
+$this->assertEquals('png', $xFile->type());
+$this->assertEquals('png', $xFile->extension());
+$xFile = $aFiles['image'][1];
+$this->assertEquals('blue', $xFile->name());
+$this->assertEquals($this->sNameBlue, $xFile->filename());
+$this->assertEquals('png', $xFile->type());
+$this->assertEquals('png', $xFile->extension());
+}
+
+/**
      * @throws RequestException
      */
-    public function testAjaxUploadMultipleNames()
-    {
-        jaxon()->setOption('upload.default.dir', __DIR__ . '/../upload/dst');
-        // Send a request to the registered class
-        jaxon()->di()->set(ServerRequestInterface::class, function($c) {
-            return $c->g(ServerRequestCreator::class)
-                ->fromGlobals()
-                ->withParsedBody([
-                    'jxncall' => json_encode([
-                        'type' => 'class',
-                        'name' => 'SampleUpload',
-                        'method' => 'myMethod',
-                        'args' => [],
-                    ]),
-                ])
-                ->withUploadedFiles([
-                    'white' => [
-                        new UploadedFile($this->sPathWhite, $this->sSizeWhite,
-                            UPLOAD_ERR_OK, $this->sNameWhite, 'png'),
-                    ],
-                    'blue' => [
-                        new UploadedFile($this->sPathBlue, $this->sSizeBlue,
-                            UPLOAD_ERR_OK, $this->sNameBlue, 'png'),
-                    ],
-                ])
-                ->withMethod('POST');
-        });
-
-        $this->assertTrue(jaxon()->di()->getRequestHandler()->canProcessRequest());
-        $this->assertTrue(jaxon()->di()->getUploadHandler()->canProcessRequest(jaxon()->di()->getRequest()));
-        jaxon()->processRequest();
-
-        // Uploaded files
-        $aFiles = jaxon()->upload()->files();
-        $this->assertCount(2, $aFiles);
-        $this->assertCount(1, $aFiles['white']);
-        $this->assertCount(1, $aFiles['blue']);
-        $xFile = $aFiles['white'][0];
-        $this->assertEquals('white', $xFile->name());
-        $this->assertEquals($this->sNameWhite, $xFile->filename());
-        $this->assertEquals('png', $xFile->type());
-        $this->assertEquals('png', $xFile->extension());
-        $xFile = $aFiles['blue'][0];
-        $this->assertEquals('blue', $xFile->name());
-        $this->assertEquals($this->sNameBlue, $xFile->filename());
-        $this->assertEquals('png', $xFile->type());
-        $this->assertEquals('png', $xFile->extension());
-    }
-
-    /**
+public function testAjaxUploadMultipleNames()
+{
+jaxon()->setOption('upload.default.dir', __DIR__ . '/../upload/dst');
+// Send a request to the registered class
+jaxon()->di()->set(ServerRequestInterface::class, function($c) {
+return $c->g(ServerRequestCreator::class)
+    ->fromGlobals()
+    ->withParsedBody([
+        'jxncall' => json_encode([
+            'type' => 'class',
+            'name' => 'SampleUpload',
+            'method' => 'myMethod',
+            'args' => [],
+        ]),
+    ])
+    ->withUploadedFiles([
+        'white' => [
+            new UploadedFile($this->sPathWhite, $this->sSizeWhite,
+                UPLOAD_ERR_OK, $this->sNameWhite, 'png'),
+        ],
+        'blue' => [
+            new UploadedFile($this->sPathBlue, $this->sSizeBlue,
+                UPLOAD_ERR_OK, $this->sNameBlue, 'png'),
+        ],
+    ])
+    ->withMethod('POST');
+});
+
+$this->assertTrue(jaxon()->di()->getRequestHandler()->canProcessRequest());
+$this->assertTrue(jaxon()->di()->getUploadHandler()->canProcessRequest(jaxon()->di()->getRequest()));
+jaxon()->processRequest();
+
+// Uploaded files
+$aFiles = jaxon()->upload()->files();
+$this->assertCount(2, $aFiles);
+$this->assertCount(1, $aFiles['white']);
+$this->assertCount(1, $aFiles['blue']);
+$xFile = $aFiles['white'][0];
+$this->assertEquals('white', $xFile->name());
+$this->assertEquals($this->sNameWhite, $xFile->filename());
+$this->assertEquals('png', $xFile->type());
+$this->assertEquals('png', $xFile->extension());
+$xFile = $aFiles['blue'][0];
+$this->assertEquals('blue', $xFile->name());
+$this->assertEquals($this->sNameBlue, $xFile->filename());
+$this->assertEquals('png', $xFile->type());
+$this->assertEquals('png', $xFile->extension());
+}
+
+/**
      * @throws RequestException
      */
-    public function testAjaxUploadNameSanitizer()
-    {
-        jaxon()->setOption('upload.default.dir', __DIR__ . '/../upload/dst');
-        jaxon()->upload()->sanitizer(function($sFilename, $sVarName) {
-            return $sVarName === 'image' ? 'img_' . $sFilename : $sFilename;
-        });
-        // Send a request to the registered class
-        jaxon()->di()->set(ServerRequestInterface::class, function($c) {
-            return $c->g(ServerRequestCreator::class)
-                ->fromGlobals()
-                ->withParsedBody([
-                    'jxncall' => json_encode([
-                        'type' => 'class',
-                        'name' => 'SampleUpload',
-                        'method' => 'myMethod',
-                        'args' => [],
-                    ]),
-                ])
-                ->withUploadedFiles([
-                    'image' => new UploadedFile($this->sPathWhite, $this->sSizeWhite,
-                        UPLOAD_ERR_OK, $this->sNameWhite, 'png'),
-                ])
-                ->withMethod('POST');
-        });
-
-        $this->assertTrue(jaxon()->di()->getRequestHandler()->canProcessRequest());
-        $this->assertTrue(jaxon()->di()->getUploadHandler()->canProcessRequest(jaxon()->di()->getRequest()));
-        jaxon()->processRequest();
-
-        // Uploaded files
-        $aFiles = jaxon()->upload()->files();
-        $this->assertCount(1, $aFiles);
-        $this->assertCount(1, $aFiles['image']);
-        $xFile = $aFiles['image'][0];
-        $this->assertEquals('img_white', $xFile->name());
-        $this->assertEquals('png', $xFile->type());
-        $this->assertEquals('png', $xFile->extension());
-        $this->assertEquals($this->sNameWhite, $xFile->filename());
-    }
-
-    /**
+public function testAjaxUploadNameSanitizer()
+{
+jaxon()->setOption('upload.default.dir', __DIR__ . '/../upload/dst');
+jaxon()->upload()->sanitizer(function($sFilename, $sVarName) {
+return $sVarName === 'image' ? 'img_' . $sFilename : $sFilename;
+});
+// Send a request to the registered class
+jaxon()->di()->set(ServerRequestInterface::class, function($c) {
+return $c->g(ServerRequestCreator::class)
+    ->fromGlobals()
+    ->withParsedBody([
+        'jxncall' => json_encode([
+            'type' => 'class',
+            'name' => 'SampleUpload',
+            'method' => 'myMethod',
+            'args' => [],
+        ]),
+    ])
+    ->withUploadedFiles([
+        'image' => new UploadedFile($this->sPathWhite, $this->sSizeWhite,
+            UPLOAD_ERR_OK, $this->sNameWhite, 'png'),
+    ])
+    ->withMethod('POST');
+});
+
+$this->assertTrue(jaxon()->di()->getRequestHandler()->canProcessRequest());
+$this->assertTrue(jaxon()->di()->getUploadHandler()->canProcessRequest(jaxon()->di()->getRequest()));
+jaxon()->processRequest();
+
+// Uploaded files
+$aFiles = jaxon()->upload()->files();
+$this->assertCount(1, $aFiles);
+$this->assertCount(1, $aFiles['image']);
+$xFile = $aFiles['image'][0];
+$this->assertEquals('img_white', $xFile->name());
+$this->assertEquals('png', $xFile->type());
+$this->assertEquals('png', $xFile->extension());
+$this->assertEquals($this->sNameWhite, $xFile->filename());
+}
+
+/**
      * @throws RequestException
      */
-    public function testUploadFileTypeValidationOk()
-    {
-        jaxon()->setOption('upload.default.dir', __DIR__ . '/../upload/dst');
-        jaxon()->setOption('upload.default.types', ['png']);
-        // Send a request to the registered class
-        jaxon()->di()->set(ServerRequestInterface::class, function($c) {
-            return $c->g(ServerRequestCreator::class)
-                ->fromGlobals()
-                ->withParsedBody([
-                    'jxncall' => json_encode([
-                        'type' => 'class',
-                        'name' => 'SampleUpload',
-                        'method' => 'myMethod',
-                        'args' => [],
-                    ]),
-                ])
-                ->withUploadedFiles([
-                    'image' => new UploadedFile($this->sPathWhite, $this->sSizeWhite,
-                        UPLOAD_ERR_OK, $this->sNameWhite, 'png'),
-                ])->withMethod('POST');
-        });
-
-        $this->assertTrue(jaxon()->di()->getRequestHandler()->canProcessRequest());
-        $this->assertTrue(jaxon()->di()->getUploadHandler()->canProcessRequest(jaxon()->di()->getRequest()));
-        jaxon()->processRequest();
-
-        // Return the file name for the next test
-        $aFiles = jaxon()->upload()->files();
-        $this->assertCount(1, $aFiles);
-        $this->assertCount(1, $aFiles['image']);
-        $xFile = $aFiles['image'][0];
-        $this->assertEquals('white', $xFile->name());
-        $this->assertEquals($this->sNameWhite, $xFile->filename());
-    }
-
-    /**
+public function testUploadFileTypeValidationOk()
+{
+jaxon()->setOption('upload.default.dir', __DIR__ . '/../upload/dst');
+jaxon()->setOption('upload.default.types', ['png']);
+// Send a request to the registered class
+jaxon()->di()->set(ServerRequestInterface::class, function($c) {
+return $c->g(ServerRequestCreator::class)
+    ->fromGlobals()
+    ->withParsedBody([
+        'jxncall' => json_encode([
+            'type' => 'class',
+            'name' => 'SampleUpload',
+            'method' => 'myMethod',
+            'args' => [],
+        ]),
+    ])
+    ->withUploadedFiles([
+        'image' => new UploadedFile($this->sPathWhite, $this->sSizeWhite,
+            UPLOAD_ERR_OK, $this->sNameWhite, 'png'),
+    ])->withMethod('POST');
+});
+
+$this->assertTrue(jaxon()->di()->getRequestHandler()->canProcessRequest());
+$this->assertTrue(jaxon()->di()->getUploadHandler()->canProcessRequest(jaxon()->di()->getRequest()));
+jaxon()->processRequest();
+
+// Return the file name for the next test
+$aFiles = jaxon()->upload()->files();
+$this->assertCount(1, $aFiles);
+$this->assertCount(1, $aFiles['image']);
+$xFile = $aFiles['image'][0];
+$this->assertEquals('white', $xFile->name());
+$this->assertEquals($this->sNameWhite, $xFile->filename());
+}
+
+/**
      * @throws RequestException
      */
-    public function testUploadFileTypeValidationError()
-    {
-        jaxon()->setOption('upload.default.dir', __DIR__ . '/../upload/dst');
-        jaxon()->setOption('upload.default.types', ['jpg']);
-        // Send a request to the registered class
-        jaxon()->di()->set(ServerRequestInterface::class, function($c) {
-            return $c->g(ServerRequestCreator::class)
-                ->fromGlobals()
-                ->withParsedBody([
-                    'jxncall' => json_encode([
-                        'type' => 'class',
-                        'name' => 'SampleUpload',
-                        'method' => 'myMethod',
-                        'args' => [],
-                    ]),
-                ])
-                ->withUploadedFiles([
-                    'image' => new UploadedFile($this->sPathWhite, $this->sSizeWhite,
-                        UPLOAD_ERR_OK, $this->sNameWhite, 'png'),
-                ])
-                ->withMethod('POST');
-        });
-
-        $this->assertTrue(jaxon()->di()->getRequestHandler()->canProcessRequest());
-        $this->assertTrue(jaxon()->di()->getUploadHandler()->canProcessRequest(jaxon()->di()->getRequest()));
-        $this->expectException(RequestException::class);
-        jaxon()->processRequest();
-    }
-
-    /**
+public function testUploadFileTypeValidationError()
+{
+jaxon()->setOption('upload.default.dir', __DIR__ . '/../upload/dst');
+jaxon()->setOption('upload.default.types', ['jpg']);
+// Send a request to the registered class
+jaxon()->di()->set(ServerRequestInterface::class, function($c) {
+return $c->g(ServerRequestCreator::class)
+    ->fromGlobals()
+    ->withParsedBody([
+        'jxncall' => json_encode([
+            'type' => 'class',
+            'name' => 'SampleUpload',
+            'method' => 'myMethod',
+            'args' => [],
+        ]),
+    ])
+    ->withUploadedFiles([
+        'image' => new UploadedFile($this->sPathWhite, $this->sSizeWhite,
+            UPLOAD_ERR_OK, $this->sNameWhite, 'png'),
+    ])
+    ->withMethod('POST');
+});
+
+$this->assertTrue(jaxon()->di()->getRequestHandler()->canProcessRequest());
+$this->assertTrue(jaxon()->di()->getUploadHandler()->canProcessRequest(jaxon()->di()->getRequest()));
+$this->expectException(RequestException::class);
+jaxon()->processRequest();
+}
+
+/**
      * @throws RequestException
      */
-    public function testUploadFileExtensionValidationOk()
-    {
-        jaxon()->setOption('upload.default.dir', __DIR__ . '/../upload/dst');
-        jaxon()->setOption('upload.default.extensions', ['png']);
-        // Send a request to the registered class
-        jaxon()->di()->set(ServerRequestInterface::class, function($c) {
-            return $c->g(ServerRequestCreator::class)
-                ->fromGlobals()
-                ->withParsedBody([
-                    'jxncall' => json_encode([
-                        'type' => 'class',
-                        'name' => 'SampleUpload',
-                        'method' => 'myMethod',
-                        'args' => [],
-                    ]),
-                ])
-                ->withUploadedFiles([
-                    'image' => new UploadedFile($this->sPathWhite, $this->sSizeWhite,
-                        UPLOAD_ERR_OK, $this->sNameWhite, 'png'),
-                ])
-                ->withMethod('POST');
-        });
-
-        $this->assertTrue(jaxon()->di()->getRequestHandler()->canProcessRequest());
-        $this->assertTrue(jaxon()->di()->getUploadHandler()->canProcessRequest(jaxon()->di()->getRequest()));
-        jaxon()->processRequest();
-
-        // Return the file name for the next test
-        $aFiles = jaxon()->upload()->files();
-        $this->assertCount(1, $aFiles);
-        $this->assertCount(1, $aFiles['image']);
-        $xFile = $aFiles['image'][0];
-        $this->assertEquals('white', $xFile->name());
-        $this->assertEquals($this->sNameWhite, $xFile->filename());
-    }
-
-    /**
+public function testUploadFileExtensionValidationOk()
+{
+jaxon()->setOption('upload.default.dir', __DIR__ . '/../upload/dst');
+jaxon()->setOption('upload.default.extensions', ['png']);
+// Send a request to the registered class
+jaxon()->di()->set(ServerRequestInterface::class, function($c) {
+return $c->g(ServerRequestCreator::class)
+    ->fromGlobals()
+    ->withParsedBody([
+        'jxncall' => json_encode([
+            'type' => 'class',
+            'name' => 'SampleUpload',
+            'method' => 'myMethod',
+            'args' => [],
+        ]),
+    ])
+    ->withUploadedFiles([
+        'image' => new UploadedFile($this->sPathWhite, $this->sSizeWhite,
+            UPLOAD_ERR_OK, $this->sNameWhite, 'png'),
+    ])
+    ->withMethod('POST');
+});
+
+$this->assertTrue(jaxon()->di()->getRequestHandler()->canProcessRequest());
+$this->assertTrue(jaxon()->di()->getUploadHandler()->canProcessRequest(jaxon()->di()->getRequest()));
+jaxon()->processRequest();
+
+// Return the file name for the next test
+$aFiles = jaxon()->upload()->files();
+$this->assertCount(1, $aFiles);
+$this->assertCount(1, $aFiles['image']);
+$xFile = $aFiles['image'][0];
+$this->assertEquals('white', $xFile->name());
+$this->assertEquals($this->sNameWhite, $xFile->filename());
+}
+
+/**
      * @throws RequestException
      */
-    public function testUploadFileExtensionValidationError()
-    {
-        jaxon()->setOption('upload.default.dir', __DIR__ . '/../upload/dst');
-        jaxon()->setOption('upload.default.extensions', ['jpg']);
-        // Send a request to the registered class
-        jaxon()->di()->set(ServerRequestInterface::class, function($c) {
-            return $c->g(ServerRequestCreator::class)
-                ->fromGlobals()
-                ->withParsedBody([
-                    'jxncall' => json_encode([
-                        'type' => 'class',
-                        'name' => 'SampleUpload',
-                        'method' => 'myMethod',
-                        'args' => [],
-                    ]),
-                ])
-                ->withUploadedFiles([
-                    'image' => new UploadedFile($this->sPathWhite, $this->sSizeWhite,
-                        UPLOAD_ERR_OK, $this->sNameWhite, 'png'),
-                ])
-                ->withMethod('POST');
-        });
-
-        $this->assertTrue(jaxon()->di()->getRequestHandler()->canProcessRequest());
-        $this->assertTrue(jaxon()->di()->getUploadHandler()->canProcessRequest(jaxon()->di()->getRequest()));
-        $this->expectException(RequestException::class);
-        jaxon()->processRequest();
-    }
-
-    /**
+public function testUploadFileExtensionValidationError()
+{
+jaxon()->setOption('upload.default.dir', __DIR__ . '/../upload/dst');
+jaxon()->setOption('upload.default.extensions', ['jpg']);
+// Send a request to the registered class
+jaxon()->di()->set(ServerRequestInterface::class, function($c) {
+return $c->g(ServerRequestCreator::class)
+    ->fromGlobals()
+    ->withParsedBody([
+        'jxncall' => json_encode([
+            'type' => 'class',
+            'name' => 'SampleUpload',
+            'method' => 'myMethod',
+            'args' => [],
+        ]),
+    ])
+    ->withUploadedFiles([
+        'image' => new UploadedFile($this->sPathWhite, $this->sSizeWhite,
+            UPLOAD_ERR_OK, $this->sNameWhite, 'png'),
+    ])
+    ->withMethod('POST');
+});
+
+$this->assertTrue(jaxon()->di()->getRequestHandler()->canProcessRequest());
+$this->assertTrue(jaxon()->di()->getUploadHandler()->canProcessRequest(jaxon()->di()->getRequest()));
+$this->expectException(RequestException::class);
+jaxon()->processRequest();
+}
+
+/**
      * @throws RequestException
      */
-    public function testUploadFileMaxSizeValidationOk()
-    {
-        jaxon()->setOption('upload.default.dir', __DIR__ . '/../upload/dst');
-        jaxon()->setOption('upload.default.max-size', 30000);
-        // Send a request to the registered class
-        jaxon()->di()->set(ServerRequestInterface::class, function($c) {
-            return $c->g(ServerRequestCreator::class)
-                ->fromGlobals()
-                ->withParsedBody([
-                    'jxncall' => json_encode([
-                        'type' => 'class',
-                        'name' => 'SampleUpload',
-                        'method' => 'myMethod',
-                        'args' => [],
-                    ]),
-                ])
-                ->withUploadedFiles([
-                    'image' => new UploadedFile($this->sPathWhite, $this->sSizeWhite,
-                        UPLOAD_ERR_OK, $this->sNameWhite, 'png'),
-                ])
-                ->withMethod('POST');
-        });
-
-        $this->assertTrue(jaxon()->di()->getRequestHandler()->canProcessRequest());
-        $this->assertTrue(jaxon()->di()->getUploadHandler()->canProcessRequest(jaxon()->di()->getRequest()));
-        jaxon()->processRequest();
-
-        // Return the file name for the next test
-        $aFiles = jaxon()->upload()->files();
-        $this->assertCount(1, $aFiles);
-        $this->assertCount(1, $aFiles['image']);
-        $xFile = $aFiles['image'][0];
-        $this->assertEquals('white', $xFile->name());
-        $this->assertEquals($this->sNameWhite, $xFile->filename());
-    }
-
-    /**
+public function testUploadFileMaxSizeValidationOk()
+{
+jaxon()->setOption('upload.default.dir', __DIR__ . '/../upload/dst');
+jaxon()->setOption('upload.default.max-size', 30000);
+// Send a request to the registered class
+jaxon()->di()->set(ServerRequestInterface::class, function($c) {
+return $c->g(ServerRequestCreator::class)
+    ->fromGlobals()
+    ->withParsedBody([
+        'jxncall' => json_encode([
+            'type' => 'class',
+            'name' => 'SampleUpload',
+            'method' => 'myMethod',
+            'args' => [],
+        ]),
+    ])
+    ->withUploadedFiles([
+        'image' => new UploadedFile($this->sPathWhite, $this->sSizeWhite,
+            UPLOAD_ERR_OK, $this->sNameWhite, 'png'),
+    ])
+    ->withMethod('POST');
+});
+
+$this->assertTrue(jaxon()->di()->getRequestHandler()->canProcessRequest());
+$this->assertTrue(jaxon()->di()->getUploadHandler()->canProcessRequest(jaxon()->di()->getRequest()));
+jaxon()->processRequest();
+
+// Return the file name for the next test
+$aFiles = jaxon()->upload()->files();
+$this->assertCount(1, $aFiles);
+$this->assertCount(1, $aFiles['image']);
+$xFile = $aFiles['image'][0];
+$this->assertEquals('white', $xFile->name());
+$this->assertEquals($this->sNameWhite, $xFile->filename());
+}
+
+/**
      * @throws RequestException
      */
-    public function testUploadFileMaxSizeValidationError()
-    {
-        jaxon()->setOption('upload.default.dir', __DIR__ . '/../upload/dst');
-        jaxon()->setOption('upload.default.max-size', 25000);
-        // Send a request to the registered class
-        jaxon()->di()->set(ServerRequestInterface::class, function($c) {
-            return $c->g(ServerRequestCreator::class)
-                ->fromGlobals()
-                ->withParsedBody([
-                    'jxncall' => json_encode([
-                        'type' => 'class',
-                        'name' => 'SampleUpload',
-                        'method' => 'myMethod',
-                        'args' => [],
-                    ]),
-                ])
-                ->withUploadedFiles([
-                    'image' => new UploadedFile($this->sPathWhite, $this->sSizeWhite,
-                        UPLOAD_ERR_OK, $this->sNameWhite, 'png'),
-                ])
-                ->withMethod('POST');
-        });
-
-        $this->assertTrue(jaxon()->di()->getRequestHandler()->canProcessRequest());
-        $this->assertTrue(jaxon()->di()->getUploadHandler()->canProcessRequest(jaxon()->di()->getRequest()));
-        $this->expectException(RequestException::class);
-        jaxon()->processRequest();
-    }
-
-    /**
+public function testUploadFileMaxSizeValidationError()
+{
+jaxon()->setOption('upload.default.dir', __DIR__ . '/../upload/dst');
+jaxon()->setOption('upload.default.max-size', 25000);
+// Send a request to the registered class
+jaxon()->di()->set(ServerRequestInterface::class, function($c) {
+return $c->g(ServerRequestCreator::class)
+    ->fromGlobals()
+    ->withParsedBody([
+        'jxncall' => json_encode([
+            'type' => 'class',
+            'name' => 'SampleUpload',
+            'method' => 'myMethod',
+            'args' => [],
+        ]),
+    ])
+    ->withUploadedFiles([
+        'image' => new UploadedFile($this->sPathWhite, $this->sSizeWhite,
+            UPLOAD_ERR_OK, $this->sNameWhite, 'png'),
+    ])
+    ->withMethod('POST');
+});
+
+$this->assertTrue(jaxon()->di()->getRequestHandler()->canProcessRequest());
+$this->assertTrue(jaxon()->di()->getUploadHandler()->canProcessRequest(jaxon()->di()->getRequest()));
+$this->expectException(RequestException::class);
+jaxon()->processRequest();
+}
+
+/**
      * @throws RequestException
      */
-    public function testUploadFileMinSizeValidationOk()
-    {
-        jaxon()->setOption('upload.default.dir', __DIR__ . '/../upload/dst');
-        jaxon()->setOption('upload.default.min-size', 25000);
-        // Send a request to the registered class
-        jaxon()->di()->set(ServerRequestInterface::class, function($c) {
-            return $c->g(ServerRequestCreator::class)
-                ->fromGlobals()
-                ->withParsedBody([
-                    'jxncall' => json_encode([
-                        'type' => 'class',
-                        'name' => 'SampleUpload',
-                        'method' => 'myMethod',
-                        'args' => [],
-                    ]),
-                ])
-                ->withUploadedFiles([
-                    'image' => new UploadedFile($this->sPathWhite, $this->sSizeWhite,
-                        UPLOAD_ERR_OK, $this->sNameWhite, 'png'),
-                ])
-                ->withMethod('POST');
-        });
-
-        $this->assertTrue(jaxon()->di()->getRequestHandler()->canProcessRequest());
-        $this->assertTrue(jaxon()->di()->getUploadHandler()->canProcessRequest(jaxon()->di()->getRequest()));
-        jaxon()->processRequest();
-
-        // Return the file name for the next test
-        $aFiles = jaxon()->upload()->files();
-        $this->assertCount(1, $aFiles);
-        $this->assertCount(1, $aFiles['image']);
-        $xFile = $aFiles['image'][0];
-        $this->assertEquals('white', $xFile->name());
-        $this->assertEquals($this->sNameWhite, $xFile->filename());
-    }
-
-    /**
+public function testUploadFileMinSizeValidationOk()
+{
+jaxon()->setOption('upload.default.dir', __DIR__ . '/../upload/dst');
+jaxon()->setOption('upload.default.min-size', 25000);
+// Send a request to the registered class
+jaxon()->di()->set(ServerRequestInterface::class, function($c) {
+return $c->g(ServerRequestCreator::class)
+    ->fromGlobals()
+    ->withParsedBody([
+        'jxncall' => json_encode([
+            'type' => 'class',
+            'name' => 'SampleUpload',
+            'method' => 'myMethod',
+            'args' => [],
+        ]),
+    ])
+    ->withUploadedFiles([
+        'image' => new UploadedFile($this->sPathWhite, $this->sSizeWhite,
+            UPLOAD_ERR_OK, $this->sNameWhite, 'png'),
+    ])
+    ->withMethod('POST');
+});
+
+$this->assertTrue(jaxon()->di()->getRequestHandler()->canProcessRequest());
+$this->assertTrue(jaxon()->di()->getUploadHandler()->canProcessRequest(jaxon()->di()->getRequest()));
+jaxon()->processRequest();
+
+// Return the file name for the next test
+$aFiles = jaxon()->upload()->files();
+$this->assertCount(1, $aFiles);
+$this->assertCount(1, $aFiles['image']);
+$xFile = $aFiles['image'][0];
+$this->assertEquals('white', $xFile->name());
+$this->assertEquals($this->sNameWhite, $xFile->filename());
+}
+
+/**
      * @throws RequestException
      */
-    public function testUploadFileMinSizeValidationError()
-    {
-        jaxon()->setOption('upload.default.dir', __DIR__ . '/../upload/dst');
-        jaxon()->setOption('upload.default.min-size', 30000);
-        // Send a request to the registered class
-        jaxon()->di()->set(ServerRequestInterface::class, function($c) {
-            return $c->g(ServerRequestCreator::class)
-                ->fromGlobals()
-                ->withParsedBody([
-                    'jxncall' => json_encode([
-                        'type' => 'class',
-                        'name' => 'SampleUpload',
-                        'method' => 'myMethod',
-                        'args' => [],
-                    ]),
-                ])
-                ->withUploadedFiles([
-                    'image' => new UploadedFile($this->sPathWhite, $this->sSizeWhite,
-                        UPLOAD_ERR_OK, $this->sNameWhite, 'png'),
-                ])
-                ->withMethod('POST');
-        });
-
-        $this->assertTrue(jaxon()->di()->getRequestHandler()->canProcessRequest());
-        $this->assertTrue(jaxon()->di()->getUploadHandler()->canProcessRequest(jaxon()->di()->getRequest()));
-        $this->expectException(RequestException::class);
-        jaxon()->processRequest();
-    }
-
-    /**
+public function testUploadFileMinSizeValidationError()
+{
+jaxon()->setOption('upload.default.dir', __DIR__ . '/../upload/dst');
+jaxon()->setOption('upload.default.min-size', 30000);
+// Send a request to the registered class
+jaxon()->di()->set(ServerRequestInterface::class, function($c) {
+return $c->g(ServerRequestCreator::class)
+    ->fromGlobals()
+    ->withParsedBody([
+        'jxncall' => json_encode([
+            'type' => 'class',
+            'name' => 'SampleUpload',
+            'method' => 'myMethod',
+            'args' => [],
+        ]),
+    ])
+    ->withUploadedFiles([
+        'image' => new UploadedFile($this->sPathWhite, $this->sSizeWhite,
+            UPLOAD_ERR_OK, $this->sNameWhite, 'png'),
+    ])
+    ->withMethod('POST');
+});
+
+$this->assertTrue(jaxon()->di()->getRequestHandler()->canProcessRequest());
+$this->assertTrue(jaxon()->di()->getUploadHandler()->canProcessRequest(jaxon()->di()->getRequest()));
+$this->expectException(RequestException::class);
+jaxon()->processRequest();
+}
+
+/**
      * @throws RequestException
      */
-    public function testRequestWithNoPluginNoUpload()
-    {
-        jaxon()->setOption('core.upload.enabled', false);
-        // Send a request to the registered class
-        jaxon()->di()->set(ServerRequestInterface::class, function($c) {
-            return $c->g(ServerRequestCreator::class)
-                ->fromGlobals()
-                ->withParsedBody([
-                    'jxncall' => json_encode([
-                        'who' => 'Nobody',
-                        'args' => [],
-                    ]),
-                ])
-                ->withMethod('POST');
-        });
-
-        $this->assertFalse(jaxon()->di()->getRequestHandler()->canProcessRequest());
-    }
+public function testRequestWithNoPluginNoUpload()
+{
+jaxon()->setOption('core.upload.enabled', false);
+// Send a request to the registered class
+jaxon()->di()->set(ServerRequestInterface::class, function($c) {
+return $c->g(ServerRequestCreator::class)
+    ->fromGlobals()
+    ->withParsedBody([
+        'jxncall' => json_encode([
+            'who' => 'Nobody',
+            'args' => [],
+        ]),
+    ])
+    ->withMethod('POST');
+});
+
+$this->assertFalse(jaxon()->di()->getRequestHandler()->canProcessRequest());
+}
 }