jaxon-php / jaxon-mono

jaxon-utils/tests/translations/test.fr.php

Switch Indentation +8 added lines, -8 removed lines

@@ -1,12 +1,12 @@
 <?php
 
 return [
-    'salutations' => [
-        'morning' => "Bonjour",
-        'afternoon' => "Bonsoir",
-    ],
-    'placeholders' => [
-        'morning' => "Bonjour :title :name",
-        'afternoon' => "Bonsoir :title :name",
-    ],
+'salutations' => [
+'morning' => "Bonjour",
+'afternoon' => "Bonsoir",
+],
+'placeholders' => [
+'morning' => "Bonjour :title :name",
+'afternoon' => "Bonsoir :title :name",
+],
 ];

jaxon-utils/tests/TestUriDetector/UriDetectorTest.php

Switch Indentation +180 added lines, -180 removed lines

@@ -8,202 +8,202 @@
 
 final class UriDetectorTest extends TestCase
 {
-    /**
+/**
      * @var UriDetector
      */
-    protected $xUriDetector;
+protected $xUriDetector;
 
-    protected function setUp(): void
-    {
-        $this->xUriDetector = new UriDetector();
-    }
+protected function setUp(): void
+{
+$this->xUriDetector = new UriDetector();
+}
 
-    /**
+/**
      * @throws UriException
      */
-    public function testUri()
-    {
-        $this->assertEquals('http://example.test/path', $this->xUriDetector->detect([
-            'REQUEST_URI' => 'http://example.test/path'
-        ]));
-    }
-
-    /**
+public function testUri()
+{
+$this->assertEquals('http://example.test/path', $this->xUriDetector->detect([
+'REQUEST_URI' => 'http://example.test/path'
+]));
+}
+
+/**
      * @throws UriException
      */
-    public function testUriWithParam()
-    {
-        $this->assertEquals('http://example.test/path?param1=value1&param2=%22value2%22',
-            $this->xUriDetector->detect([
-                'REQUEST_URI' => 'http://example.test/path?param1=value1&param2="value2"',
-            ])
-        );
-    }
-
-    /**
+public function testUriWithParam()
+{
+$this->assertEquals('http://example.test/path?param1=value1&param2=%22value2%22',
+$this->xUriDetector->detect([
+    'REQUEST_URI' => 'http://example.test/path?param1=value1&param2="value2"',
+])
+);
+}
+
+/**
      * @throws UriException
      */
-    public function testUriWithUser()
-    {
-        $this->assertEquals('http://user@example.test/path', $this->xUriDetector->detect([
-            'REQUEST_URI' => 'http://user@example.test/path'
-        ]));
-    }
-
-    /**
+public function testUriWithUser()
+{
+$this->assertEquals('http://user@example.test/path', $this->xUriDetector->detect([
+'REQUEST_URI' => 'http://user@example.test/path'
+]));
+}
+
+/**
      * @throws UriException
      */
-    public function testUriWithUserAndPass()
-    {
-        $this->assertEquals('http://user:pass@example.test/path', $this->xUriDetector->detect([
-            'REQUEST_URI' => 'http://user:pass@example.test/path'
-        ]));
-    }
-
-    /**
+public function testUriWithUserAndPass()
+{
+$this->assertEquals('http://user:pass@example.test/path', $this->xUriDetector->detect([
+'REQUEST_URI' => 'http://user:pass@example.test/path'
+]));
+}
+
+/**
      * @throws UriException
      */
-    public function testUriWithEmptyBasename()
-    {
-        $this->assertEquals('http://example.test/', $this->xUriDetector->detect([
-            'REQUEST_URI' => 'http://example.test//'
-        ]));
-    }
-
-    /**
+public function testUriWithEmptyBasename()
+{
+$this->assertEquals('http://example.test/', $this->xUriDetector->detect([
+'REQUEST_URI' => 'http://example.test//'
+]));
+}
+
+/**
      * @throws UriException
      */
-    public function testUriWithParts()
-    {
-        $this->assertEquals('http://example.test/path?param1=value1&param2=%22value2%22',
-            $this->xUriDetector->detect([
-                'HTTP_SCHEME' => 'http',
-                'HTTP_HOST' => 'example.test',
-                'PATH_INFO' => '/path',
-                'QUERY_STRING' => 'param1=value1&param2="value2"',
-            ])
-        );
-        $this->assertEquals('http://example.test/path?param1=value1&param2=%22value2%22',
-            $this->xUriDetector->detect([
-                'HTTPS' => 'off',
-                'HTTP_HOST' => 'example.test',
-                'PATH_INFO' => '/path',
-                'QUERY_STRING' => 'param1=value1&param2="value2"',
-            ])
-        );
-        $this->assertEquals('https://example.test:8080/path',
-            $this->xUriDetector->detect([
-                'HTTPS' => 'on',
-                'SERVER_NAME' => 'example.test:8080',
-                'PATH_INFO' => '/path',
-            ])
-        );
-        $this->assertEquals('https://example.test:8080/path',
-            $this->xUriDetector->detect([
-                'HTTPS' => 'on',
-                'SERVER_NAME' => 'example.test',
-                'SERVER_PORT' => '8080',
-                'PATH_INFO' => '/path',
-            ])
-        );
-        $this->assertEquals('https://example.test:8080/path',
-            $this->xUriDetector->detect([
-                'HTTP_X_FORWARDED_SSL' => 'on',
-                'SERVER_NAME' => 'example.test:8080',
-                'PATH_INFO' => '/path',
-            ])
-        );
-        $this->assertEquals('https://example.test:8080/path',
-            $this->xUriDetector->detect([
-                'HTTP_X_FORWARDED_PROTO' => 'https',
-                'SERVER_NAME' => 'example.test:8080',
-                'PATH_INFO' => '/path',
-            ])
-        );
-    }
-
-    /**
+public function testUriWithParts()
+{
+$this->assertEquals('http://example.test/path?param1=value1&param2=%22value2%22',
+$this->xUriDetector->detect([
+    'HTTP_SCHEME' => 'http',
+    'HTTP_HOST' => 'example.test',
+    'PATH_INFO' => '/path',
+    'QUERY_STRING' => 'param1=value1&param2="value2"',
+])
+);
+$this->assertEquals('http://example.test/path?param1=value1&param2=%22value2%22',
+$this->xUriDetector->detect([
+    'HTTPS' => 'off',
+    'HTTP_HOST' => 'example.test',
+    'PATH_INFO' => '/path',
+    'QUERY_STRING' => 'param1=value1&param2="value2"',
+])
+);
+$this->assertEquals('https://example.test:8080/path',
+$this->xUriDetector->detect([
+    'HTTPS' => 'on',
+    'SERVER_NAME' => 'example.test:8080',
+    'PATH_INFO' => '/path',
+])
+);
+$this->assertEquals('https://example.test:8080/path',
+$this->xUriDetector->detect([
+    'HTTPS' => 'on',
+    'SERVER_NAME' => 'example.test',
+    'SERVER_PORT' => '8080',
+    'PATH_INFO' => '/path',
+])
+);
+$this->assertEquals('https://example.test:8080/path',
+$this->xUriDetector->detect([
+    'HTTP_X_FORWARDED_SSL' => 'on',
+    'SERVER_NAME' => 'example.test:8080',
+    'PATH_INFO' => '/path',
+])
+);
+$this->assertEquals('https://example.test:8080/path',
+$this->xUriDetector->detect([
+    'HTTP_X_FORWARDED_PROTO' => 'https',
+    'SERVER_NAME' => 'example.test:8080',
+    'PATH_INFO' => '/path',
+])
+);
+}
+
+/**
      * @throws UriException
      */
-    public function testRemoveJaxonParam()
-    {
-        $this->assertEquals('http://example.test/path', $this->xUriDetector->detect([
-            'REQUEST_URI' => 'http://example.test/path?jxnGenerate=true'
-        ]));
-        $this->assertEquals('http://example.test/path?param1=value1&param2=%22value2%22',
-            $this->xUriDetector->detect([
-                'REQUEST_URI' => 'http://example.test/path?param1=value1&jxnGenerate=true&param2="value2"',
-            ])
-        );
-    }
-
-    public function testErrorMissingHost()
-    {
-        $this->expectException(UriException::class);
-        $this->xUriDetector->detect([
-            'HTTPS' => 'on',
-            'PATH_INFO' => '/path',
-            'QUERY_STRING' => 'param1=value1&param2="value2"',
-        ]);
-    }
-
-    public function testRedirectSimpleUrl()
-    {
-        $this->assertEquals('http://example.test/path',
-            $this->xUriDetector->redirect('http://example.test/path', []));
-    }
-
-    public function testRedirectUrlWithAnchor()
-    {
-        $this->assertEquals('http://example.test/path?param=value#anchor',
-            $this->xUriDetector->redirect('http://example.test/path?param=value#anchor', []));
-    }
-
-    public function testRedirectUrlWithParam()
-    {
-        $this->assertEquals('http://example.test/path?param=value',
-            $this->xUriDetector->redirect('http://example.test/path?param=value', []));
-    }
-
-    public function testRedirectUrlWithParams()
-    {
-        $this->assertEquals('http://example.test/path?param1=value1&param2=value2',
-            $this->xUriDetector->redirect('http://example.test/path?param1=value1&param2=value2', []));
-    }
-
-    public function testRedirectUrlWithSpecialChars()
-    {
-        $this->assertEquals('http://example.test/path?param1=%22value1%22&param2=%25value2%25#anchor',
-            $this->xUriDetector->redirect('http://example.test/path?param1="value1"&param2=%value2%#anchor', []));
-    }
-
-    public function testRedirectSpecialUrl()
-    {
-        $this->assertEquals('http://example.test/?query1234',
-            $this->xUriDetector->redirect('http://example.test/?query1234', []));
-
-        $this->assertEquals('http://example.test/?query1234=',
-            $this->xUriDetector->redirect('http://example.test/?query1234=', []));
-
-        $this->assertEquals('http://example.test/?param=value&query1234=0',
-            $this->xUriDetector->redirect('http://example.test/?param=value&query1234=0', []));
-    }
-
-    public function testRedirectEncodedUrl()
-    {
-        $this->assertEquals('http://example.test/path?param1=%22value1%22&param2=%25value2%25',
-            $this->xUriDetector->redirect('http://example.test/path?param1=%22value1%22&param2=%25value2%25', []));
-    }
-
-    public function testRedirectUnexpectedUrl()
-    {
-        $this->assertEquals('http://example.test/',
-            $this->xUriDetector->redirect('http://example.test/? ', []));
-    }
-
-    public function testRedirectQueryString()
-    {
-        $this->assertEquals('http://example.test/?param1=value1',
-            $this->xUriDetector->redirect('http://example.test/? ', ['QUERY_STRING' => 'param1=value1']));
-    }
+public function testRemoveJaxonParam()
+{
+$this->assertEquals('http://example.test/path', $this->xUriDetector->detect([
+'REQUEST_URI' => 'http://example.test/path?jxnGenerate=true'
+]));
+$this->assertEquals('http://example.test/path?param1=value1&param2=%22value2%22',
+$this->xUriDetector->detect([
+    'REQUEST_URI' => 'http://example.test/path?param1=value1&jxnGenerate=true&param2="value2"',
+])
+);
+}
+
+public function testErrorMissingHost()
+{
+$this->expectException(UriException::class);
+$this->xUriDetector->detect([
+'HTTPS' => 'on',
+'PATH_INFO' => '/path',
+'QUERY_STRING' => 'param1=value1&param2="value2"',
+]);
+}
+
+public function testRedirectSimpleUrl()
+{
+$this->assertEquals('http://example.test/path',
+$this->xUriDetector->redirect('http://example.test/path', []));
+}
+
+public function testRedirectUrlWithAnchor()
+{
+$this->assertEquals('http://example.test/path?param=value#anchor',
+$this->xUriDetector->redirect('http://example.test/path?param=value#anchor', []));
+}
+
+public function testRedirectUrlWithParam()
+{
+$this->assertEquals('http://example.test/path?param=value',
+$this->xUriDetector->redirect('http://example.test/path?param=value', []));
+}
+
+public function testRedirectUrlWithParams()
+{
+$this->assertEquals('http://example.test/path?param1=value1&param2=value2',
+$this->xUriDetector->redirect('http://example.test/path?param1=value1&param2=value2', []));
+}
+
+public function testRedirectUrlWithSpecialChars()
+{
+$this->assertEquals('http://example.test/path?param1=%22value1%22&param2=%25value2%25#anchor',
+$this->xUriDetector->redirect('http://example.test/path?param1="value1"&param2=%value2%#anchor', []));
+}
+
+public function testRedirectSpecialUrl()
+{
+$this->assertEquals('http://example.test/?query1234',
+$this->xUriDetector->redirect('http://example.test/?query1234', []));
+
+$this->assertEquals('http://example.test/?query1234=',
+$this->xUriDetector->redirect('http://example.test/?query1234=', []));
+
+$this->assertEquals('http://example.test/?param=value&query1234=0',
+$this->xUriDetector->redirect('http://example.test/?param=value&query1234=0', []));
+}
+
+public function testRedirectEncodedUrl()
+{
+$this->assertEquals('http://example.test/path?param1=%22value1%22&param2=%25value2%25',
+$this->xUriDetector->redirect('http://example.test/path?param1=%22value1%22&param2=%25value2%25', []));
+}
+
+public function testRedirectUnexpectedUrl()
+{
+$this->assertEquals('http://example.test/',
+$this->xUriDetector->redirect('http://example.test/? ', []));
+}
+
+public function testRedirectQueryString()
+{
+$this->assertEquals('http://example.test/?param1=value1',
+$this->xUriDetector->redirect('http://example.test/? ', ['QUERY_STRING' => 'param1=value1']));
+}
 }

