jaxon-php / jaxon-mono

jaxon-upload/tests/TestUpload/UploadFsLocalTest.php

Switch Indentation +130 added lines, -130 removed lines

@@ -19,163 +19,163 @@
 
 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');
-
-        // 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');
+
+// 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');
-
-        // 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');
+
+// 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');
-
-        // 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');
+
+// 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/src/Manager/FileStorage.php

Switch Indentation +110 added lines, -110 removed lines

@@ -28,146 +28,146 @@
 
 class FileStorage
 {
-    /**
+/**
      * @var ConfigManager
      */
-    protected $xConfigManager;
+protected $xConfigManager;
 
-    /**
+/**
      * @var Translator
      */
-    protected $xTranslator;
+protected $xTranslator;
 
-    /**
+/**
      * @var array
      */
-    protected $aAdapters = [];
+protected $aAdapters = [];
 
-    /**
+/**
      * @var array
      */
-    protected $aFilesystems = [];
+protected $aFilesystems = [];
 
-    /**
+/**
      * The constructor
      *
      * @param ConfigManager $xConfigManager
      * @param Translator $xTranslator
      */
-    public function __construct(ConfigManager $xConfigManager, Translator $xTranslator)
-    {
-        $this->xConfigManager = $xConfigManager;
-        $this->xTranslator = $xTranslator;
-        $this->registerAdapters();
-    }
-
-    /**
+public function __construct(ConfigManager $xConfigManager, Translator $xTranslator)
+{
+$this->xConfigManager = $xConfigManager;
+$this->xTranslator = $xTranslator;
+$this->registerAdapters();
+}
+
+/**
      * @param string $sStorage
      * @param Closure $cFactory
      *
      * @return void
      */
-    public function registerAdapter(string $sStorage, Closure $cFactory)
-    {
-        $this->aAdapters[$sStorage] = $cFactory;
-    }
+public function registerAdapter(string $sStorage, Closure $cFactory)
+{
+$this->aAdapters[$sStorage] = $cFactory;
+}
 
-    /**
+/**
      * Register the file storage adapters
      *
      * @return void
      */
-    private function registerAdapters()
-    {
-        // Local file system adapter
-        $this->registerAdapter('local', function(string $sRootDir, $xOptions) {
-            return empty($xOptions) ? new LocalFilesystemAdapter($sRootDir) :
-                new LocalFilesystemAdapter($sRootDir, $xOptions);
-        });
-
-        // AWS S3 file system adapter
-        $this->registerAdapter('aws-s3', function(string $sRootDir, array $aOptions) {
-            /** @var \Aws\S3\S3ClientInterface $client */
-            $client = new \Aws\S3\S3Client($aOptions['client'] ?? []);
-            return new \League\Flysystem\AwsS3V3\AwsS3V3Adapter($client, $aOptions['bucket'] ?? '', $sRootDir);
-        });
-
-        // Async AWS S3 file system adapter
-        $this->registerAdapter('async-aws-s3', function(string $sRootDir, array $aOptions) {
-            $client = isset($aOptions['client']) ? new \AsyncAws\S3\S3Client($aOptions['client']) : new \AsyncAws\S3\S3Client();
-            return new \League\Flysystem\AsyncAwsS3\AsyncAwsS3Adapter($client, $aOptions['bucket'] ?? '', $sRootDir);
-        });
-
-        // Google Cloud file system adapter
-        $this->registerAdapter('google-cloud', function(string $sRootDir, array $aOptions) {
-            $storageClient = new \Google\Cloud\Storage\StorageClient($aOptions['client'] ?? []);
-            $bucket = $storageClient->bucket($aOptions['bucket'] ?? '');
-            return new \League\Flysystem\AzureBlobStorage\GoogleCloudStorageAdapter($bucket, $sRootDir);
-        });
-
-        // Microsoft Azure file system adapter
-        $this->registerAdapter('azure-blob', function(string $sRootDir, array $aOptions) {
-            $client = \MicrosoftAzure\Storage\Blob\BlobRestProxy::createBlobService($aOptions['dsn']);
-            return new \League\Flysystem\AzureBlobStorage\AzureBlobStorageAdapter($client, $aOptions['container'], $sRootDir);
-        });
-
-        // FTP file system adapter
-        $this->registerAdapter('ftp', function(string $sRootDir, array $aOptions) {
-            $aOptions['root'] = $sRootDir;
-            $xOptions = \League\Flysystem\Ftp\FtpConnectionOptions::fromArray($aOptions);
-            return new \League\Flysystem\Ftp\FtpAdapter($xOptions);
-        });
-
-        // SFTP V2 file system adapter
-        $this->registerAdapter('sftp-v2', function(string $sRootDir, array $aOptions) {
-            $provider = new \League\Flysystem\PhpseclibV2\SftpConnectionProvider(...$aOptions);
-            return new \League\Flysystem\PhpseclibV2\SftpAdapter($provider, $sRootDir);
-        });
-
-        // SFTP V3 file system adapter
-        $this->registerAdapter('sftp-v3', function(string $sRootDir, array $aOptions) {
-            $provider = new \League\Flysystem\PhpseclibV3\SftpConnectionProvider(...$aOptions);
-            return new \League\Flysystem\PhpseclibV3\SftpAdapter($provider, $sRootDir);
-        });
-    }
-
-    /**
+private function registerAdapters()
+{
+// Local file system adapter
+$this->registerAdapter('local', function(string $sRootDir, $xOptions) {
+return empty($xOptions) ? new LocalFilesystemAdapter($sRootDir) :
+    new LocalFilesystemAdapter($sRootDir, $xOptions);
+});
+
+// AWS S3 file system adapter
+$this->registerAdapter('aws-s3', function(string $sRootDir, array $aOptions) {
+/** @var \Aws\S3\S3ClientInterface $client */
+$client = new \Aws\S3\S3Client($aOptions['client'] ?? []);
+return new \League\Flysystem\AwsS3V3\AwsS3V3Adapter($client, $aOptions['bucket'] ?? '', $sRootDir);
+});
+
+// Async AWS S3 file system adapter
+$this->registerAdapter('async-aws-s3', function(string $sRootDir, array $aOptions) {
+$client = isset($aOptions['client']) ? new \AsyncAws\S3\S3Client($aOptions['client']) : new \AsyncAws\S3\S3Client();
+return new \League\Flysystem\AsyncAwsS3\AsyncAwsS3Adapter($client, $aOptions['bucket'] ?? '', $sRootDir);
+});
+
+// Google Cloud file system adapter
+$this->registerAdapter('google-cloud', function(string $sRootDir, array $aOptions) {
+$storageClient = new \Google\Cloud\Storage\StorageClient($aOptions['client'] ?? []);
+$bucket = $storageClient->bucket($aOptions['bucket'] ?? '');
+return new \League\Flysystem\AzureBlobStorage\GoogleCloudStorageAdapter($bucket, $sRootDir);
+});
+
+// Microsoft Azure file system adapter
+$this->registerAdapter('azure-blob', function(string $sRootDir, array $aOptions) {
+$client = \MicrosoftAzure\Storage\Blob\BlobRestProxy::createBlobService($aOptions['dsn']);
+return new \League\Flysystem\AzureBlobStorage\AzureBlobStorageAdapter($client, $aOptions['container'], $sRootDir);
+});
+
+// FTP file system adapter
+$this->registerAdapter('ftp', function(string $sRootDir, array $aOptions) {
+$aOptions['root'] = $sRootDir;
+$xOptions = \League\Flysystem\Ftp\FtpConnectionOptions::fromArray($aOptions);
+return new \League\Flysystem\Ftp\FtpAdapter($xOptions);
+});
+
+// SFTP V2 file system adapter
+$this->registerAdapter('sftp-v2', function(string $sRootDir, array $aOptions) {
+$provider = new \League\Flysystem\PhpseclibV2\SftpConnectionProvider(...$aOptions);
+return new \League\Flysystem\PhpseclibV2\SftpAdapter($provider, $sRootDir);
+});
+
+// SFTP V3 file system adapter
+$this->registerAdapter('sftp-v3', function(string $sRootDir, array $aOptions) {
+$provider = new \League\Flysystem\PhpseclibV3\SftpConnectionProvider(...$aOptions);
+return new \League\Flysystem\PhpseclibV3\SftpAdapter($provider, $sRootDir);
+});
+}
+
+/**
      * @param string $sField
      *
      * @return Filesystem
      * @throws RequestException
      */
