jaxon-php / jaxon-mono

jaxon-utils/tests/TestTranslator/TranslatorTest.php

Switch Indentation +70 added lines, -70 removed lines

@@ -7,87 +7,87 @@
 
 final class TranslatorTest extends TestCase
 {
-    /**
+/**
      * @var Translator
      */
-    protected $xTranslator;
+protected $xTranslator;
 
-    protected function setUp(): void
-    {
-        $this->xTranslator = new Translator();
-        $this->xTranslator->loadTranslations(__DIR__ . '/../translations/test.en.php', 'en');
-        $this->xTranslator->loadTranslations(__DIR__ . '/../translations/test.fr.php', 'fr');
-    }
+protected function setUp(): void
+{
+$this->xTranslator = new Translator();
+$this->xTranslator->loadTranslations(__DIR__ . '/../translations/test.en.php', 'en');
+$this->xTranslator->loadTranslations(__DIR__ . '/../translations/test.fr.php', 'fr');
+}
 
-    public function testFileWithBadData()
-    {
-        $this->assertFalse($this->xTranslator->loadTranslations(__DIR__ . '/../translations/error.php', 'en'));
-    }
+public function testFileWithBadData()
+{
+$this->assertFalse($this->xTranslator->loadTranslations(__DIR__ . '/../translations/error.php', 'en'));
+}
 
-    public function testFileNotFound()
-    {
-        $this->assertFalse($this->xTranslator->loadTranslations(__DIR__ . '/../translations/not-found.php', 'en'));
-    }
+public function testFileNotFound()
+{
+$this->assertFalse($this->xTranslator->loadTranslations(__DIR__ . '/../translations/not-found.php', 'en'));
+}
 
-    public function testMissingEnTranslations()
-    {
-        $this->xTranslator->setLocale('en');
-        $this->assertEquals('salutations.hello', $this->xTranslator->trans('salutations.hello'));
-    }
+public function testMissingEnTranslations()
+{
+$this->xTranslator->setLocale('en');
+$this->assertEquals('salutations.hello', $this->xTranslator->trans('salutations.hello'));
+}
 
-    public function testMissingFrTranslations()
-    {
-        $this->xTranslator->setLocale('fr');
-        $this->assertEquals('salutations.hello', $this->xTranslator->trans('salutations.hello'));
-    }
+public function testMissingFrTranslations()
+{
+$this->xTranslator->setLocale('fr');
+$this->assertEquals('salutations.hello', $this->xTranslator->trans('salutations.hello'));
+}
 
-    public function testSimpleEnTranslations()
-    {
-        $this->xTranslator->setLocale('en');
-        $this->assertEquals('Good morning', $this->xTranslator->trans('salutations.morning'));
-        $this->assertEquals('Good afternoon', $this->xTranslator->trans('salutations.afternoon'));
-    }
+public function testSimpleEnTranslations()
+{
+$this->xTranslator->setLocale('en');
+$this->assertEquals('Good morning', $this->xTranslator->trans('salutations.morning'));
+$this->assertEquals('Good afternoon', $this->xTranslator->trans('salutations.afternoon'));
+}
 
-    public function testSimpleFrTranslations()
-    {
-        $this->xTranslator->setLocale('fr');
-        $this->assertEquals('Bonjour', $this->xTranslator->trans('salutations.morning'));
-        $this->assertEquals('Bonsoir', $this->xTranslator->trans('salutations.afternoon'));
-    }
+public function testSimpleFrTranslations()
+{
+$this->xTranslator->setLocale('fr');
+$this->assertEquals('Bonjour', $this->xTranslator->trans('salutations.morning'));
+$this->assertEquals('Bonsoir', $this->xTranslator->trans('salutations.afternoon'));
+}
 
-    public function testEnTranslationsWithPlaceholders()
-    {
-        $this->xTranslator->setLocale('en');
-        $this->assertEquals('Good morning Mr. Johnson',
-            $this->xTranslator->trans('placeholders.morning', ['title' => 'Mr.', 'name' => 'Johnson']));
-        $this->assertEquals('Good afternoon Mrs. Smith',
-            $this->xTranslator->trans('placeholders.afternoon', ['title' => 'Mrs.', 'name' => 'Smith']));
-    }
+public function testEnTranslationsWithPlaceholders()
+{
+$this->xTranslator->setLocale('en');
+$this->assertEquals('Good morning Mr. Johnson',
+$this->xTranslator->trans('placeholders.morning', ['title' => 'Mr.', 'name' => 'Johnson']));
+$this->assertEquals('Good afternoon Mrs. Smith',
+$this->xTranslator->trans('placeholders.afternoon', ['title' => 'Mrs.', 'name' => 'Smith']));
+}
 
-    public function testFrTranslationsWithPlaceholders()
-    {
-        $this->xTranslator->setLocale('fr');
-        $this->assertEquals('Bonjour M. Pierre',
-            $this->xTranslator->trans('placeholders.morning', ['title' => 'M.', 'name' => 'Pierre']));
-        $this->assertEquals('Bonsoir Mme Paule',
-            $this->xTranslator->trans('placeholders.afternoon', ['title' => 'Mme', 'name' => 'Paule']));
-    }
+public function testFrTranslationsWithPlaceholders()
+{
+$this->xTranslator->setLocale('fr');
+$this->assertEquals('Bonjour M. Pierre',
+$this->xTranslator->trans('placeholders.morning', ['title' => 'M.', 'name' => 'Pierre']));
+$this->assertEquals('Bonsoir Mme Paule',
+$this->xTranslator->trans('placeholders.afternoon', ['title' => 'Mme', 'name' => 'Paule']));
+}
 
-    public function testExplicitEnTranslations()
-    {
-        $this->xTranslator->setLocale('fr');
-        $this->assertEquals('Good morning Mr. Johnson',
-            $this->xTranslator->trans('placeholders.morning', ['title' => 'Mr.', 'name' => 'Johnson'], 'en'));
-        $this->assertEquals('Good afternoon Mrs. Smith',
-            $this->xTranslator->trans('placeholders.afternoon', ['title' => 'Mrs.', 'name' => 'Smith'], 'en'));
-    }
+public function testExplicitEnTranslations()
+{
+$this->xTranslator->setLocale('fr');
+$this->assertEquals('Good morning Mr. Johnson',
+$this->xTranslator->trans('placeholders.morning', ['title' => 'Mr.', 'name' => 'Johnson'], 'en'));
+$this->assertEquals('Good afternoon Mrs. Smith',
+$this->xTranslator->trans('placeholders.afternoon', ['title' => 'Mrs.', 'name' => 'Smith'], 'en'));
+}
 
-    public function testExplicitFrTranslations()
-    {
-        $this->xTranslator->setLocale('en');
-        $this->assertEquals('Bonjour M. Pierre',
-            $this->xTranslator->trans('placeholders.morning', ['title' => 'M.', 'name' => 'Pierre'], 'fr'));
-        $this->assertEquals('Bonsoir Mme Paule',
-            $this->xTranslator->trans('placeholders.afternoon', ['title' => 'Mme', 'name' => 'Paule'], 'fr'));
-    }
+public function testExplicitFrTranslations()
+{
+$this->xTranslator->setLocale('en');
+$this->assertEquals('Bonjour M. Pierre',
+$this->xTranslator->trans('placeholders.morning', ['title' => 'M.', 'name' => 'Pierre'], 'fr'));
+$this->assertEquals('Bonsoir Mme Paule',
+$this->xTranslator->trans('placeholders.afternoon', ['title' => 'Mme', 'name' => 'Paule'], 'fr'));
+}
 }

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