jaxon-utils/src/Template/TemplateEngine.php

Switch Indentation +24 added lines, -24 removed lines

@@ -19,33 +19,33 @@ 
 
 class TemplateEngine
 {
-    /**
+/**
      * The default namespace
      *
      * @var string
      */
-    protected $sDefaultNamespace = '';
+protected $sDefaultNamespace = '';
 
-    /**
+/**
      * The namespaces
      *
      * @var array
      */
-    protected $aNamespaces;
+protected $aNamespaces;
 
-    /**
+/**
      * Set the default namespace
      *
      * @param string $sDefaultNamespace
      *
      * @return void
      */
-    public function setDefaultNamespace(string $sDefaultNamespace): void
-    {
-        $this->sDefaultNamespace = $sDefaultNamespace;
-    }
+public function setDefaultNamespace(string $sDefaultNamespace): void
+{
+$this->sDefaultNamespace = $sDefaultNamespace;
+}
 
-    /**
+/**
      * Add a namespace to the template system
      *
      * @param string $sNamespace The namespace name
@@ -54,16 +54,16 @@ 
      *
      * @return static
      */
-    public function addNamespace(string $sNamespace, string $sDirectory, string $sExtension = ''): static
-    {
-        $this->aNamespaces[$sNamespace] = [
-            'directory' => rtrim(trim($sDirectory), "/\\") . DIRECTORY_SEPARATOR,
-            'extension' => $sExtension,
-        ];
-        return $this;
-    }
+public function addNamespace(string $sNamespace, string $sDirectory, string $sExtension = ''): static
+{
+$this->aNamespaces[$sNamespace] = [
+'directory' => rtrim(trim($sDirectory), "/\\") . DIRECTORY_SEPARATOR,
+'extension' => $sExtension,
+];
+return $this;
+}
 
-    /**
+/**
      * Render a template
      *
      * @param string $sTemplate The name of template to be rendered
@@ -71,9 +71,9 @@ 
      *
      * @return string
      */
-    public function render(string $sTemplate, array $aVars = []): string
-    {
-        $context = new Context($this->aNamespaces, $this->sDefaultNamespace, $sTemplate);
-        return $context->__render($aVars);
-    }
+public function render(string $sTemplate, array $aVars = []): string
+{
+$context = new Context($this->aNamespaces, $this->sDefaultNamespace, $sTemplate);
+return $context->__render($aVars);
+}
 }

