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/Http/UriDetector.php

Switch Indentation +196 added lines, -196 removed lines

@@ -29,40 +29,40 @@ 
 
 class UriDetector
 {
-    /**
+/**
      * The URL components
      *
      * @var array
      */
-    protected $aUrl;
+protected $aUrl;
 
-    /**
+/**
      * @param array $aServerParams The server environment variables
      *
      * @return void
      */
-    private function setScheme(array $aServerParams): void
-    {
-        if(isset($this->aUrl['scheme']))
-        {
-            return;
-        }
-        if(isset($aServerParams['HTTP_SCHEME']))
-        {
-            $this->aUrl['scheme'] = $aServerParams['HTTP_SCHEME'];
-            return;
-        }
-        if((isset($aServerParams['HTTPS']) && strtolower($aServerParams['HTTPS']) === 'on') ||
-            (isset($aServerParams['HTTP_X_FORWARDED_SSL']) && $aServerParams['HTTP_X_FORWARDED_SSL'] === 'on') ||
-            (isset($aServerParams['HTTP_X_FORWARDED_PROTO']) && $aServerParams['HTTP_X_FORWARDED_PROTO'] === 'https'))
-        {
-            $this->aUrl['scheme'] = 'https';
-            return;
-        }
-        $this->aUrl['scheme'] = 'http';
-    }
+private function setScheme(array $aServerParams): void
+{
+if(isset($this->aUrl['scheme']))
+{
+return;
+}
+if(isset($aServerParams['HTTP_SCHEME']))
+{
+$this->aUrl['scheme'] = $aServerParams['HTTP_SCHEME'];
+return;
+}
+if((isset($aServerParams['HTTPS']) && strtolower($aServerParams['HTTPS']) === 'on') ||
+(isset($aServerParams['HTTP_X_FORWARDED_SSL']) && $aServerParams['HTTP_X_FORWARDED_SSL'] === 'on') ||
+(isset($aServerParams['HTTP_X_FORWARDED_PROTO']) && $aServerParams['HTTP_X_FORWARDED_PROTO'] === 'https'))
+{
+$this->aUrl['scheme'] = 'https';
+return;
+}
+$this->aUrl['scheme'] = 'http';
+}
 
-    /**
+/**
      * Get the URL from the $aServerParams var
      *
      * @param array $aServerParams The server environment variables
@@ -70,140 +70,140 @@ 
      *
      * @return void
      */
-    private function setHostFromServer(array $aServerParams, string $sKey): void
-    {
-        if(isset($this->aUrl['host']) || empty($aServerParams[$sKey]))
-        {
-            return;
-        }
-        if(strpos($aServerParams[$sKey], ':') === false)
-        {
-            $this->aUrl['host'] = $aServerParams[$sKey];
-            return;
-        }
-        list($this->aUrl['host'], $this->aUrl['port']) = explode(':', $aServerParams[$sKey]);
-    }
+private function setHostFromServer(array $aServerParams, string $sKey): void
+{
+if(isset($this->aUrl['host']) || empty($aServerParams[$sKey]))
+{
+return;
+}
+if(strpos($aServerParams[$sKey], ':') === false)
+{
+$this->aUrl['host'] = $aServerParams[$sKey];
+return;
+}
+list($this->aUrl['host'], $this->aUrl['port']) = explode(':', $aServerParams[$sKey]);
+}
 
-    /**
+/**
      * @param array $aServerParams The server environment variables
      *
      * @return void
      * @throws UriException
      */
-    private function setHost(array $aServerParams): void
-    {
-        $this->setHostFromServer($aServerParams, 'HTTP_X_FORWARDED_HOST');
-        $this->setHostFromServer($aServerParams, 'HTTP_HOST');
-        $this->setHostFromServer($aServerParams, 'SERVER_NAME');
-        if(empty($this->aUrl['host']))
-        {
-            throw new UriException();
-        }
-        if(empty($this->aUrl['port']) && isset($aServerParams['SERVER_PORT']))
-        {
-            $this->aUrl['port'] = $aServerParams['SERVER_PORT'];
-        }
-    }
+private function setHost(array $aServerParams): void
+{
+$this->setHostFromServer($aServerParams, 'HTTP_X_FORWARDED_HOST');
+$this->setHostFromServer($aServerParams, 'HTTP_HOST');
+$this->setHostFromServer($aServerParams, 'SERVER_NAME');
+if(empty($this->aUrl['host']))
+{
+throw new UriException();
+}
+if(empty($this->aUrl['port']) && isset($aServerParams['SERVER_PORT']))
+{
+$this->aUrl['port'] = $aServerParams['SERVER_PORT'];
+}
+}
 
-    /**
+/**
      * @param array $aServerParams The server environment variables
      *
      * @return void
      */
-    private function setPath(array $aServerParams): void
-    {
-        if(isset($this->aUrl['path']) && strlen(basename($this->aUrl['path'])) === 0)
-        {
-            unset($this->aUrl['path']);
-        }
-        if(isset($this->aUrl['path']))
-        {
-            return;
-        }
-        $aPath = parse_url($aServerParams['PATH_INFO'] ?? ($aServerParams['PHP_SELF'] ?? ''));
-        if(isset($aPath['path']))
-        {
-            $this->aUrl['path'] = $aPath['path'];
-        }
-    }
+private function setPath(array $aServerParams): void
+{
+if(isset($this->aUrl['path']) && strlen(basename($this->aUrl['path'])) === 0)
+{
+unset($this->aUrl['path']);
+}
+if(isset($this->aUrl['path']))
+{
+return;
+}
+$aPath = parse_url($aServerParams['PATH_INFO'] ?? ($aServerParams['PHP_SELF'] ?? ''));
+if(isset($aPath['path']))
+{
+$this->aUrl['path'] = $aPath['path'];
+}
+}
 
-    /**
+/**
      * @return string
      */
-    private function getPath(): string
-    {
-        return '/' . ltrim($this->aUrl['path'], '/');
-    }
+private function getPath(): string
+{
+return '/' . ltrim($this->aUrl['path'], '/');
+}
 
-    /**
+/**
      * @return string
      */
-    private function getUser(): string
-    {
-        if(empty($this->aUrl['user']))
-        {
-            return '';
-        }
-        $sUrl = $this->aUrl['user'];
-        if(isset($this->aUrl['pass']))
-        {
-            $sUrl .= ':' . $this->aUrl['pass'];
-        }
-        return $sUrl . '@';
-    }
+private function getUser(): string
+{
+if(empty($this->aUrl['user']))
+{
+return '';
+}
+$sUrl = $this->aUrl['user'];
+if(isset($this->aUrl['pass']))
+{
+$sUrl .= ':' . $this->aUrl['pass'];
+}
+return $sUrl . '@';
+}
 
-    /**
+/**
      * @return string
      */
-    private function getPort(): string
-    {
-        if(isset($this->aUrl['port']) &&
-            (($this->aUrl['scheme'] === 'http' && $this->aUrl['port'] != 80) ||
-                ($this->aUrl['scheme'] === 'https' && $this->aUrl['port'] != 443)))
-        {
-            return ':' . $this->aUrl['port'];
-        }
-        return '';
-    }
+private function getPort(): string
+{
+if(isset($this->aUrl['port']) &&
+(($this->aUrl['scheme'] === 'http' && $this->aUrl['port'] != 80) ||
+    ($this->aUrl['scheme'] === 'https' && $this->aUrl['port'] != 443)))
+{
+return ':' . $this->aUrl['port'];
+}
+return '';
+}
 
-    /**
+/**
      * @param array $aServerParams The server environment variables
      *
      * @return void
      */
-    private function setQuery(array $aServerParams): void
-    {
-        if(empty($this->aUrl['query']))
-        {
-            $this->aUrl['query'] = $aServerParams['QUERY_STRING'] ?? '';
-        }
-    }
+private function setQuery(array $aServerParams): void
+{
+if(empty($this->aUrl['query']))
+{
+$this->aUrl['query'] = $aServerParams['QUERY_STRING'] ?? '';
+}
+}
 
-    /**
+/**
      * @return string
      */
-    private function getQuery(): string
-    {
-        if(empty($this->aUrl['query']))
-        {
-            return '';
-        }
-        $aQueries = explode('&', $this->aUrl['query']);
-        foreach($aQueries as $sKey => $sQuery)
-        {
-            if(substr($sQuery, 0, 11) === 'jxnGenerate')
-            {
-                unset($aQueries[$sKey]);
-            }
-        }
-        if(empty($aQueries))
-        {
-            return '';
-        }
-        return '?' . implode("&", $aQueries);
-    }
+private function getQuery(): string
+{
+if(empty($this->aUrl['query']))
+{
+return '';
+}
+$aQueries = explode('&', $this->aUrl['query']);
+foreach($aQueries as $sKey => $sQuery)
+{
+if(substr($sQuery, 0, 11) === 'jxnGenerate')
+{
+    unset($aQueries[$sKey]);
+}
+}
+if(empty($aQueries))
+{
+return '';
+}
+return '?' . implode("&", $aQueries);
+}
 
-    /**
+/**
      * Detect the URI of the current request
      *
      * @param array $aServerParams The server environment variables
@@ -211,70 +211,70 @@ 
      * @return string
      * @throws UriException
      */
-    public function detect(array $aServerParams): string
-    {
-        $this->aUrl = [];
-        // Try to get the request URL
-        if(isset($aServerParams['REQUEST_URI']))
-        {
-            $this->aUrl = parse_url($aServerParams['REQUEST_URI']);
-        }
+public function detect(array $aServerParams): string
+{
+$this->aUrl = [];
+// Try to get the request URL
+if(isset($aServerParams['REQUEST_URI']))
+{
+$this->aUrl = parse_url($aServerParams['REQUEST_URI']);
+}
 
-        // Fill in the empty values
-        $this->setScheme($aServerParams);
-        $this->setHost($aServerParams);
-        $this->setPath($aServerParams);
-        $this->setQuery($aServerParams);
+// Fill in the empty values
+$this->setScheme($aServerParams);
+$this->setHost($aServerParams);
+$this->setPath($aServerParams);
+$this->setQuery($aServerParams);
 
-        // Build the URL: Start with scheme, user and pass
-        return $this->aUrl['scheme'] . '://' . $this->getUser() . $this->aUrl['host'] .
-            $this->getPort() . str_replace(['"', "'", '<', '>'],
-                ['%22', '%27', '%3C', '%3E'], $this->getPath() . $this->getQuery());
-    }
+// Build the URL: Start with scheme, user and pass
+return $this->aUrl['scheme'] . '://' . $this->getUser() . $this->aUrl['host'] .
+$this->getPort() . str_replace(['"', "'", '<', '>'],
+    ['%22', '%27', '%3C', '%3E'], $this->getPath() . $this->getQuery());
+}
 
-    /**
+/**
      * @param string $sQueryPart
      * @param string $sKey
      * @param string $sValue
      *
      * @return string
      */
-    private function makeQueryPart(string $sQueryPart, string $sKey, string $sValue): string
-    {
-        return $sValue === '' && strpos($sQueryPart, "$sKey=") === false ?
-            rawurlencode($sKey) : rawurlencode($sKey) . '=' . rawurlencode($sValue);
-    }
+private function makeQueryPart(string $sQueryPart, string $sKey, string $sValue): string
+{
+return $sValue === '' && strpos($sQueryPart, "$sKey=") === false ?
+rawurlencode($sKey) : rawurlencode($sKey) . '=' . rawurlencode($sValue);
+}
 
-    /**
+/**
      * @param string $sQueryPart
      * @param array $aServerParams
      *
      * @return string
      */
-    private function parseQueryPart(string $sQueryPart, array $aServerParams): string
-    {
-        $aQueryParts = [];
-        parse_str($sQueryPart, $aQueryParts);
-        if(empty($aQueryParts))
-        {
-            // Couldn't break up the query, but there's one there.
-            // Possibly "http://url/page.html?query1234" type of query?
-            // Try to get data from the server environment var.
-            parse_str($aServerParams['QUERY_STRING'] ?? '', $aQueryParts);
-        }
-        if(($aQueryParts))
-        {
-            $aNewQueryParts = [];
-            foreach($aQueryParts as $sKey => $sValue)
-            {
-                $aNewQueryParts[] = $this->makeQueryPart($sQueryPart, $sKey, $sValue);
-            }
-            return '?' . implode('&', $aNewQueryParts);
-        }
-        return trim($sQueryPart);
-    }
+private function parseQueryPart(string $sQueryPart, array $aServerParams): string
+{
+$aQueryParts = [];
+parse_str($sQueryPart, $aQueryParts);
+if(empty($aQueryParts))
+{
+// Couldn't break up the query, but there's one there.
+// Possibly "http://url/page.html?query1234" type of query?
+// Try to get data from the server environment var.
+parse_str($aServerParams['QUERY_STRING'] ?? '', $aQueryParts);
+}
+if(($aQueryParts))
+{
+$aNewQueryParts = [];
+foreach($aQueryParts as $sKey => $sValue)
+{
+    $aNewQueryParts[] = $this->makeQueryPart($sQueryPart, $sKey, $sValue);
+}
+return '?' . implode('&', $aNewQueryParts);
+}
+return trim($sQueryPart);
+}
 
-    /**
+/**
      * Make the specified URL suitable for redirect
      *
      * @param string $sURL The relative or fully qualified URL
@@ -282,23 +282,23 @@ 
      *
      * @return string
      */
-    public function redirect(string $sURL, array $aServerParams): string
-    {
-        // We need to parse the query part so that the values are rawurlencode()'ed.
-        // Can't just use parse_url() cos we could be dealing with a relative URL which parse_url() can't deal with.
-        $sURL = trim($sURL);
-        $nQueryStart = strpos($sURL, '?', strrpos($sURL, '/'));
-        if($nQueryStart === false)
-        {
-            return $sURL;
-        }
-        $nQueryStart++;
-        $nQueryEnd = strpos($sURL, '#', $nQueryStart);
-        if($nQueryEnd === false)
-        {
-            $nQueryEnd = strlen($sURL);
-        }
-        $sQueryPart = substr($sURL, $nQueryStart, $nQueryEnd - $nQueryStart);
-        return str_replace('?' . $sQueryPart, $this->parseQueryPart($sQueryPart, $aServerParams), $sURL);
-    }
+public function redirect(string $sURL, array $aServerParams): string
+{
+// We need to parse the query part so that the values are rawurlencode()'ed.
+// Can't just use parse_url() cos we could be dealing with a relative URL which parse_url() can't deal with.
+$sURL = trim($sURL);
+$nQueryStart = strpos($sURL, '?', strrpos($sURL, '/'));
+if($nQueryStart === false)
+{
+return $sURL;
+}
+$nQueryStart++;
+$nQueryEnd = strpos($sURL, '#', $nQueryStart);
+if($nQueryEnd === false)
+{
+$nQueryEnd = strlen($sURL);
+}
+$sQueryPart = substr($sURL, $nQueryStart, $nQueryEnd - $nQueryStart);
+return str_replace('?' . $sQueryPart, $this->parseQueryPart($sQueryPart, $aServerParams), $sURL);
+}
 }

