jaxon-php / jaxon-mono

jaxon-annotations/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();
     };

Switch Indentation +14 added lines, -14 removed lines

@@ -16,27 +16,27 @@
  */
 function _register(): void
 {
-    $di = jaxon()->di();
+$di = jaxon()->di();
 
-    $di->set(AnnotationReader::class, function($c) {
-        $sKey = 'jaxon_annotations_cache_dir';
-        $sCacheDir = $c->h($sKey) ? $c->g($sKey) : sys_get_temp_dir();
-        $xAnnotationManager = new AnnotationManager();
-        $xAnnotationManager->cache = new AnnotationCache($sCacheDir);
+$di->set(AnnotationReader::class, function($c) {
+$sKey = 'jaxon_annotations_cache_dir';
+$sCacheDir = $c->h($sKey) ? $c->g($sKey) : sys_get_temp_dir();
+$xAnnotationManager = new AnnotationManager();
+$xAnnotationManager->cache = new AnnotationCache($sCacheDir);
 
-        return new AnnotationReader($xAnnotationManager);
-    });
+return new AnnotationReader($xAnnotationManager);
+});
 
-    $di->alias('metadata_reader_annotations', AnnotationReader::class);
+$di->alias('metadata_reader_annotations', AnnotationReader::class);
 }
 
 function register(): void
 {
-    // Do nothing if running in cli.
-    if(php_sapi_name() !== 'cli')
-    {
-        _register();
-    };
+// Do nothing if running in cli.
+if(php_sapi_name() !== 'cli')
+{
+_register();
+};
 }
 
 register();

jaxon-utils/tests/TestMinifier/MinifierTest.php

Switch Indentation +29 added lines, -29 removed lines

@@ -10,33 +10,33 @@
 
 final class MinifierTest extends TestCase
 {
-    public function testFileNotFound()
-    {
-        $sSrcFile = __DIR__ . '/../minifier/nosrc.js';
-        $sDstMinFile = __DIR__ . '/../minifier/dst.min.js';
-        $xMinifier = new FileMinifier();
-
-        $this->assertFalse($xMinifier->minify($sSrcFile, $sDstMinFile));
-    }
-
-    public function testFileError()
-    {
-        $sSrcFile = __DIR__ . '/../minifier/error.js';
-        $sDstMinFile = __DIR__ . '/../minifier/dst.min.js';
-        $xMinifier = new FileMinifier();
-
-        $this->assertFalse($xMinifier->minify($sSrcFile, $sDstMinFile));
-    }
-
-    public function testMinifier()
-    {
-        $sSrcFile = __DIR__ . '/../minifier/src.js';
-        $sSrcMinFile = __DIR__ . '/../minifier/src.min.js';
-        $sDstMinFile = __DIR__ . '/../minifier/dst.min.js';
-        $xMinifier = new FileMinifier();
-
-        $this->assertTrue($xMinifier->minify($sSrcFile, $sDstMinFile));
-        $this->assertTrue(file_exists($sDstMinFile));
-        $this->assertEquals(filesize($sSrcMinFile), filesize($sDstMinFile));
-    }
+public function testFileNotFound()
+{
+$sSrcFile = __DIR__ . '/../minifier/nosrc.js';
+$sDstMinFile = __DIR__ . '/../minifier/dst.min.js';
+$xMinifier = new FileMinifier();
+
+$this->assertFalse($xMinifier->minify($sSrcFile, $sDstMinFile));
+}
+
+public function testFileError()
+{
+$sSrcFile = __DIR__ . '/../minifier/error.js';
+$sDstMinFile = __DIR__ . '/../minifier/dst.min.js';
+$xMinifier = new FileMinifier();
+
+$this->assertFalse($xMinifier->minify($sSrcFile, $sDstMinFile));
+}
+
+public function testMinifier()
+{
+$sSrcFile = __DIR__ . '/../minifier/src.js';
+$sSrcMinFile = __DIR__ . '/../minifier/src.min.js';
+$sDstMinFile = __DIR__ . '/../minifier/dst.min.js';
+$xMinifier = new FileMinifier();
+
+$this->assertTrue($xMinifier->minify($sSrcFile, $sDstMinFile));
+$this->assertTrue(file_exists($sDstMinFile));
+$this->assertEquals(filesize($sSrcMinFile), filesize($sDstMinFile));
+}
 }