jaxon-flot/src/register.php

Spacing +1 added lines, -1 removed lines

@@ -30,7 +30,7 @@
 function register(): void
 {
     // Do nothing if running in cli.
-    if(php_sapi_name() !== 'cli')
+    if (php_sapi_name() !== 'cli')
     {
         _register();
     };

jaxon-core/src/App/Metadata/Metadata.php

Switch Indentation +101 added lines, -101 removed lines

@@ -21,161 +21,161 @@
 
 class Metadata
 {
-    /**
+/**
      * @var array<string, array<string, Data\AbstractData>>
      */
-    private array $aAttributes = [
-        'exclude' => [],
-        'container' => [],
-        'databag' => [],
-        'callback' => [],
-        'before' => [],
-        'after' => [],
-        'upload' => [],
-    ];
-
-    /**
+private array $aAttributes = [
+'exclude' => [],
+'container' => [],
+'databag' => [],
+'callback' => [],
+'before' => [],
+'after' => [],
+'upload' => [],
+];
+
+/**
      * @return array<string, array<string, Data\AbstractData>>
      */
-    public function getAttributes(): array
-    {
-        return $this->aAttributes;
-    }
+public function getAttributes(): array
+{
+return $this->aAttributes;
+}
 
-    /**
+/**
      * @param string $sMethod
      *
      * @return Data\ExcludeData
      */
-    public function exclude(string $sMethod = '*'): Data\ExcludeData
-    {
-        return $this->aAttributes['exclude'][$sMethod] ??
-            $this->aAttributes['exclude'][$sMethod] = new Data\ExcludeData();
-    }
+public function exclude(string $sMethod = '*'): Data\ExcludeData
+{
+return $this->aAttributes['exclude'][$sMethod] ??
+$this->aAttributes['exclude'][$sMethod] = new Data\ExcludeData();
+}
 
-    /**
+/**
      * @param string $sMethod
      *
      * @return Data\ContainerData
      */
-    public function container(string $sMethod = '*'): Data\ContainerData
-    {
-        return $this->aAttributes['container'][$sMethod] ??
-            $this->aAttributes['container'][$sMethod] = new Data\ContainerData();
-    }
+public function container(string $sMethod = '*'): Data\ContainerData
+{
+return $this->aAttributes['container'][$sMethod] ??
+$this->aAttributes['container'][$sMethod] = new Data\ContainerData();
+}
 
-    /**
+/**
      * @param string $sMethod
      *
      * @return Data\DatabagData
      */
-    public function databag(string $sMethod = '*'): Data\DatabagData
-    {
-        return $this->aAttributes['databag'][$sMethod] ??
-            $this->aAttributes['databag'][$sMethod] = new Data\DatabagData();
-    }
+public function databag(string $sMethod = '*'): Data\DatabagData
+{
+return $this->aAttributes['databag'][$sMethod] ??
+$this->aAttributes['databag'][$sMethod] = new Data\DatabagData();
+}
 
-    /**
+/**
      * @param string $sMethod
      *
      * @return Data\CallbackData
      */
-    public function callback(string $sMethod = '*'): Data\CallbackData
-    {
-        return $this->aAttributes['callback'][$sMethod] ??
-            $this->aAttributes['callback'][$sMethod] = new Data\CallbackData();
-    }
+public function callback(string $sMethod = '*'): Data\CallbackData
+{
+return $this->aAttributes['callback'][$sMethod] ??
+$this->aAttributes['callback'][$sMethod] = new Data\CallbackData();
+}
 
-    /**
+/**
      * @param string $sMethod
      *
      * @return Data\BeforeData
      */
-    public function before(string $sMethod = '*'): Data\BeforeData
-    {
-        return $this->aAttributes['before'][$sMethod] ??
-            $this->aAttributes['before'][$sMethod] = new Data\BeforeData();
-    }
+public function before(string $sMethod = '*'): Data\BeforeData
+{
+return $this->aAttributes['before'][$sMethod] ??
+$this->aAttributes['before'][$sMethod] = new Data\BeforeData();
+}
 
-    /**
+/**
      * @param string $sMethod
      *
      * @return Data\AfterData
      */
-    public function after(string $sMethod = '*'): Data\AfterData
-    {
-        return $this->aAttributes['after'][$sMethod] ??
-            $this->aAttributes['after'][$sMethod] = new Data\AfterData();
-    }
+public function after(string $sMethod = '*'): Data\AfterData
+{
+return $this->aAttributes['after'][$sMethod] ??
+$this->aAttributes['after'][$sMethod] = new Data\AfterData();
+}
 
-    /**
+/**
      * @param string $sMethod
      *
      * @return Data\UploadData
      */
-    public function upload(string $sMethod = '*'): Data\UploadData
-    {
-        return $this->aAttributes['upload'][$sMethod] ??
-            $this->aAttributes['upload'][$sMethod] = new Data\UploadData();
-    }
+public function upload(string $sMethod = '*'): Data\UploadData
+{
+return $this->aAttributes['upload'][$sMethod] ??
+$this->aAttributes['upload'][$sMethod] = new Data\UploadData();
+}
 
-    /**
+/**
      * True if the class is excluded
      *
      * @return bool
      */
-    public function isExcluded(): bool
-    {
-        $xData = $this->aAttributes['exclude']['*'] ?? null;
-        return $xData !== null && $xData->getValue() === true;
-    }
+public function isExcluded(): bool
+{
+$xData = $this->aAttributes['exclude']['*'] ?? null;
+return $xData !== null && $xData->getValue() === true;
+}
 
-    /**
+/**
      * Get the properties of the class methods
      *
      * @return array
      */
-    public function getProperties(): array
+public function getProperties(): array
+{
+$aProperties = [];
+$aClassProperties = [];
+foreach($this->aAttributes as $sType => $aValues)
+{
+if($sType === 'exclude')
+{
+    continue;
+}
+
+foreach($aValues as $sMethod => $xData)
+{
+    if($sMethod === '*')
     {
-        $aProperties = [];
-        $aClassProperties = [];
-        foreach($this->aAttributes as $sType => $aValues)
-        {
-            if($sType === 'exclude')
-            {
-                continue;
-            }
-
-            foreach($aValues as $sMethod => $xData)
-            {
-                if($sMethod === '*')
-                {
-                    $aClassProperties[$xData->getName()] = $xData->getValue();
-                    continue;
-                }
-                $aProperties[$sMethod][$xData->getName()] = $xData->getValue();
-            }
-        }
-
-        if(count($aClassProperties) > 0)
-        {
-            $aProperties['*'] = $aClassProperties;
-        }
-
-        return $aProperties;
+        $aClassProperties[$xData->getName()] = $xData->getValue();
+        continue;
     }
+    $aProperties[$sMethod][$xData->getName()] = $xData->getValue();
+}
+}
+
+if(count($aClassProperties) > 0)
+{
+$aProperties['*'] = $aClassProperties;
+}
+
+return $aProperties;
+}
 
-    /**
+/**
      * Get the protected methods
      *
      * @return array
      */
-    public function getProtectedMethods(): array
-    {
-        /** @var array<Data\ExcludeData> */
-        $aAttributes = $this->aAttributes['exclude'];
-        $aMethods = array_keys($aAttributes);
-        return array_values(array_filter($aMethods, fn(string $sName) =>
-            $sName !== '*' && $aAttributes[$sName]->getValue() === true));
-    }
+public function getProtectedMethods(): array
+{
+/** @var array<Data\ExcludeData> */
+$aAttributes = $this->aAttributes['exclude'];
+$aMethods = array_keys($aAttributes);
+return array_values(array_filter($aMethods, fn(string $sName) =>
+$sName !== '*' && $aAttributes[$sName]->getValue() === true));
+}
 }

Spacing +5 added lines, -5 removed lines

@@ -139,16 +139,16 @@ 
     {
         $aProperties = [];
         $aClassProperties = [];
-        foreach($this->aAttributes as $sType => $aValues)
+        foreach ($this->aAttributes as $sType => $aValues)
         {
-            if($sType === 'exclude')
+            if ($sType === 'exclude')
             {
                 continue;
             }
 
-            foreach($aValues as $sMethod => $xData)
+            foreach ($aValues as $sMethod => $xData)
             {
-                if($sMethod === '*')
+                if ($sMethod === '*')
                 {
                     $aClassProperties[$xData->getName()] = $xData->getValue();
                     continue;
@@ -157,7 +157,7 @@ 
             }
         }
 
-        if(count($aClassProperties) > 0)
+        if (count($aClassProperties) > 0)
         {
             $aProperties['*'] = $aClassProperties;
         }

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

Spacing +4 added lines, -5 removed lines

@@ -75,8 +75,7 @@ 
      */
     public function excluded(?string $sMethodName = null): bool
     {
-        return $sMethodName === null ? $this->xOptions->excluded() :
-            $this->xOptions->isProtectedMethod($sMethodName);
+        return $sMethodName === null ? $this->xOptions->excluded() : $this->xOptions->isProtectedMethod($sMethodName);
     }
 
     /**
@@ -176,11 +175,11 @@ 
         $sMethod = $this->xTarget->getMethodName();
         // The hooks defined at method level are merged with those defined at class level.
         $aMethods = array_merge($aHookMethods['*'] ?? [], $aHookMethods[$sMethod] ?? []);
-        foreach($aMethods as $xKey => $xValue)
+        foreach ($aMethods as $xKey => $xValue)
         {
             $sHookName = $xValue;
             $aHookArgs = [];
-            if(is_string($xKey))
+            if (is_string($xKey))
             {
                 $sHookName = $xKey;
                 $aHookArgs = is_array($xValue) ? $xValue : [$xValue];
@@ -218,7 +217,7 @@ 
             // Warning: dynamic properties will be deprecated in PHP8.2.
             $this->$sAttr = $xDiValue;
         };
-        foreach($aDiOptions as $sAttr => $sClass)
+        foreach ($aDiOptions as $sAttr => $sClass)
         {
             $this->setDiAttribute($xComponent, $sAttr, $this->di->get($sClass), $cSetter);
         }

jaxon-core/src/Script/CallFactory.php

Spacing +1 added lines, -2 removed lines

@@ -50,8 +50,7 @@
     public function rq(string $sClassName = ''): ?JxnCall
     {
         $sClassName = trim($sClassName);
-        return $sClassName === '' ? $this->cdi->getFunctionRequestFactory() :
-            $this->cdi->getComponentRequestFactory($sClassName);
+        return $sClassName === '' ? $this->cdi->getFunctionRequestFactory() : $this->cdi->getComponentRequestFactory($sClassName);
     }
 
     /**

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

Spacing +12 added lines, -13 removed lines

@@ -136,12 +136,12 @@ 
      */
     private function discoverComponent(string $sClassName)
     {
-        if(!isset($this->aComponents[$sClassName]))
+        if (!isset($this->aComponents[$sClassName]))
         {
             $xRegistry = $this->cn()->g(ComponentRegistry::class);
             $xRegistry->updateHash(false); // Disable hash calculation.
             $aOptions = $xRegistry->getNamespaceComponentOptions($sClassName);
-            if($aOptions !== null)
+            if ($aOptions !== null)
             {
                 $this->registerComponent($sClassName, $aOptions);
             }
@@ -152,7 +152,7 @@ 
                 $xRegistry->registerComponentsInDirectories();
             }
         }
-        if(!isset($this->aComponents[$sClassName]))
+        if (!isset($this->aComponents[$sClassName]))
         {
             throw new SetupException($this->cn()->g(Translator::class)
                 ->trans('errors.class.invalid', ['name' => $sClassName]));
@@ -168,7 +168,7 @@ 
     public function getCallableObjects(): array
     {
         $aCallableObjects = [];
-        foreach($this->aComponents as $sClassName => $_)
+        foreach ($this->aComponents as $sClassName => $_)
         {
             $aCallableObjects[$sClassName] = $this->makeCallableObject($sClassName);
         }
@@ -219,12 +219,12 @@ 
     {
         /** @var Config|null */
         $xPackageConfig = $aOptions['config'] ?? null;
-        if($xPackageConfig === null || (bool)($aOptions['excluded'] ?? false))
+        if ($xPackageConfig === null || (bool)($aOptions['excluded'] ?? false))
         {
             return null;
         }
         $sReaderId = $xPackageConfig->getOption('metadata.reader');
-        if(!in_array($sReaderId, ['attributes', 'annotations']))
+        if (!in_array($sReaderId, ['attributes', 'annotations']))
         {
             return null;
         }
@@ -234,23 +234,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);
 
@@ -259,7 +259,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);
         }
@@ -277,8 +277,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());
     }
 }

