jaxon-php / jaxon-mono

jaxon-core/src/Plugin/RequestHandlerInterface.php

Switch Indentation +8 added lines, -8 removed lines

@@ -7,21 +7,21 @@ 
 
 interface RequestHandlerInterface
 {
-    /**
+/**
      * Get the target function or class and method
      *
      * @return Target|null
      */
-    public function getTarget(): ?Target;
+public function getTarget(): ?Target;
 
-    /**
+/**
      * @param ServerRequestInterface $xRequest
      *
      * @return Target
      */
-    public function setTarget(ServerRequestInterface $xRequest): Target;
+public function setTarget(ServerRequestInterface $xRequest): Target;
 
-    /**
+/**
      * Check if this plugin can process the current request
      *
      * Called by the <Jaxon\Plugin\RequestManager> when a request has been received to determine
@@ -31,9 +31,9 @@ 
      *
      * @return bool
      */
-    public static function canProcessRequest(ServerRequestInterface $xRequest): bool;
+public static function canProcessRequest(ServerRequestInterface $xRequest): bool;
 
-    /**
+/**
      * Process the current request
      *
      * Called by the <Jaxon\Plugin\RequestManager> when a request is being processed.
@@ -42,5 +42,5 @@ 
      *
      * @return void
      */
-    public function processRequest(): void;
+public function processRequest(): void;
 }

jaxon-annotations/src/Annotation/AbstractAnnotation.php

Switch Indentation +2 added lines, -2 removed lines

@@ -20,7 +20,7 @@ 
 
 abstract class AbstractAnnotation extends Annotation implements IAnnotationParser
 {
-    /**
+/**
      * Save the annotation value
      *
      * @param Metadata $xMetadata
@@ -28,5 +28,5 @@ 
      *
      * @return void
      */
-    abstract public function saveValue(Metadata $xMetadata, string $sMethod = '*'): void;
+abstract public function saveValue(Metadata $xMetadata, string $sMethod = '*'): void;
 }

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/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);
+}
 }