jaxon-utils/tests/TestTemplate/TemplateTest.php

Switch Indentation +45 added lines, -45 removed lines

@@ -7,51 +7,51 @@
 
 final class TemplateTest extends TestCase
 {
-    /**
+/**
      * @var TemplateEngine
      */
-    protected $xTemplateEngine;
-
-    protected function setUp(): void
-    {
-        $this->xTemplateEngine = new TemplateEngine();
-        $this->xTemplateEngine->addNamespace('test', __DIR__ . '/../templates', '.php');
-    }
-
-    public function testTemplate()
-    {
-        $this->assertEquals('Good morning Mr. Johnson',
-            $this->xTemplateEngine->render('test::simple', ['title' => 'Mr.', 'name' => 'Johnson']));
-    }
-
-    public function testDefaultNamespace()
-    {
-        $this->xTemplateEngine->setDefaultNamespace('test');
-        $this->assertEquals('Good morning Mr. Johnson',
-            $this->xTemplateEngine->render('simple', ['title' => 'Mr.', 'name' => 'Johnson']));
-    }
-
-    public function testRenderEmbeddedTemplate()
-    {
-        $this->assertEquals('Good morning Mr. Johnson.',
-            $this->xTemplateEngine->render('test::embedded-content', ['title' => 'Mr.', 'name' => 'Johnson']));
-    }
-
-    public function testIncludeEmbeddedTemplate()
-    {
-        $this->assertEquals('Good morning Mr. Johnson.',
-            $this->xTemplateEngine->render('test::embedded-include', ['title' => 'Mr.', 'name' => 'Johnson']));
-    }
-
-    public function testMissingTemplate()
-    {
-        $this->assertEquals('',
-            $this->xTemplateEngine->render('test::missing', ['title' => 'Mr.', 'name' => 'Johnson']));
-    }
-
-    public function testUnknownNamespace()
-    {
-        $this->assertEquals('',
-            $this->xTemplateEngine->render('toast::embedded-include', ['title' => 'Mr.', 'name' => 'Johnson']));
-    }
+protected $xTemplateEngine;
+
+protected function setUp(): void
+{
+$this->xTemplateEngine = new TemplateEngine();
+$this->xTemplateEngine->addNamespace('test', __DIR__ . '/../templates', '.php');
+}
+
+public function testTemplate()
+{
+$this->assertEquals('Good morning Mr. Johnson',
+$this->xTemplateEngine->render('test::simple', ['title' => 'Mr.', 'name' => 'Johnson']));
+}
+
+public function testDefaultNamespace()
+{
+$this->xTemplateEngine->setDefaultNamespace('test');
+$this->assertEquals('Good morning Mr. Johnson',
+$this->xTemplateEngine->render('simple', ['title' => 'Mr.', 'name' => 'Johnson']));
+}
+
+public function testRenderEmbeddedTemplate()
+{
+$this->assertEquals('Good morning Mr. Johnson.',
+$this->xTemplateEngine->render('test::embedded-content', ['title' => 'Mr.', 'name' => 'Johnson']));
+}
+
+public function testIncludeEmbeddedTemplate()
+{
+$this->assertEquals('Good morning Mr. Johnson.',
+$this->xTemplateEngine->render('test::embedded-include', ['title' => 'Mr.', 'name' => 'Johnson']));
+}
+
+public function testMissingTemplate()
+{
+$this->assertEquals('',
+$this->xTemplateEngine->render('test::missing', ['title' => 'Mr.', 'name' => 'Johnson']));
+}
+
+public function testUnknownNamespace()
+{
+$this->assertEquals('',
+$this->xTemplateEngine->render('toast::embedded-include', ['title' => 'Mr.', 'name' => 'Johnson']));
+}
 }

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