-    public function filesystem(string $sField = ''): Filesystem
-    {
-        $sField = trim($sField);
-        if(isset($this->aFilesystems[$sField]))
-        {
-            return $this->aFilesystems[$sField];
-        }
-
-        // Default upload dir
-        $sStorage = $this->xConfigManager->getOption('upload.default.storage', 'local');
-        $sRootDir = $this->xConfigManager->getOption('upload.default.dir', '');
-        $aOptions = $this->xConfigManager->getOption('upload.default.options');
-        $sConfigKey = "upload.files.$sField";
-        if($sField !== '' && $this->xConfigManager->hasOption($sConfigKey))
-        {
-            $sStorage = $this->xConfigManager->getOption("$sConfigKey.storage", $sStorage);
-            $sRootDir = $this->xConfigManager->getOption("$sConfigKey.dir", $sRootDir);
-            $aOptions = $this->xConfigManager->getOption("$sConfigKey.options", $aOptions);
-        }
-
-        if(!is_string($sRootDir))
-        {
-            throw new RequestException($this->xTranslator->trans('errors.upload.dir'));
-        }
-        if(!isset($this->aAdapters[$sStorage]))
-        {
-            throw new RequestException($this->xTranslator->trans('errors.upload.adapter'));
-        }
-
-        $xAdapter = call_user_func($this->aAdapters[$sStorage], $sRootDir, $aOptions);
-        $this->aFilesystems[$sField] = new Filesystem($xAdapter);
-        return $this->aFilesystems[$sField];
-    }
+public function filesystem(string $sField = ''): Filesystem
+{
+$sField = trim($sField);
+if(isset($this->aFilesystems[$sField]))
+{
+return $this->aFilesystems[$sField];
+}
+
+// Default upload dir
+$sStorage = $this->xConfigManager->getOption('upload.default.storage', 'local');
+$sRootDir = $this->xConfigManager->getOption('upload.default.dir', '');
+$aOptions = $this->xConfigManager->getOption('upload.default.options');
+$sConfigKey = "upload.files.$sField";
+if($sField !== '' && $this->xConfigManager->hasOption($sConfigKey))
+{
+$sStorage = $this->xConfigManager->getOption("$sConfigKey.storage", $sStorage);
+$sRootDir = $this->xConfigManager->getOption("$sConfigKey.dir", $sRootDir);
+$aOptions = $this->xConfigManager->getOption("$sConfigKey.options", $aOptions);
+}
+
+if(!is_string($sRootDir))
+{
+throw new RequestException($this->xTranslator->trans('errors.upload.dir'));
+}
+if(!isset($this->aAdapters[$sStorage]))
+{
+throw new RequestException($this->xTranslator->trans('errors.upload.adapter'));
+}
+
+$xAdapter = call_user_func($this->aAdapters[$sStorage], $sRootDir, $aOptions);
+$this->aFilesystems[$sField] = new Filesystem($xAdapter);
+return $this->aFilesystems[$sField];
+}
 }

