jaxon-php / jaxon-mono

jaxon-core/src/App/Ajax/Bootstrap.php

Spacing +2 added lines, -2 removed lines

@@ -89,7 +89,7 @@ 
         string $sUri = '', string $sDir = '', string $sType = ''): Bootstrap
     {
         // Don't change the existing assets config.
-        if(!$this->xConfigManager->hasAppOption('assets'))
+        if (!$this->xConfigManager->hasAppOption('assets'))
         {
             $this->xConfigManager->asset($bExport, $bMinify, $sUri, $sDir, $sType);
         }
@@ -144,7 +144,7 @@ 
     {
         // Popping the callbacks makes each of them to be called once.
         $aBootCallbacks = $this->xCallbackManager->popBootCallbacks();
-        foreach($aBootCallbacks as $aBootCallback)
+        foreach ($aBootCallbacks as $aBootCallback)
         {
             call_user_func($aBootCallback);
         }

jaxon-core/src/App/Config/ConfigManager.php

Spacing +13 added lines, -14 removed lines

@@ -75,22 +75,22 @@ 
         {
             return $this->xConfigReader->read($sConfigFile);
         }
-        catch(YamlExtension $e)
+        catch (YamlExtension $e)
         {
             $sMessage = $this->xTranslator->trans('errors.yaml.install');
             throw new SetupException($sMessage);
         }
-        catch(FileExtension $e)
+        catch (FileExtension $e)
         {
             $sMessage = $this->xTranslator->trans('errors.file.extension', ['path' => $sConfigFile]);
             throw new SetupException($sMessage);
         }
-        catch(FileAccess $e)
+        catch (FileAccess $e)
         {
             $sMessage = $this->xTranslator->trans('errors.file.access', ['path' => $sConfigFile]);
             throw new SetupException($sMessage);
         }
-        catch(FileContent $e)
+        catch (FileContent $e)
         {
             $sMessage = $this->xTranslator->trans('errors.file.content', ['path' => $sConfigFile]);
             throw new SetupException($sMessage);
@@ -116,7 +116,7 @@ 
             // Call the config change listeners.
             $this->xEventManager->libConfigChanged($this->xLibConfig, '');
         }
-        catch(DataDepth $e)
+        catch (DataDepth $e)
         {
             $sMessage = $this->xTranslator->trans('errors.data.depth', [
                 'key' => $e->sPrefix,
@@ -145,7 +145,7 @@ 
             $this->xEventManager->libConfigChanged($this->xLibConfig, '');
             return $this->xLibConfig->changed();
         }
-        catch(DataDepth $e)
+        catch (DataDepth $e)
         {
             $sMessage = $this->xTranslator->trans('errors.data.depth', [
                 'key' => $e->sPrefix,
@@ -252,7 +252,7 @@ 
             $this->xEventManager->appConfigChanged($this->xAppConfig, '');
             return $this->xAppConfig->changed();
         }
-        catch(DataDepth $e)
+        catch (DataDepth $e)
         {
             $sMessage = $this->xTranslator->trans('errors.data.depth', [
                 'key' => $e->sPrefix,
@@ -314,7 +314,7 @@ 
         {
             return $this->xConfigSetter->newConfig($aOptions, $sNamePrefix);
         }
-        catch(DataDepth $e)
+        catch (DataDepth $e)
         {
             $sMessage = $this->xTranslator->trans('errors.data.depth', [
                 'key' => $e->sPrefix,
@@ -363,7 +363,7 @@ 
      */
     public function globals(bool $bForce = false): void
     {
-        if($bForce || $this->getAppOption('helpers.global', true))
+        if ($bForce || $this->getAppOption('helpers.global', true))
         {
             require_once dirname(__DIR__, 2) . '/globals.php';
         }
@@ -374,15 +374,14 @@ 
      */
     public function getExportConfig(): Config
     {
-        if($this->xExportConfig !== null)
+        if ($this->xExportConfig !== null)
         {
             return $this->xExportConfig;
         }
 
         // Copy the assets options in a new config object.
         return $this->xExportConfig = $this->hasAppOption('assets') ?
-            $this->xConfigSetter->newConfig($this->getAppOption('assets')) :
-            // Convert the options in the "lib" section to the same format as in the "app" section.
+            $this->xConfigSetter->newConfig($this->getAppOption('assets')) : // Convert the options in the "lib" section to the same format as in the "app" section.
             $this->xConfigSetter->newConfig([
                 'js' => $this->getOption('js.app'),
                 'include' => $this->getOption('assets.include'),
@@ -409,11 +408,11 @@ 
             'export' => $bExport,
             'minify' => $bMinify,
         ];
-        if($sUri !== '')
+        if ($sUri !== '')
         {
             $aJsOptions['uri'] = $sUri;
         }
-        if($sDir !== '')
+        if ($sDir !== '')
         {
             $aJsOptions['dir'] = $sDir;
         }

jaxon-config/src/Config.php

Switch Indentation +42 added lines, -42 removed lines

@@ -24,36 +24,36 @@ 
 
 class Config
 {
-    /**
+/**
      * The constructor
      *
      * @param array $aValues
      * @param bool $bChanged
      */
-    public function __construct(private array $aValues = [], private bool $bChanged = true)
-    {}
+public function __construct(private array $aValues = [], private bool $bChanged = true)
+{}
 
-    /**
+/**
      * Get the config values
      *
      * @return array
      */
-    public function getValues(): array
-    {
-        return $this->aValues;
-    }
+public function getValues(): array
+{
+return $this->aValues;
+}
 
-    /**
+/**
      * If the values has changed
      *
      * @return bool
      */
-    public function changed(): bool
-    {
-        return $this->bChanged;
-    }
+public function changed(): bool
+{
+return $this->bChanged;
+}
 
-    /**
+/**
      * Get the value of a config option
      *
      * @param string $sName The option name
@@ -61,47 +61,47 @@ 
      *
      * @return mixed
      */
-    public function getOption(string $sName, $xDefault = null)
-    {
-        return $sName === '' ? $this->aValues : $this->aValues[$sName] ?? $xDefault;
-    }
+public function getOption(string $sName, $xDefault = null)
+{
+return $sName === '' ? $this->aValues : $this->aValues[$sName] ?? $xDefault;
+}
 
-    /**
+/**
      * Check the presence of a config option
      *
      * @param string $sName The option name
      *
      * @return bool
      */
-    public function hasOption(string $sName): bool
-    {
-        return array_key_exists($sName, $this->aValues);
-    }
+public function hasOption(string $sName): bool
+{
+return array_key_exists($sName, $this->aValues);
+}
 
-    /**
+/**
      * Get the names of the options under a given key
      *
      * @param string $sKey The prefix to match
      *
      * @return array
      */
-    public function getOptionNames(string $sKey): array
-    {
-        $sKey = trim($sKey, ' .');
-        $aKeys = Value::explodeName($sKey);
-        $aValues = $this->aValues;
-        foreach($aKeys as $_sKey)
-        {
-            $aValues = $aValues[$_sKey] ?? [];
-        }
-        if(!Value::containsOptions($aValues))
-        {
-            return [];
-        }
+public function getOptionNames(string $sKey): array
+{
+$sKey = trim($sKey, ' .');
+$aKeys = Value::explodeName($sKey);
+$aValues = $this->aValues;
+foreach($aKeys as $_sKey)
+{
+$aValues = $aValues[$_sKey] ?? [];
+}
+if(!Value::containsOptions($aValues))
+{
+return [];
+}
 
-        // The returned value is an array with short names as keys and full names as values.
-        $aNames = array_keys($aValues);
-        $aFullNames = array_map(fn($sName) => "$sKey.$sName", $aNames);
-        return array_combine($aNames, $aFullNames);
-    }
+// The returned value is an array with short names as keys and full names as values.
+$aNames = array_keys($aValues);
+$aFullNames = array_map(fn($sName) => "$sKey.$sName", $aNames);
+return array_combine($aNames, $aFullNames);
+}
 }

jaxon-storage/tests/TestStorage/StorageTest.php

Switch Indentation +147 added lines, -147 removed lines

@@ -15,163 +15,163 @@
 
 class StorageTest extends TestCase
 {
-    /**
+/**
      * @var StorageManager
      */
-    protected $xManager;
+protected $xManager;
 
-    /**
+/**
      * @var string
      */
-    protected $sInputDir;
+protected $sInputDir;
 
-    public function setUp(): void
-    {
-        $this->sInputDir = dirname(__DIR__) . '/files';
-        $this->xManager = storage();
-    }
+public function setUp(): void
+{
+$this->sInputDir = dirname(__DIR__) . '/files';
+$this->xManager = storage();
+}
 
-    public function tearDown(): void
-    {
-        jaxon()->reset();
-        parent::tearDown();
-    }
+public function tearDown(): void
+{
+jaxon()->reset();
+parent::tearDown();
+}
 
-    /**
+/**
      * @throws Exception
      */
-    public function testStorageReader()
-    {
-        $xInputStorage = $this->xManager->adapter('local')->make($this->sInputDir);
-        $sInputContent = $xInputStorage->read('hello.txt');
-
-        $this->assertEquals(file_get_contents("{$this->sInputDir}/hello.txt"), $sInputContent);
-    }
-
-    public function testAdapterAndDirOptions()
-    {
-        jaxon()->config()->setAppOptions([
-            'adapters' => [
-                'files' => [
-                    'alias' => 'local',
-                    'options' => [
-                        'lazyRootCreation' => false, // Create dirs if they don't exist.
-                    ],
-                ],
-            ],
-            'stores' => [
-                'files' => [
-                    'adapter' => 'files',
-                    'dir' => $this->sInputDir,
-                    'options' => [
-                        'config' => [
-                            'public_url' => '/static/files',
-                        ],
-                    ],
-                ],
-            ],
-        ], 'storage');
-
-        $xInputStorage = $this->xManager->get('files');
-        $sInputContent = $xInputStorage->read('hello.txt');
-
-        $this->assertEquals(file_get_contents("{$this->sInputDir}/hello.txt"), $sInputContent);
-        $this->assertEquals('/static/files/hello.txt', $xInputStorage->publicUrl('hello.txt'));
-    }
-
-    public function testWriteError()
-    {
-        jaxon()->config()->setAppOptions([
-            'adapters' => [
-                'files' => [
-                    'alias' => 'local',
-                    'options' => [
-                        'lazyRootCreation' => true, // Don't create dirs if they don't exist.
-                    ],
-                ],
+public function testStorageReader()
+{
+$xInputStorage = $this->xManager->adapter('local')->make($this->sInputDir);
+$sInputContent = $xInputStorage->read('hello.txt');
+
+$this->assertEquals(file_get_contents("{$this->sInputDir}/hello.txt"), $sInputContent);
+}
+
+public function testAdapterAndDirOptions()
+{
+jaxon()->config()->setAppOptions([
+'adapters' => [
+    'files' => [
+        'alias' => 'local',
+        'options' => [
+            'lazyRootCreation' => false, // Create dirs if they don't exist.
+        ],
+    ],
+],
+'stores' => [
+    'files' => [
+        'adapter' => 'files',
+        'dir' => $this->sInputDir,
+        'options' => [
+            'config' => [
+                'public_url' => '/static/files',
             ],
-            'stores' => [
-                'files' => [
-                    'adapter' => 'files',
-                    'dir' => dirname(__DIR__ . '/files'),
-                    'options' => [
-                        'config' => [
-                            'public_url' => '/static/files',
-                        ],
-                    ],
-                ],
+        ],
+    ],
+],
+], 'storage');
+
+$xInputStorage = $this->xManager->get('files');
+$sInputContent = $xInputStorage->read('hello.txt');
+
+$this->assertEquals(file_get_contents("{$this->sInputDir}/hello.txt"), $sInputContent);
+$this->assertEquals('/static/files/hello.txt', $xInputStorage->publicUrl('hello.txt'));
+}
+
+public function testWriteError()
+{
+jaxon()->config()->setAppOptions([
+'adapters' => [
+    'files' => [
+        'alias' => 'local',
+        'options' => [
+            'lazyRootCreation' => true, // Don't create dirs if they don't exist.
+        ],
+    ],
+],
+'stores' => [
+    'files' => [
+        'adapter' => 'files',
+        'dir' => dirname(__DIR__ . '/files'),
+        'options' => [
+            'config' => [
+                'public_url' => '/static/files',
             ],
-        ], 'storage');
-
-        $this->expectException(CorruptedPathDetected::class);
-        $xInputStorage = $this->xManager->get('files');
-        $sInputContent = $xInputStorage->read("\0hello.txt");
-    }
-
-    public function testStorageWriter()
-    {
-        $this->xManager->register('memory', fn() => new InMemoryFilesystemAdapter());
-        jaxon()->config()->setAppOptions([
-            'adapter' => 'memory',
-            'dir' => 'files',
-            'options' => [],
-        ], 'storage.stores.memory');
-
-        $xInputStorage = $this->xManager->adapter('local')->make($this->sInputDir);
-        $sInputContent = $xInputStorage->read('hello.txt');
-
-        $xOutputStorage = $this->xManager->get('memory');
-        $xOutputStorage->write('hello.txt', $sInputContent);
-        $sOutputContent = $xOutputStorage->read('hello.txt');
-
-        $this->assertEquals($sOutputContent, $sInputContent);
-    }
-
-    public function testErrorUnknownAdapter()
-    {
-        $this->expectException(Exception::class);
-        $xUnknownStorage = $this->xManager->adapter('unknown')->make($this->sInputDir);
-    }
-
-    public function testErrorUnknownConfig()
-    {
-        $this->expectException(Exception::class);
-        $xUnknownStorage = $this->xManager->get('unknown');
-    }
-
-    public function testErrorIncorrectConfigAdapter()
-    {
-        jaxon()->config()->setAppOptions([
-            'adapter' => null,
-            'dir' => 'files',
-            'options' => [],
-        ], 'storage.stores.custom');
-
-        $this->expectException(Exception::class);
-        $xErrorStorage = $this->xManager->get('custom');
-    }
-
-    public function testErrorIncorrectConfigDir()
-    {
-        jaxon()->config()->setAppOptions([
-            'adapter' => 'memory',
-            'dir' => null,
-            'options' => [],
-        ], 'storage.stores.custom');
-
-        $this->expectException(Exception::class);
-        $xErrorStorage = $this->xManager->get('custom');
-    }
-
-    public function testErrorIncorrectConfigOptions()
-    {
-        jaxon()->config()->setAppOptions([
-            'adapter' => 'memory',
-            'dir' => 'files',
-            'options' => null,
-        ], 'storage.stores.custom');
-
-        $this->expectException(Exception::class);
-        $xErrorStorage = $this->xManager->get('custom');
-    }
+        ],
+    ],
+],
+], 'storage');
+
+$this->expectException(CorruptedPathDetected::class);
+$xInputStorage = $this->xManager->get('files');
+$sInputContent = $xInputStorage->read("\0hello.txt");
+}
+
+public function testStorageWriter()
+{
+$this->xManager->register('memory', fn() => new InMemoryFilesystemAdapter());
+jaxon()->config()->setAppOptions([
+'adapter' => 'memory',
+'dir' => 'files',
+'options' => [],
+], 'storage.stores.memory');
+
+$xInputStorage = $this->xManager->adapter('local')->make($this->sInputDir);
+$sInputContent = $xInputStorage->read('hello.txt');
+
+$xOutputStorage = $this->xManager->get('memory');
+$xOutputStorage->write('hello.txt', $sInputContent);
+$sOutputContent = $xOutputStorage->read('hello.txt');
+
+$this->assertEquals($sOutputContent, $sInputContent);
+}
+
+public function testErrorUnknownAdapter()
+{
+$this->expectException(Exception::class);
+$xUnknownStorage = $this->xManager->adapter('unknown')->make($this->sInputDir);
+}
+
+public function testErrorUnknownConfig()
+{
+$this->expectException(Exception::class);
+$xUnknownStorage = $this->xManager->get('unknown');
+}
+
+public function testErrorIncorrectConfigAdapter()
+{
+jaxon()->config()->setAppOptions([
+'adapter' => null,
+'dir' => 'files',
+'options' => [],
+], 'storage.stores.custom');
+
+$this->expectException(Exception::class);
+$xErrorStorage = $this->xManager->get('custom');
+}
+
+public function testErrorIncorrectConfigDir()
+{
+jaxon()->config()->setAppOptions([
+'adapter' => 'memory',
+'dir' => null,
+'options' => [],
+], 'storage.stores.custom');
+
+$this->expectException(Exception::class);
+$xErrorStorage = $this->xManager->get('custom');
+}
+
+public function testErrorIncorrectConfigOptions()
+{
+jaxon()->config()->setAppOptions([
+'adapter' => 'memory',
+'dir' => 'files',
+'options' => null,
+], 'storage.stores.custom');
+
+$this->expectException(Exception::class);
+$xErrorStorage = $this->xManager->get('custom');
+}
 }