Braces +1 added lines, -2 removed lines

@@ -144,8 +144,7 @@
             if($aOptions !== null)
             {
                 $this->registerComponent($sClassName, $aOptions);
-            }
-            else // if(!isset($this->aComponents[$sClassName]))
+            } else // if(!isset($this->aComponents[$sClassName]))
             {
                 // 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.

jaxon-core/src/Di/ComponentContainer.php

Indentation +1 added lines, -1 removed lines

@@ -138,7 +138,7 @@
      */
     public function val(string $sKey, $xValue)
     {
-       $this->xContainer->offsetSet($sKey, $xValue);
+        $this->xContainer->offsetSet($sKey, $xValue);
     }
 
     /**

Spacing +11 added lines, -11 removed lines

@@ -186,13 +186,13 @@ 
         try
         {
             // Make sure the registered class exists
-            if(isset($aOptions['include']))
+            if (isset($aOptions['include']))
             {
                 require_once $aOptions['include'];
             }
             $xReflectionClass = new ReflectionClass($sClassName);
             // Check if the class is registrable
-            if(!$xReflectionClass->isInstantiable())
+            if (!$xReflectionClass->isInstantiable())
             {
                 return;
             }
@@ -200,14 +200,14 @@ 
             $this->_saveClassOptions($sClassName, $aOptions);
             $this->val($this->getReflectionClassKey($sClassName), $xReflectionClass);
             // Register the user class, but only if the user didn't already.
-            if(!$this->has($sClassName))
+            if (!$this->has($sClassName))
             {
                 $this->set($sClassName, function() use($sClassName) {
                     return $this->make($this->get($this->getReflectionClassKey($sClassName)));
                 });
             }
         }
-        catch(ReflectionException $e)
+        catch (ReflectionException $e)
         {
             throw new SetupException($this->cn()->g(Translator::class)
                 ->trans('errors.class.invalid', ['name' => $sClassName]));
@@ -226,7 +226,7 @@ 
     {
         $sComponentObject = $this->getCallableObjectKey($sClassName);
         // Prevent duplication. It's important not to use the class name here.
-        if($this->has($sComponentObject))
+        if ($this->has($sComponentObject))
         {
             return;
         }
@@ -252,14 +252,14 @@ 
 
         // Initialize the user class instance
         $this->xContainer->extend($sClassName, function($xClassInstance) use($sClassName) {
-            if($xClassInstance instanceof AbstractComponent)
+            if ($xClassInstance instanceof AbstractComponent)
             {
                 $xHelper = $this->get($this->getCallableHelperKey($sClassName));
                 $xHelper->xTarget = $this->xTarget;
 
                 // Call the protected "initComponent()" method of the Component class.
                 $cSetter = function($di, $xHelper) {
-                    $this->initComponent($di, $xHelper);  // "$this" here refers to the Component class.
+                    $this->initComponent($di, $xHelper); // "$this" here refers to the Component class.
                 };
                 $cSetter = $cSetter->bindTo($xClassInstance, $xClassInstance);
                 call_user_func($cSetter, $this->di, $xHelper);
@@ -274,7 +274,7 @@ 
             /** @var CallableObject */
             $xCallableObject = $this->get($this->getCallableObjectKey($sClassName));
             $xCallableObject->setDiClassAttributes($xClassInstance);
-            if($this->xTarget !== null)
+            if ($this->xTarget !== null)
             {
                 $sMethodName = $this->xTarget->getMethodName();
                 $xCallableObject->setDiMethodAttributes($xClassInstance, $sMethodName);
@@ -350,7 +350,7 @@ 
     private function registerRequestFactory(string $sClassName, string $sFactoryKey)
     {
         $this->xContainer->offsetSet($sFactoryKey, function() use($sClassName) {
-            if(!($xCallable = $this->makeCallableObject($sClassName)))
+            if (!($xCallable = $this->makeCallableObject($sClassName)))
             {
                 return null;
             }
@@ -380,13 +380,13 @@ 
     public function getComponentRequestFactory(string $sClassName): ?JxnCall
     {
         $sClassName = trim($sClassName, " \t");
-        if($sClassName === '')
+        if ($sClassName === '')
         {
             return null;
         }
 
         $sFactoryKey = $this->getRequestFactoryKey($sClassName);
-        if(!$this->has($sFactoryKey))
+        if (!$this->has($sFactoryKey))
         {
             $this->registerRequestFactory($sClassName, $sFactoryKey);
         }

Braces +1 added lines, -2 removed lines

@@ -206,8 +206,7 @@
                     return $this->make($this->get($this->getReflectionClassKey($sClassName)));
                 });
             }
-        }
-        catch(ReflectionException $e)
+        } catch(ReflectionException $e)
         {
             throw new SetupException($this->cn()->g(Translator::class)
                 ->trans('errors.class.invalid', ['name' => $sClassName]));