jaxon-php / jaxon-mono

jaxon-core/src/Plugin/Request/CallableClass/CallableClassPlugin.php

Braces +2 added lines, -4 removed lines

@@ -85,8 +85,7 @@ 
         if(is_string($xOptions))
         {
             $xOptions = ['include' => $xOptions];
-        }
-        elseif(!is_array($xOptions))
+        } elseif(!is_array($xOptions))
         {
             throw new SetupException($this->xTranslator->trans('errors.objects.invalid-declaration'));
         }
@@ -261,8 +260,7 @@ 
 
             $sError = 'errors.objects.call';
             $xCallableObject->call($this->xTarget);
-        }
-        catch(ReflectionException|SetupException $e)
+        } catch(ReflectionException|SetupException $e)
         {
             // Unable to execute the requested class or method
             $this->throwException($e->getMessage(), $sError, $aErrorParams);

Spacing +13 added lines, -14 removed lines

@@ -81,15 +81,15 @@ 
      */
     public function checkOptions(string $sCallable, $xOptions): array
     {
-        if(!$this->xValidator->validateClass(trim($sCallable)))
+        if (!$this->xValidator->validateClass(trim($sCallable)))
         {
             throw new SetupException($this->xTranslator->trans('errors.objects.invalid-declaration'));
         }
-        if(is_string($xOptions))
+        if (is_string($xOptions))
         {
             $xOptions = ['include' => $xOptions];
         }
-        elseif(!is_array($xOptions))
+        elseif (!is_array($xOptions))
         {
             throw new SetupException($this->xTranslator->trans('errors.objects.invalid-declaration'));
         }
@@ -133,15 +133,15 @@ 
      */
     private function addCallable(CallableObject $xCallableObject): void
     {
-        if($xCallableObject->excluded())
+        if ($xCallableObject->excluded())
         {
             return;
         }
 
         $aCallableObject = &$this->aCallableObjects;
-        foreach(explode('.', $xCallableObject->getJsName()) as $sName)
+        foreach (explode('.', $xCallableObject->getJsName()) as $sName)
         {
-            if(!isset($aCallableObject['children'][$sName]))
+            if (!isset($aCallableObject['children'][$sName]))
             {
                 $aCallableObject['children'][$sName] = [];
             }
@@ -176,11 +176,10 @@ 
 
         $fMethodCallback = fn($aMethod) => $this->renderMethod($sIndent,
             ['sJsClass' => $sJsClass, 'aMethod' => $aMethod]);
-        $aMethods = !isset($aCallable['methods']) ? [] :
-            array_map($fMethodCallback, $aCallable['methods']);
+        $aMethods = !isset($aCallable['methods']) ? [] : array_map($fMethodCallback, $aCallable['methods']);
 
         $aChildren = [];
-        foreach($aCallable['children'] ?? [] as $sName => $aChild)
+        foreach ($aCallable['children'] ?? [] as $sName => $aChild)
         {
             $aChildren[] = $this->renderChild("$sName:", "$sJsClass.$sName",
                 $aChild, $nRepeat) . ',';
@@ -221,13 +220,13 @@ 
         $this->xRegistry->registerAllComponents();
 
         $this->aCallableObjects = ['children' => []];
-        foreach($this->cdi->getCallableObjects() as $xCallableObject)
+        foreach ($this->cdi->getCallableObjects() as $xCallableObject)
         {
             $this->addCallable($xCallableObject);
         }
 
         $aScripts = [];
-        foreach($this->aCallableObjects['children'] as $sJsClass => $aCallable)
+        foreach ($this->aCallableObjects['children'] as $sJsClass => $aCallable)
         {
             $aScripts[] = $this->renderChild("{$this->sPrefix}$sJsClass =",
                 $sJsClass, $aCallable) . ';';
@@ -283,7 +282,7 @@ 
         // Will be used to print a translated error message.
         $aErrorParams = ['class' => $sClassName, 'method' => $sMethodName];
 
-        if(!$this->xValidator->validateJsObject($sClassName) ||
+        if (!$this->xValidator->validateJsObject($sClassName) ||
             !$this->xValidator->validateMethod($sMethodName))
         {
             // Unable to find the requested object or method
@@ -297,7 +296,7 @@ 
             /** @var CallableObject */
             $xCallableObject = $this->getCallable($sClassName);
 
-            if($xCallableObject->excluded($sMethodName))
+            if ($xCallableObject->excluded($sMethodName))
             {
                 // Unable to find the requested class or method
                 $this->throwException('', 'errors.objects.excluded', $aErrorParams);
@@ -306,7 +305,7 @@ 
             $sError = 'errors.objects.call';
             $xCallableObject->call($this->xTarget);
         }
-        catch(ReflectionException|SetupException $e)
+        catch (ReflectionException|SetupException $e)
         {
             // Unable to execute the requested class or method
             $this->throwException($e->getMessage(), $sError, $aErrorParams);

jaxon-core/src/Request/Upload/UploadHandlerInterface.php

Switch Indentation +10 added lines, -10 removed lines

@@ -20,45 +20,45 @@
 
 interface UploadHandlerInterface
 {
-    /**
+/**
      * Set the uploaded file name sanitizer
      *
      * @param Closure $cSanitizer    The closure
      *
      * @return void
      */
-    public function sanitizer(Closure $cSanitizer);
+public function sanitizer(Closure $cSanitizer);
 
-    /**
+/**
      * Get the uploaded files
      *
      * @return FileInterface[]
      */
-    public function files(): array;
+public function files(): array;
 
-    /**
+/**
      * Check if the current request contains uploaded files
      *
      * @param ServerRequestInterface $xRequest
      *
      * @return bool
      */
-    public function canProcessRequest(ServerRequestInterface $xRequest): bool;
+public function canProcessRequest(ServerRequestInterface $xRequest): bool;
 
-    /**
+/**
      * Process the uploaded files in the HTTP request
      *
      * @param ServerRequestInterface $xRequest
      *
      * @return bool
      */
-    public function processRequest(ServerRequestInterface $xRequest): bool;
+public function processRequest(ServerRequestInterface $xRequest): bool;
 
-    /**
+/**
      * @param string $sStorage
      * @param Closure $cFactory
      *
      * @return void
      */
-    public function registerStorageAdapter(string $sStorage, Closure $cFactory);
+public function registerStorageAdapter(string $sStorage, Closure $cFactory);
 }

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

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

Spacing +14 added lines, -15 removed lines

@@ -144,15 +144,15 @@ 
         $xRegistry->updateHash(false); // Disable hash calculation.
 
         $sComponentId = str_replace('\\', '.', $sClassName);
-        if(!isset($this->aComponents[$sComponentId]))
+        if (!isset($this->aComponents[$sComponentId]))
         {
             $aOptions = $xRegistry->getNamespaceComponentOptions($sClassName);
-            if($aOptions !== null)
+            if ($aOptions !== null)
             {
                 $this->saveComponent($sClassName, $aOptions);
             }
         }
-        if(isset($this->aComponents[$sComponentId]))
+        if (isset($this->aComponents[$sComponentId]))
         {
             return; // The component is found.
         }
@@ -160,11 +160,11 @@ 
         // The component was not found in a registered namespace. We need to parse all
         // the directories to be able to find a component registered without a namespace.
         $sComponentId = str_replace('\\', '_', $sClassName);
-        if(!isset($this->aComponents[$sComponentId]))
+        if (!isset($this->aComponents[$sComponentId]))
         {
             $xRegistry->registerComponentsInDirectories();
         }
-        if(isset($this->aComponents[$sComponentId]))
+        if (isset($this->aComponents[$sComponentId]))
         {
             return; // The component is found.
         }
@@ -182,7 +182,7 @@ 
     public function getCallableObjects(): array
     {
         $aCallableObjects = [];
-        foreach($this->aComponents as $sComponentId => $_)
+        foreach ($this->aComponents as $sComponentId => $_)
         {
             $aCallableObjects[$sComponentId] = $this->makeCallableObject($sComponentId);
         }
@@ -233,12 +233,12 @@ 
     {
         /** @var Config|null */
         $xPackageConfig = $aOptions['config'] ?? null;
-        if($xPackageConfig === null || (bool)($aOptions['excluded'] ?? false))
+        if ($xPackageConfig === null || (bool)($aOptions['excluded'] ?? false))
         {
             return null;
         }
         $sMetadataFormat = $xPackageConfig->getOption('metadata.format');
-        if(!in_array($sMetadataFormat, ['attributes', 'annotations']))
+        if (!in_array($sMetadataFormat, ['attributes', 'annotations']))
         {
             return null;
         }
@@ -248,23 +248,23 @@ 
         $xMetadata = null;
         $xMetadataCache = null;
         $xConfig = $di->config();
-        if($xConfig->getAppOption('metadata.cache.enabled', false))
+        if ($xConfig->getAppOption('metadata.cache.enabled', false))
         {
-            if(!$di->h('jaxon_metadata_cache_dir'))
+            if (!$di->h('jaxon_metadata_cache_dir'))
             {
                 $sCacheDir = $xConfig->getAppOption('metadata.cache.dir');
                 $di->val('jaxon_metadata_cache_dir', $sCacheDir);
             }
             $xMetadataCache = $di->getMetadataCache();
             $xMetadata = $xMetadataCache->read($xReflectionClass->getName());
-            if($xMetadata !== null)
+            if ($xMetadata !== null)
             {
                 return $xMetadata;
             }
         }
 
         $aProperties = array_map(fn($xProperty) => $xProperty->getName(),
-            $xReflectionClass->getProperties(ReflectionProperty::IS_PUBLIC |
+            $xReflectionClass->getProperties(ReflectionProperty::IS_PUBLIC|
                 ReflectionProperty::IS_PROTECTED));
         $aMethods = $this->getPublicMethods($xReflectionClass);
 
@@ -273,7 +273,7 @@ 
         $xMetadata = $xMetadataReader->getAttributes($xInput);
 
         // Try to save the metadata in the cache
-        if($xMetadataCache !== null && $xMetadata !== null)
+        if ($xMetadataCache !== null && $xMetadata !== null)
         {
             $xMetadataCache->save($xReflectionClass->getName(), $xMetadata);
         }
@@ -291,8 +291,7 @@ 
         array $aOptions): ComponentOptions
     {
         $xMetadata = $this->getComponentMetadata($xReflectionClass, $aOptions);
-        return !$xMetadata ? new ComponentOptions($aOptions) :
-            new ComponentOptions($aOptions, $xMetadata->isExcluded(),
+        return !$xMetadata ? new ComponentOptions($aOptions) : new ComponentOptions($aOptions, $xMetadata->isExcluded(),
             $xMetadata->getProtectedMethods(), $xMetadata->getProperties());
     }
 }

jaxon-core/src/Jaxon.php

Switch Indentation +8 added lines, -8 removed lines

@@ -16,23 +16,23 @@
 
 class Jaxon
 {
-    /**
+/**
      * @const string
      */
-    public const VERSION = 'Jaxon 5.x';
+public const VERSION = 'Jaxon 5.x';
 
-    /**
+/**
      * @const string
      */
-    public const CALLABLE_CLASS = 'CallableClass';
+public const CALLABLE_CLASS = 'CallableClass';
 
-    /**
+/**
      * @const string
      */
-    public const CALLABLE_DIR = 'CallableDir';
+public const CALLABLE_DIR = 'CallableDir';
 
-    /**
+/**
      * @const string
      */
-    public const CALLABLE_FUNCTION = 'CallableFunction';
+public const CALLABLE_FUNCTION = 'CallableFunction';
 }

jaxon-core/src/Request/Target.php

Switch Indentation +73 added lines, -73 removed lines

@@ -17,56 +17,56 @@ 
 
 class Target implements TargetInterface
 {
-    /**
+/**
      * The target type for function.
      *
      * @var string
      */
-    const TYPE_FUNCTION = 'TargetFunction';
+const TYPE_FUNCTION = 'TargetFunction';
 
-    /**
+/**
      * The target type for class.
      *
      * @var string
      */
-    const TYPE_CLASS = 'TargetClass';
+const TYPE_CLASS = 'TargetClass';
 
-    /**
+/**
      * The target type.
      *
      * @var string
      */
-    private $sType = '';
+private $sType = '';
 
-    /**
+/**
      * The target function name.
      *
      * @var string
      */
-    private $sFunctionName = '';
+private $sFunctionName = '';
 
-    /**
+/**
      * The target class name.
      *
      * @var string
      */
-    private $sClassName = '';
+private $sClassName = '';
 
-    /**
+/**
      * The target method name.
      *
      * @var string
      */
-    private $sMethodName = '';
+private $sMethodName = '';
 
-    /**
+/**
      * The target method args.
      *
      * @var array
      */
-    private $aMethodArgs = [];
+private $aMethodArgs = [];
 
-    /**
+/**
      * The constructor
      *
      * @param string $sType    The target type
@@ -75,116 +75,116 @@ 
      * @param string $sMethodName    The method name
      * @param array $aMethodArgs    The method args
      */
-    private function __construct(string $sType, string $sFunctionName, string $sClassName, string $sMethodName, array $aMethodArgs = [])
-    {
-        $this->sType = $sType;
-        $this->sFunctionName = $sFunctionName;
-        $this->sClassName = $sClassName;
-        $this->sMethodName = $sMethodName;
-        $this->aMethodArgs = $aMethodArgs;
-    }
+private function __construct(string $sType, string $sFunctionName, string $sClassName, string $sMethodName, array $aMethodArgs = [])
+{
+$this->sType = $sType;
+$this->sFunctionName = $sFunctionName;
+$this->sClassName = $sClassName;
+$this->sMethodName = $sMethodName;
+$this->aMethodArgs = $aMethodArgs;
+}
 
-    /**
+/**
      * Create a target of type Function
      *
      * @param string $sFunctionName    The function name
      *
      * @return Target
      */
-    public static function makeFunction(string $sFunctionName): Target
-    {
-        return new Target(self::TYPE_FUNCTION, $sFunctionName, '', '');
-    }
+public static function makeFunction(string $sFunctionName): Target
+{
+return new Target(self::TYPE_FUNCTION, $sFunctionName, '', '');
+}
 
-    /**
+/**
      * Create a target of type Class
      *
      * @param array $aCall
      *
      * @return Target
      */
-    public static function makeClass(array $aCall): Target
-    {
-        return new Target(self::TYPE_CLASS, '', trim($aCall['name']), trim($aCall['method']));
-    }
+public static function makeClass(array $aCall): Target
+{
+return new Target(self::TYPE_CLASS, '', trim($aCall['name']), trim($aCall['method']));
+}
 
-    /**
+/**
      * Check if the target type is Function.
      *
      * @return bool
      */
-    public function isFunction(): bool
-    {
-        return $this->sType === self::TYPE_FUNCTION;
-    }
+public function isFunction(): bool
+{
+return $this->sType === self::TYPE_FUNCTION;
+}
 
-    /**
+/**
      * Check if the target type is Class.
      *
      * @return bool
      */
-    public function isClass(): bool
-    {
-        return $this->sType === self::TYPE_CLASS;
-    }
+public function isClass(): bool
+{
+return $this->sType === self::TYPE_CLASS;
+}
 
-    /**
+/**
      * The target function name.
      *
      * @return string
      */
-    public function getFunctionName(): string
-    {
-        return $this->sFunctionName;
-    }
+public function getFunctionName(): string
+{
+return $this->sFunctionName;
+}
 
-    /**
+/**
      * The target class name.
      *
      * @return string
      */
-    public function getClassName(): string
-    {
-        return $this->sClassName;
-    }
+public function getClassName(): string
+{
+return $this->sClassName;
+}
 
-    /**
+/**
      * The target method name.
      *
      * @return string
      */
-    public function getMethodName(): string
-    {
-        return $this->sMethodName;
-    }
+public function getMethodName(): string
+{
+return $this->sMethodName;
+}
 
-    /**
+/**
      * Set the target method name.
      *
      * @param array $aMethodArgs
      */
-    public function setMethodArgs(array $aMethodArgs): void
-    {
-        $this->aMethodArgs = $aMethodArgs;
-    }
+public function setMethodArgs(array $aMethodArgs): void
+{
+$this->aMethodArgs = $aMethodArgs;
+}
 
-    /**
+/**
      * The target method name.
      *
      * @return string
      */
-    public function method(): string
-    {
-        return $this->sMethodName;
-    }
+public function method(): string
+{
+return $this->sMethodName;
+}
 
-    /**
+/**
      * The target method args.
      *
      * @return array
      */
-    public function args(): array
-    {
-        return $this->aMethodArgs;
-    }
+public function args(): array
+{
+return $this->aMethodArgs;
+}
 }

jaxon-core/src/Plugin/Request/CallableClass/ComponentRegistry.php

Spacing +30 added lines, -30 removed lines

@@ -110,7 +110,7 @@ 
     public function __construct(protected ComponentContainer $cdi)
     {
         // Set the composer autoloader
-        if(file_exists(($sAutoloadFile = __DIR__ . '/../../../../../../autoload.php')) ||
+        if (file_exists(($sAutoloadFile = __DIR__ . '/../../../../../../autoload.php')) ||
             file_exists(($sAutoloadFile = __DIR__ . '/../../../../../vendor/autoload.php')) ||
             file_exists(($sAutoloadFile = __DIR__ . '/../../../../vendor/autoload.php')))
         {
@@ -179,15 +179,15 @@ 
      */
     private function makeClassOptions(string $sClassName, array $aClassOptions, array $aDirectoryOptions): array
     {
-        foreach($this->aDefaultClassOptions as $sOption => $xValue)
+        foreach ($this->aDefaultClassOptions as $sOption => $xValue)
         {
-            if(!isset($aClassOptions[$sOption]))
+            if (!isset($aClassOptions[$sOption]))
             {
                 $aClassOptions[$sOption] = $xValue;
             }
         }
         $aClassOptions['excluded'] = (bool)($aClassOptions['excluded'] ?? false); // Convert to bool.
-        if(is_string($aClassOptions['protected']))
+        if (is_string($aClassOptions['protected']))
         {
             $aClassOptions['protected'] = [$aClassOptions['protected']]; // Convert to array.
         }
@@ -198,30 +198,30 @@ 
             $aDirectoryOptions['classes']['*'] ?? [], // Options for all classes
             $aDirectoryOptions['classes'][$sClassName] ?? [], // Options for this specific class
         ];
-        foreach($aOptionGroups as $aOptionGroup)
+        foreach ($aOptionGroups as $aOptionGroup)
         {
-            if(isset($aOptionGroup['separator']))
+            if (isset($aOptionGroup['separator']))
             {
                 $aClassOptions['separator'] = (string)$aOptionGroup['separator'];
             }
-            if(isset($aOptionGroup['excluded']))
+            if (isset($aOptionGroup['excluded']))
             {
                 $aClassOptions['excluded'] = (bool)$aOptionGroup['excluded'];
             }
-            if(isset($aOptionGroup['protected']))
+            if (isset($aOptionGroup['protected']))
             {
-                if(is_string($aOptionGroup['protected']))
+                if (is_string($aOptionGroup['protected']))
                 {
                     $aOptionGroup['protected'] = [$aOptionGroup['protected']]; // Convert to array.
                 }
                 $aClassOptions['protected'] = array_merge($aClassOptions['protected'], $aOptionGroup['protected']);
             }
-            if(isset($aOptionGroup['functions']))
+            if (isset($aOptionGroup['functions']))
             {
                 $aClassOptions['functions'] = array_merge($aClassOptions['functions'], $aOptionGroup['functions']);
             }
         }
-        if(isset($aDirectoryOptions['config']) && !isset($aClassOptions['config']))
+        if (isset($aDirectoryOptions['config']) && !isset($aClassOptions['config']))
         {
             $aClassOptions['config'] = $aDirectoryOptions['config'];
         }
@@ -243,7 +243,7 @@ 
     {
         $aOptions = $this->makeClassOptions($sClassName, $aClassOptions, $aDirectoryOptions);
         $this->cdi->saveComponent($sClassName, $aOptions);
-        if($this->bUpdateHash)
+        if ($this->bUpdateHash)
         {
             $this->sHash .= $sClassName . $aOptions['timestamp'];
         }
@@ -261,7 +261,7 @@ 
     {
         // For classes, the underscore is used as separator.
         $aClassOptions['separator'] = '_';
-        if($this->xPackageConfig !== null)
+        if ($this->xPackageConfig !== null)
         {
             $aClassOptions['config'] = $this->xPackageConfig;
         }
@@ -278,10 +278,10 @@ 
     public function getNamespaceComponentOptions(string $sClassName): ?array
     {
         // Find the corresponding namespace
-        foreach($this->aNamespaceOptions as $sNamespace => $aDirectoryOptions)
+        foreach ($this->aNamespaceOptions as $sNamespace => $aDirectoryOptions)
         {
             // Check if the namespace matches the class.
-            if(strncmp($sClassName, $sNamespace . '\\', strlen($sNamespace) + 1) === 0)
+            if (strncmp($sClassName, $sNamespace . '\\', strlen($sNamespace) + 1) === 0)
             {
                 // Save the class options
                 $aClassOptions = ['namespace' => $sNamespace];
@@ -304,11 +304,11 @@ 
         // For directories without namespace, the underscore is used as separator.
         $aOptions['separator'] = '_';
         // Set the autoload option default value
-        if(!isset($aOptions['autoload']))
+        if (!isset($aOptions['autoload']))
         {
             $aOptions['autoload'] = true;
         }
-        if($this->xPackageConfig !== null)
+        if ($this->xPackageConfig !== null)
         {
             $aOptions['config'] = $this->xPackageConfig;
         }
@@ -342,16 +342,16 @@ 
         // For namespaces, the dot is used as separator.
         $aOptions['separator'] = '.';
         // Set the autoload option default value
-        if(!isset($aOptions['autoload']))
+        if (!isset($aOptions['autoload']))
         {
             $aOptions['autoload'] = true;
         }
-        if($this->xPackageConfig !== null)
+        if ($this->xPackageConfig !== null)
         {
             $aOptions['config'] = $this->xPackageConfig;
         }
         // Register the dir with PSR4 autoloading
-        if(($aOptions['autoload']) && $this->xAutoloader != null)
+        if (($aOptions['autoload']) && $this->xAutoloader != null)
         {
             $this->xAutoloader->setPsr4($sNamespace . '\\', $aOptions['directory']);
         }
@@ -367,7 +367,7 @@ 
     public function registerComponentsInNamespaces(): void
     {
         // This is to be done only once.
-        if($this->bNamespacesParsed)
+        if ($this->bNamespacesParsed)
         {
             return;
         }
@@ -375,17 +375,17 @@ 
 
         // Browse directories with namespaces and read all the files.
         $sDS = DIRECTORY_SEPARATOR;
-        foreach($this->aNamespaceOptions as $sNamespace => $aDirectoryOptions)
+        foreach ($this->aNamespaceOptions as $sNamespace => $aDirectoryOptions)
         {
             $this->addNamespace($sNamespace, ['separator' => '.']);
 
             // Iterate on dir content
             $sDirectory = $aDirectoryOptions['directory'];
             $itFile = new SortedFileIterator($sDirectory);
-            foreach($itFile as $xFile)
+            foreach ($itFile as $xFile)
             {
                 // skip everything except PHP files
-                if(!$xFile->isFile() || $xFile->getExtension() !== 'php')
+                if (!$xFile->isFile() || $xFile->getExtension() !== 'php')
                 {
                     continue;
                 }
@@ -394,7 +394,7 @@ 
                 $sClassPath = $sNamespace;
                 $sRelativePath = substr($xFile->getPath(), strlen($sDirectory));
                 $sRelativePath = trim(str_replace($sDS, '\\', $sRelativePath), '\\');
-                if($sRelativePath !== '')
+                if ($sRelativePath !== '')
                 {
                     $sClassPath .= '\\' . $sRelativePath;
                 }
@@ -420,21 +420,21 @@ 
     public function registerComponentsInDirectories(): void
     {
         // This is to be done only once.
-        if($this->bDirectoriesParsed)
+        if ($this->bDirectoriesParsed)
         {
             return;
         }
         $this->bDirectoriesParsed = true;
 
         // Browse directories without namespaces and read all the files.
-        foreach($this->aDirectoryOptions as $sDirectory => $aDirectoryOptions)
+        foreach ($this->aDirectoryOptions as $sDirectory => $aDirectoryOptions)
         {
             $itFile = new SortedFileIterator($sDirectory);
             // Iterate on dir content
-            foreach($itFile as $xFile)
+            foreach ($itFile as $xFile)
             {
                 // Skip everything except PHP files
-                if(!$xFile->isFile() || $xFile->getExtension() !== 'php')
+                if (!$xFile->isFile() || $xFile->getExtension() !== 'php')
                 {
                     continue;
                 }
@@ -444,7 +444,7 @@ 
                     'separator' => '.',
                     'timestamp' => $xFile->getMTime(),
                 ];
-                if(($aDirectoryOptions['autoload']) && $this->xAutoloader !== null)
+                if (($aDirectoryOptions['autoload']) && $this->xAutoloader !== null)
                 {
                     // Set classmap autoloading. Must be done before registering the class.
                     $this->xAutoloader->addClassMap([$sClassName => $xFile->getPathname()]);

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

Spacing +1 added lines, -1 removed lines

@@ -1,4 +1,4 @@
 <?php echo $this->aMethod['name'] ?>: function() { return jaxon.request({ type: 'class', name: '<?php
     echo $this->sJsClass ?>', method: '<?php echo $this->aMethod['name']
-    ?>' }, { parameters: arguments<?php foreach($this->aMethod['options'] as $sKey => $sValue):
+    ?>' }, { parameters: arguments<?php foreach ($this->aMethod['options'] as $sKey => $sValue):
         ?>, <?php echo $sKey ?>: <?php echo $sValue ?><?php endforeach ?> }); },