Switch Indentation +8 added lines, -8 removed lines

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

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

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

Switch Indentation +133 added lines, -133 removed lines

@@ -22,213 +22,213 @@
 
 class Metadata
 {
-    /**
+/**
      * @var array<string, array<string, Data\AbstractData>>
      */
-    private array $aAttributes = [
-        'exclude' => [],
-        'export' => [],
-        'container' => [],
-        'databag' => [],
-        'callback' => [],
-        'before' => [],
-        'after' => [],
-        'upload' => [],
-    ];
-
-    /**
+private array $aAttributes = [
+'exclude' => [],
+'export' => [],
+'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\ExportData
      */
-    public function export(string $sMethod = '*'): Data\ExportData
-    {
-        $sMethod = '*'; // On classes only
-        return $this->aAttributes['export'][$sMethod] ??
-            $this->aAttributes['export'][$sMethod] = new Data\ExportData();
-    }
+public function export(string $sMethod = '*'): Data\ExportData
+{
+$sMethod = '*'; // On classes only
+return $this->aAttributes['export'][$sMethod] ??
+$this->aAttributes['export'][$sMethod] = new Data\ExportData();
+}
 
-    /**
+/**
      * @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 methods in the export attributes
      *
      * @return array
      */
-    public function getExportMethods(): array
-    {
-        /** @var array<Data\ExcludeData> */
-        $aAttributes = $this->aAttributes['exclude'];
-        $aExcludeMethods = array_keys($aAttributes);
-        $aExcludeMethods = array_values(array_filter($aExcludeMethods,
-            fn(string $sName) => $sName !== '*' &&
-                $aAttributes[$sName]->getValue() === true));
-
-        /** @var Data\ExportData|null */
-        $xExportData = $this->aAttributes['export']['*'] ?? null;
-        $aExportMethods = $xExportData?->getValue() ?? [];
-
-        $aExceptMethods = $aExportMethods['except'] ?? [];
-        $aExportMethods['except'] = array_merge($aExcludeMethods, $aExceptMethods);
-        return $aExportMethods;
-    }
+public function getExportMethods(): array
+{
+/** @var array<Data\ExcludeData> */
+$aAttributes = $this->aAttributes['exclude'];
+$aExcludeMethods = array_keys($aAttributes);
+$aExcludeMethods = array_values(array_filter($aExcludeMethods,
+fn(string $sName) => $sName !== '*' &&
+    $aAttributes[$sName]->getValue() === true));
+
+/** @var Data\ExportData|null */
+$xExportData = $this->aAttributes['export']['*'] ?? null;
+$aExportMethods = $xExportData?->getValue() ?? [];
+
+$aExceptMethods = $aExportMethods['except'] ?? [];
+$aExportMethods['except'] = array_merge($aExcludeMethods, $aExceptMethods);
+return $aExportMethods;
+}
 
-    /**
+/**
      * Get the exluded methods
      *
      * @return array
      */
-    public function getExceptMethods(): array
-    {
-        return $this->getExportMethods()['except'];
-    }
+public function getExceptMethods(): array
+{
+return $this->getExportMethods()['except'];
+}
 
-    /**
+/**
      * Get the export base methods
      *
      * @return array
      */
-    public function getExportBaseMethods(): array
-    {
-        return $this->getExportMethods()['base'] ?? [];
-    }
+public function getExportBaseMethods(): array
+{
+return $this->getExportMethods()['base'] ?? [];
+}
 
-    /**
+/**
      * Get the export only methods
      *
      * @return array
      */
-    public function getExportOnlyMethods(): array
-    {
-        return $this->getExportMethods()['only'] ?? [];
-    }
+public function getExportOnlyMethods(): array
+{
+return $this->getExportMethods()['only'] ?? [];
+}
 }

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/App/Metadata/MetadataCache.php