jaxon-utils/src/File/FileMinifier.php

Switch Indentation +35 added lines, -35 removed lines

@@ -24,45 +24,45 @@ 
 
 class FileMinifier
 {
-    /**
+/**
      * Read the file content
      *
      * @param string $sPath
      *
      * @return string|false
      */
-    private function readFile(string $sPath): bool|string
-    {
-        try
-        {
-            return file_get_contents($sPath);
-        }
-        catch(Exception $e)
-        {
-            return false;
-        }
-    }
+private function readFile(string $sPath): bool|string
+{
+try
+{
+return file_get_contents($sPath);
+}
+catch(Exception $e)
+{
+return false;
+}
+}
 
-    /**
+/**
      * Read the file content
      *
      * @param string $sCode
      *
      * @return string|false
      */
-    private function minifyCode(string $sCode): bool|string
-    {
-        try
-        {
-            return Minifier::minify($sCode);
-        }
-        catch(Exception $e)
-        {
-            return false;
-        }
-    }
+private function minifyCode(string $sCode): bool|string
+{
+try
+{
+return Minifier::minify($sCode);
+}
+catch(Exception $e)
+{
+return false;
+}
+}
 
-    /**
+/**
      * Minify javascript code
      *
      * @param string $sJsFile The javascript file to be minified
@@ -70,14 +70,14 @@ 
      *
      * @return bool
      */
-    public function minify(string $sJsFile, string $sMinFile): bool
-    {
-        if(($sJsCode = $this->readFile($sJsFile)) === false ||
-            ($sMinCode = $this->minifyCode($sJsCode)) === false)
-        {
-            return false;
-        }
-        file_put_contents($sMinFile, $sMinCode);
-        return is_file($sMinFile);
-    }
+public function minify(string $sJsFile, string $sMinFile): bool
+{
+if(($sJsCode = $this->readFile($sJsFile)) === false ||
+($sMinCode = $this->minifyCode($sJsCode)) === false)
+{
+return false;
+}
+file_put_contents($sMinFile, $sMinCode);
+return is_file($sMinFile);
+}
 }