Spacing +5 added lines, -6 removed lines

@@ -81,8 +81,7 @@ 
     {
         // Local file system adapter
         $this->registerAdapter('local', function(string $sRootDir, $xOptions) {
-            return empty($xOptions) ? new LocalFilesystemAdapter($sRootDir) :
-                new LocalFilesystemAdapter($sRootDir, $xOptions);
+            return empty($xOptions) ? new LocalFilesystemAdapter($sRootDir) : new LocalFilesystemAdapter($sRootDir, $xOptions);
         });
 
         // AWS S3 file system adapter
@@ -140,7 +139,7 @@ 
     public function filesystem(string $sField = ''): Filesystem
     {
         $sField = trim($sField);
-        if(isset($this->aFilesystems[$sField]))
+        if (isset($this->aFilesystems[$sField]))
         {
             return $this->aFilesystems[$sField];
         }
@@ -150,18 +149,18 @@ 
         $sRootDir = $this->xConfigManager->getOption('upload.default.dir', '');
         $aOptions = $this->xConfigManager->getOption('upload.default.options');
         $sConfigKey = "upload.files.$sField";
-        if($sField !== '' && $this->xConfigManager->hasOption($sConfigKey))
+        if ($sField !== '' && $this->xConfigManager->hasOption($sConfigKey))
         {
             $sStorage = $this->xConfigManager->getOption("$sConfigKey.storage", $sStorage);
             $sRootDir = $this->xConfigManager->getOption("$sConfigKey.dir", $sRootDir);
             $aOptions = $this->xConfigManager->getOption("$sConfigKey.options", $aOptions);
         }
 
-        if(!is_string($sRootDir))
+        if (!is_string($sRootDir))
         {
             throw new RequestException($this->xTranslator->trans('errors.upload.dir'));
         }
-        if(!isset($this->aAdapters[$sStorage]))
+        if (!isset($this->aAdapters[$sStorage]))
         {
             throw new RequestException($this->xTranslator->trans('errors.upload.adapter'));
         }