Spacing +3 added lines, -3 removed lines

@@ -51,12 +51,12 @@
         $sMetadataVar = '$xMetadata';
         $sDataVar = '$xData';
         $aCalls = ["$sMetadataVar = new " . Metadata::class . '();'];
-        foreach($xMetadata->getAttributes() as $sType => $aValues)
+        foreach ($xMetadata->getAttributes() as $sType => $aValues)
         {
-            foreach($aValues as $sMethod => $xData)
+            foreach ($aValues as $sMethod => $xData)
             {
                 $aCalls[] = "$sDataVar = {$sMetadataVar}->{$sType}('{$sMethod}');";
-                foreach($xData->encode($sDataVar) as $sCall)
+                foreach ($xData->encode($sDataVar) as $sCall)
                 {
                     $aCalls[] = $sCall;
                 }

Switch Indentation +46 added lines, -46 removed lines

@@ -28,60 +28,60 @@ 
 
 class MetadataCache
 {
-    /**
+/**
      * @param string $sCacheDir
      */
-    public function __construct(private string $sCacheDir)
-    {}
+public function __construct(private string $sCacheDir)
+{}
 
-    /**
+/**
      * @param string $sClass
      *
      * @return string
      */
-    private function filepath(string $sClass): string
-    {
-        $sFilename = trim(str_replace(['\\', '.'], DIRECTORY_SEPARATOR,
-            strtolower($sClass)), DIRECTORY_SEPARATOR);
-        return rtrim($this->sCacheDir, "/\\") . DIRECTORY_SEPARATOR .
-            "metadata" . DIRECTORY_SEPARATOR . "{$sFilename}.php";
-    }
+private function filepath(string $sClass): string
+{
+$sFilename = trim(str_replace(['\\', '.'], DIRECTORY_SEPARATOR,
+strtolower($sClass)), DIRECTORY_SEPARATOR);
+return rtrim($this->sCacheDir, "/\\") . DIRECTORY_SEPARATOR .
+"metadata" . DIRECTORY_SEPARATOR . "{$sFilename}.php";
+}
 
-    /**
+/**
      * Generate the PHP code to create a metadata object.
      *
      * @return array
      */
-    private function encode(Metadata $xMetadata): array
+private function encode(Metadata $xMetadata): array
+{
+$sMetadataVar = '$xMetadata';
+$sDataVar = '$xData';
+$aCalls = ["$sMetadataVar = new " . Metadata::class . '();'];
+foreach($xMetadata->getAttributes() as $sType => $aValues)
+{
+foreach($aValues as $sMethod => $xData)
+{
+    $aCalls[] = "$sDataVar = {$sMetadataVar}->{$sType}('{$sMethod}');";
+    foreach($xData->encode($sDataVar) as $sCall)
     {
-        $sMetadataVar = '$xMetadata';
-        $sDataVar = '$xData';
-        $aCalls = ["$sMetadataVar = new " . Metadata::class . '();'];
-        foreach($xMetadata->getAttributes() as $sType => $aValues)
-        {
-            foreach($aValues as $sMethod => $xData)
-            {
-                $aCalls[] = "$sDataVar = {$sMetadataVar}->{$sType}('{$sMethod}');";
-                foreach($xData->encode($sDataVar) as $sCall)
-                {
-                    $aCalls[] = $sCall;
-                }
-            }
-        }
-        $aCalls[] = "return $sMetadataVar;";
-        return $aCalls;
+        $aCalls[] = $sCall;
     }
+}
+}
+$aCalls[] = "return $sMetadataVar;";
+return $aCalls;
+}
 
-    /**
+/**
      * @param string $sClass
      * @param Metadata $xMetadata
      *
      * @return void
      */
-    public function save(string $sClass, Metadata $xMetadata): void
-    {
-        $sDataCode = implode("\n    ", $this->encode($xMetadata));
-        $sPhpCode = <<<CODE
+public function save(string $sClass, Metadata $xMetadata): void
+{
+$sDataCode = implode("\n    ", $this->encode($xMetadata));
+$sPhpCode = <<<CODE
 <?php
 
 return function() {
@@ -89,21 +89,21 @@ 
 };
 
 CODE;
-        // Recursively create the directories.
-        $sPath = $this->filepath($sClass);
-        @mkdir(dirname($sPath), 0755, true);
-        file_put_contents($sPath, $sPhpCode);
-    }
+// Recursively create the directories.
+$sPath = $this->filepath($sClass);
+@mkdir(dirname($sPath), 0755, true);
+file_put_contents($sPath, $sPhpCode);
+}
 
-    /**
+/**
      * @param string $sClass
      *
      * @return Metadata|null
      */
-    public function read(string $sClass): ?Metadata
-    {
-        $sPath = $this->filepath($sClass);
-        $fCreator = file_exists($sPath) ? require $sPath : null;
-        return $fCreator instanceof Closure ? $fCreator() : null;
-    }
+public function read(string $sClass): ?Metadata
+{
+$sPath = $this->filepath($sClass);
+$fCreator = file_exists($sPath) ? require $sPath : null;
+return $fCreator instanceof Closure ? $fCreator() : null;
+}
 }