jaxon-utils/src/Template/Context.php

Switch Indentation +100 added lines, -100 removed lines

@@ -30,54 +30,54 @@ 
 
 class Context
 {
-    /**
+/**
      * @var Context|null
      */
-    private $__extends__ = null;
+private $__extends__ = null;
 
-    /**
+/**
      * @var string
      */
-    private $__block_name__;
+private $__block_name__;
 
-    /**
+/**
      * @var array
      */
-    private $__properties__ = [];
+private $__properties__ = [];
 
-    /**
+/**
      * The constructor
      *
      * @param array $__namespaces__
      * @param string $__default_namespace__
      * @param string $__template__
      */
-    public function __construct(protected array $__namespaces__,
-        protected string $__default_namespace__, protected string $__template__)
-    {}
+public function __construct(protected array $__namespaces__,
+protected string $__default_namespace__, protected string $__template__)
+{}
 
-    /**
+/**
      * @param string $name
      *
      * @return mixed
      */
-    public function __get(string $name): mixed
-    {
-        return $this->__properties__[$name] ?? '';
-    }
+public function __get(string $name): mixed
+{
+return $this->__properties__[$name] ?? '';
+}
 
-    /**
+/**
      * @param string $name
      * @param mixed $value
      *
      * @return void
      */
-    public function __set(string $name, $value): void
-    {
-        $this->__properties__[$name] = $value;
-    }
+public function __set(string $name, $value): void
+{
+$this->__properties__[$name] = $value;
+}
 
-    /**
+/**
      * Include a template
      *
      * @param string $template The name of template to be rendered
@@ -85,110 +85,110 @@ 
      *
      * @return void
      */
-    protected function include(string $template, array $vars = []): void
-    {
-        $context = new Context($this->__namespaces__,
-            $this->__default_namespace__, $template);
-        echo $context->__render($vars);
-    }
-
-    /**
+protected function include(string $template, array $vars = []): void
+{
+$context = new Context($this->__namespaces__,
+$this->__default_namespace__, $template);
+echo $context->__render($vars);
+}
+
+/**
      * @param string $template The name of template to be rendered
      *
      * @return void
      */
-    public function extends(string $template): void
-    {
-        $this->__extends__ = new Context($this->__namespaces__,
-            $this->__default_namespace__, $template);
-    }
+public function extends(string $template): void
+{
+$this->__extends__ = new Context($this->__namespaces__,
+$this->__default_namespace__, $template);
+}
 
-    /**
+/**
      * Start a new block
      *
      * @param string $name
      *
      * @return void
      */
-    public function block(string $name): void
-    {
-        ob_start();
-        $this->__block_name__ = $name;
-    }
+public function block(string $name): void
+{
+ob_start();
+$this->__block_name__ = $name;
+}
 
-    /**
+/**
      * End the current block
      *
      * @param Closure|null $filter
      *
      * @return void
      */
-    public function endblock(?Closure $filter = null): void
-    {
-        $content = ob_get_clean();
-        $this->__set($this->__block_name__, !$filter ? $content : $filter($content));
-    }
+public function endblock(?Closure $filter = null): void
+{
+$content = ob_get_clean();
+$this->__set($this->__block_name__, !$filter ? $content : $filter($content));
+}
 
-    /**
+/**
      * @return string
      */
-    private function __path(): string
-    {
-        $template = trim($this->__template__);
-        // Get the namespace name
-        $namespace = $this->__default_namespace__;
-        $separatorPosition = strrpos($template, '::');
-        if($separatorPosition !== false)
-        {
-            $namespace = substr($template, 0, $separatorPosition);
-            $template = substr($template, $separatorPosition + 2);
-        }
-        // Check if the namespace is defined
-        if(!isset($this->__namespaces__[$namespace]))
-        {
-            return $template;
-        }
-
-        $namespace = $this->__namespaces__[$namespace];
-        // Get the template path
-        return $namespace['directory'] . $template . $namespace['extension'];
-    }
-
-    /**
+private function __path(): string
+{
+$template = trim($this->__template__);
+// Get the namespace name
+$namespace = $this->__default_namespace__;
+$separatorPosition = strrpos($template, '::');
+if($separatorPosition !== false)
+{
+$namespace = substr($template, 0, $separatorPosition);
+$template = substr($template, $separatorPosition + 2);
+}
+// Check if the namespace is defined
+if(!isset($this->__namespaces__[$namespace]))
+{
+return $template;
+}
+
+$namespace = $this->__namespaces__[$namespace];
+// Get the template path
+return $namespace['directory'] . $template . $namespace['extension'];
+}
+
+/**
      * Render a template
      *
      * @param array $vars The template vars
      *
      * @return string
      */
-    public function __render(array $vars): string
-    {
-        // Get the template path
-        $templatePath = $this->__path();
-        if(!@is_readable($templatePath))
-        {
-            return '';
-        }
-
-        // Save the template properties.
-        foreach($vars as $name => $value)
-        {
-            $this->__set((string)$name, $value);
-        }
-
-        // Render the template
-        $renderer = function() use($templatePath) {
-            ob_start();
-            include $templatePath;
-            $content = ob_get_clean();
-
-            return $this->__extends__ === null ? $content :
-                // Render the extended template with the same properties.
-                $this->__extends__->__render($this->__properties__);
-        };
-
-        // Call the closure in the context of this object.
-        // So the keyword '$this' in the template will refer to this object.
-        return call_user_func($renderer->bindTo($this));
-    }
+public function __render(array $vars): string
+{
+// Get the template path
+$templatePath = $this->__path();
+if(!@is_readable($templatePath))
+{
+return '';
+}
+
+// Save the template properties.
+foreach($vars as $name => $value)
+{
+$this->__set((string)$name, $value);
+}
+
+// Render the template
+$renderer = function() use($templatePath) {
+ob_start();
+include $templatePath;
+$content = ob_get_clean();
+
+return $this->__extends__ === null ? $content :
+    // Render the extended template with the same properties.
+    $this->__extends__->__render($this->__properties__);
+};
+
+// Call the closure in the context of this object.
+// So the keyword '$this' in the template will refer to this object.
+return call_user_func($renderer->bindTo($this));
+}
 }

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-utils/src/Translation/Translator.php

Switch Indentation +95 added lines, -95 removed lines

@@ -26,43 +26,43 @@ 
 
 class Translator
 {
-    /**
+/**
      * The default locale
      *
      * @var string
      */
-    protected $sDefaultLocale = 'en';
+protected $sDefaultLocale = 'en';
 
-    /**
+/**
      * The translations in a flattened array
      *
      * @var array
      */
-    protected $aTranslations = [];
+protected $aTranslations = [];
 
-    /**
+/**
      * The translations as received as input
      *
      * @var array
      */
-    protected $aRawTranslations = [];
+protected $aRawTranslations = [];
 
-    /**
+/**
      * Set the default locale
      *
      * @param string $sLocale
      *
      * @return void
      */
-    public function setLocale(string $sLocale): void
-    {
-        if(($sLocale = trim($sLocale)))
-        {
-            $this->sDefaultLocale = $sLocale;
-        }
-    }
+public function setLocale(string $sLocale): void
+{
+if(($sLocale = trim($sLocale)))
+{
+$this->sDefaultLocale = $sLocale;
+}
+}
 
-    /**
+/**
      * Recursively load translated strings from an array
      *
      * @param string $sLanguage The language of the translations
@@ -71,26 +71,26 @@ 
      *
      * @return void
      */
-    private function _loadTranslations(string $sLanguage, string $sPrefix, array $aTranslations): void
-    {
-        foreach($aTranslations as $sKey => $xTranslation)
-        {
-            $sKey = trim($sKey);
-            $sKey = ($sPrefix) ? $sPrefix . '.' . $sKey : $sKey;
-            if(is_array($xTranslation))
-            {
-                // Recursively read the translations in the array
-                $this->_loadTranslations($sLanguage, $sKey, $xTranslation);
-            }
-            else
-            {
-                // Save this translation
-                $this->aTranslations[$sLanguage][$sKey] = $xTranslation;
-            }
-        }
-    }
+private function _loadTranslations(string $sLanguage, string $sPrefix, array $aTranslations): void
+{
+foreach($aTranslations as $sKey => $xTranslation)
+{
+$sKey = trim($sKey);
+$sKey = ($sPrefix) ? $sPrefix . '.' . $sKey : $sKey;
+if(is_array($xTranslation))
+{
+    // Recursively read the translations in the array
+    $this->_loadTranslations($sLanguage, $sKey, $xTranslation);
+}
+else
+{
+    // Save this translation
+    $this->aTranslations[$sLanguage][$sKey] = $xTranslation;
+}
+}
+}
 
-    /**
+/**
      * Load translated strings from a file
      *
      * @param string $sFilePath The file full path
@@ -98,30 +98,30 @@ 
      *
      * @return bool
      */
-    public function loadTranslations(string $sFilePath, string $sLanguage): bool
-    {
-        if(!file_exists($sFilePath))
-        {
-            return false;
-        }
-        $aTranslations = require($sFilePath);
-        if(!is_array($aTranslations))
-        {
-            return false;
-        }
+public function loadTranslations(string $sFilePath, string $sLanguage): bool
+{
+if(!file_exists($sFilePath))
+{
+return false;
+}
+$aTranslations = require($sFilePath);
+if(!is_array($aTranslations))
+{
+return false;
+}
 
-        // Load the translations
-        if(!isset($this->aTranslations[$sLanguage]))
-        {
-            $this->aTranslations[$sLanguage] = [];
-        }
-        $this->aRawTranslations[$sLanguage] =
-            array_merge($this->aRawTranslations[$sLanguage] ?? [], $aTranslations);
-        $this->_loadTranslations($sLanguage, '', $aTranslations);
-        return true;
-    }
+// Load the translations
+if(!isset($this->aTranslations[$sLanguage]))
+{
+$this->aTranslations[$sLanguage] = [];
+}
+$this->aRawTranslations[$sLanguage] =
+array_merge($this->aRawTranslations[$sLanguage] ?? [], $aTranslations);
+$this->_loadTranslations($sLanguage, '', $aTranslations);
+return true;
+}
 
-    /**
+/**
      * Get a translated string
      *
      * @param string $sText The key of the translated string
@@ -130,29 +130,29 @@ 
      *
      * @return string
      */
-    public function trans(string $sText, array $aPlaceHolders = [], string $sLanguage = ''): string
-    {
-        $sText = trim($sText);
-        if(empty($sLanguage))
-        {
-            $sLanguage = $this->sDefaultLocale;
-        }
-        if(!isset($this->aTranslations[$sLanguage][$sText]))
-        {
-            return $sText;
-        }
-        $sMessage = $this->aTranslations[$sLanguage][$sText];
-        if(!empty($aPlaceHolders))
-        {
-            $aVars = array_map(function($sVar) {
-                return ':' . $sVar;
-            }, array_keys($aPlaceHolders));
-            $sMessage = str_replace($aVars, array_values($aPlaceHolders), $sMessage);
-        }
-        return $sMessage;
-    }
+public function trans(string $sText, array $aPlaceHolders = [], string $sLanguage = ''): string
+{
+$sText = trim($sText);
+if(empty($sLanguage))
+{
+$sLanguage = $this->sDefaultLocale;
+}
+if(!isset($this->aTranslations[$sLanguage][$sText]))
+{
+return $sText;
+}
+$sMessage = $this->aTranslations[$sLanguage][$sText];
+if(!empty($aPlaceHolders))
+{
+$aVars = array_map(function($sVar) {
+    return ':' . $sVar;
+}, array_keys($aPlaceHolders));
+$sMessage = str_replace($aVars, array_values($aPlaceHolders), $sMessage);
+}
+return $sMessage;
+}
 
-    /**
+/**
      * Get all the translations under a given key
      *
      * @param string $sKey
@@ -160,22 +160,22 @@ 
      *
      * @return array
      */
-    public function translations(string $sKey, string $sLanguage = ''): array
-    {
-        if(empty($sLanguage))
-        {
-            $sLanguage = $this->sDefaultLocale;
-        }
-        $aKeys = explode('.', $sKey);
+public function translations(string $sKey, string $sLanguage = ''): array
+{
+if(empty($sLanguage))
+{
+$sLanguage = $this->sDefaultLocale;
+}
+$aKeys = explode('.', $sKey);
 
-        $aTranslations = $this->aRawTranslations[$sLanguage];
-        foreach($aKeys as $sKey)
-        {
-            if($sKey !== '')
-            {
-                $aTranslations = $aTranslations[$sKey] ?? [];
-            }
-        }
-        return $aTranslations;
-    }
+$aTranslations = $this->aRawTranslations[$sLanguage];
+foreach($aKeys as $sKey)
+{
+if($sKey !== '')
+{
+    $aTranslations = $aTranslations[$sKey] ?? [];
+}
+}
+return $aTranslations;
+}
 }