namespacing: move HTTP utilities along \Shaarli\Http\ classes

Signed-off-by: VirtualTam <virtualtam@flibidi.net>

4 files changed, 0 insertions, 232 deletions

diff --git a/tests/Url/CleanupUrlTest.php b/tests/Url/CleanupUrlTest.php
deleted file mode 100644
index 24791948..00000000
--- a/tests/Url/CleanupUrlTest.php
+++ /dev/null
@@ -1,109 +0,0 @@
-<?php
-/**
- * Unitary tests for cleanup_url()
- */
-
-require_once 'application/Url.php';
-
-class CleanupUrlTest extends PHPUnit_Framework_TestCase
-{
-    /**
-     * @var string reference URL
-     */
-    protected $ref = 'http://domain.tld:3000';
-
-
-    /**
-     * Clean empty URL
-     */
-    public function testCleanupUrlEmpty()
-    {
-        $this->assertEquals('', cleanup_url(''));
-    }
-
-    /**
-     * Clean an already cleaned URL
-     */
-    public function testCleanupUrlAlreadyClean()
-    {
-        $this->assertEquals($this->ref, cleanup_url($this->ref));
-        $this->ref2 = $this->ref.'/path/to/dir/';
-        $this->assertEquals($this->ref2, cleanup_url($this->ref2));
-    }
-
-    /**
-     * Clean URL fragments
-     */
-    public function testCleanupUrlFragment()
-    {
-        $this->assertEquals($this->ref, cleanup_url($this->ref.'#tk.rss_all'));
-        $this->assertEquals($this->ref, cleanup_url($this->ref.'#xtor=RSS-'));
-        $this->assertEquals($this->ref, cleanup_url($this->ref.'#xtor=RSS-U3ht0tkc4b'));
-    }
-
-    /**
-     * Clean URL query - single annoying parameter
-     */
-    public function testCleanupUrlQuerySingle()
-    {
-        $this->assertEquals($this->ref, cleanup_url($this->ref.'?action_object_map=junk'));
-        $this->assertEquals($this->ref, cleanup_url($this->ref.'?action_ref_map=Cr4p!'));
-        $this->assertEquals($this->ref, cleanup_url($this->ref.'?action_type_map=g4R84g3'));
-
-        $this->assertEquals($this->ref, cleanup_url($this->ref.'?fb_stuff=v41u3'));
-        $this->assertEquals($this->ref, cleanup_url($this->ref.'?fb=71m3w4573'));
-
-        $this->assertEquals($this->ref, cleanup_url($this->ref.'?utm_campaign=zomg'));
-        $this->assertEquals($this->ref, cleanup_url($this->ref.'?utm_medium=numnum'));
-        $this->assertEquals($this->ref, cleanup_url($this->ref.'?utm_source=c0d3'));
-        $this->assertEquals($this->ref, cleanup_url($this->ref.'?utm_term=1n4l'));
-
-        $this->assertEquals($this->ref, cleanup_url($this->ref.'?xtor=some-url'));
-
-        $this->assertEquals($this->ref, cleanup_url($this->ref.'?campaign_name=junk'));
-        $this->assertEquals($this->ref, cleanup_url($this->ref.'?campaign_start=junk'));
-        $this->assertEquals($this->ref, cleanup_url($this->ref.'?campaign_item_index=junk'));
-    }
-
-    /**
-     * Clean URL query - multiple annoying parameters
-     */
-    public function testCleanupUrlQueryMultiple()
-    {
-        $this->assertEquals($this->ref, cleanup_url($this->ref.'?xtor=some-url&fb=som3th1ng'));
-
-        $this->assertEquals($this->ref, cleanup_url(
-            $this->ref.'?fb=stuff&utm_campaign=zomg&utm_medium=numnum&utm_source=c0d3'
-        ));
-
-        $this->assertEquals($this->ref, cleanup_url(
-            $this->ref.'?campaign_start=zomg&campaign_name=numnum'
-        ));
-    }
-
-    /**
-     * Clean URL query - multiple annoying parameters and fragment
-     */
-    public function testCleanupUrlQueryFragment()
-    {
-        $this->assertEquals($this->ref, cleanup_url(
-            $this->ref.'?xtor=some-url&fb=som3th1ng#tk.rss_all'
-        ));
-
-        // ditch annoying query params and fragment, keep useful params
-        $this->assertEquals(
-            $this->ref.'?my=stuff&is=kept',
-            cleanup_url(
-                $this->ref.'?fb=zomg&my=stuff&utm_medium=numnum&is=kept#tk.rss_all'
-            )
-        );
-
-        // ditch annoying query params, keep useful params and fragment
-        $this->assertEquals(
-            $this->ref.'?my=stuff&is=kept#again',
-            cleanup_url(
-                $this->ref.'?fb=zomg&my=stuff&utm_medium=numnum&is=kept#again'
-            )
-        );
-    }
-}
diff --git a/tests/Url/GetUrlSchemeTest.php b/tests/Url/GetUrlSchemeTest.php
deleted file mode 100644
index 18b932d6..00000000
--- a/tests/Url/GetUrlSchemeTest.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-/**
- * Unitary tests for get_url_scheme()
- */
-
-require_once 'application/Url.php';
-
-class GetUrlSchemeTest extends PHPUnit_Framework_TestCase
-{
-    /**
-     * Get empty scheme string for empty Url
-     */
-    public function testGetUrlSchemeEmpty()
-    {
-        $this->assertEquals('', get_url_scheme(''));
-    }
-
-    /**
-     * Get normal scheme of Url
-     */
-    public function testGetUrlScheme()
-    {
-        $this->assertEquals('http', get_url_scheme('http://domain.tld:3000'));
-        $this->assertEquals('https', get_url_scheme('https://domain.tld:3000'));
-        $this->assertEquals('http', get_url_scheme('domain.tld'));
-        $this->assertEquals('ssh', get_url_scheme('ssh://domain.tld'));
-        $this->assertEquals('ftp', get_url_scheme('ftp://domain.tld'));
-        $this->assertEquals('git', get_url_scheme('git://domain.tld/push?pull=clone#checkout'));
-    }
-}
diff --git a/tests/Url/UnparseUrlTest.php b/tests/Url/UnparseUrlTest.php
deleted file mode 100644
index e314b484..00000000
--- a/tests/Url/UnparseUrlTest.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-/**
- * Unpares Url's tests
- */
-
-require_once 'application/Url.php';
-
-/**
- * Unitary tests for unparse_url()
- */
-class UnparseUrlTest extends PHPUnit_Framework_TestCase
-{
-    /**
-     * Thanks for building nothing
-     */
-    public function testUnparseEmptyArray()
-    {
-        $this->assertEquals('', unparse_url(array()));
-    }
-
-    /**
-     * Rebuild a full-featured URL
-     */
-    public function testUnparseFull()
-    {
-        $ref = 'http://username:password@hostname:9090/path'
-              .'?arg1=value1&arg2=value2#anchor';
-        $this->assertEquals($ref, unparse_url(parse_url($ref)));
-    }
-}
diff --git a/tests/Url/WhitelistProtocolsTest.php b/tests/Url/WhitelistProtocolsTest.php
deleted file mode 100644
index a3156804..00000000
--- a/tests/Url/WhitelistProtocolsTest.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-
-require_once 'application/Url.php';
-
-use Shaarli\Config\ConfigManager;
-
-/**
- * Class WhitelistProtocolsTest
- *
- * Test whitelist_protocols() function of Url.
- */
-class WhitelistProtocolsTest extends PHPUnit_Framework_TestCase
-{
-    /**
-     * Test whitelist_protocols() on a note (relative URL).
-     */
-    public function testWhitelistProtocolsRelative()
-    {
-        $whitelist = ['ftp', 'magnet'];
-        $url = '?12443564';
-        $this->assertEquals($url, whitelist_protocols($url, $whitelist));
-        $url = '/path.jpg';
-        $this->assertEquals($url, whitelist_protocols($url, $whitelist));
-    }
-
-    /**
-     * Test whitelist_protocols() on a note (relative URL).
-     */
-    public function testWhitelistProtocolMissing()
-    {
-        $whitelist = ['ftp', 'magnet'];
-        $url = 'test.tld/path/?query=value#hash';
-        $this->assertEquals('http://'. $url, whitelist_protocols($url, $whitelist));
-    }
-
-    /**
-     * Test whitelist_protocols() with allowed protocols.
-     */
-    public function testWhitelistAllowedProtocol()
-    {
-        $whitelist = ['ftp', 'magnet'];
-        $url = 'http://test.tld/path/?query=value#hash';
-        $this->assertEquals($url, whitelist_protocols($url, $whitelist));
-        $url = 'https://test.tld/path/?query=value#hash';
-        $this->assertEquals($url, whitelist_protocols($url, $whitelist));
-        $url = 'ftp://test.tld/path/?query=value#hash';
-        $this->assertEquals($url, whitelist_protocols($url, $whitelist));
-        $url = 'magnet:test.tld/path/?query=value#hash';
-        $this->assertEquals($url, whitelist_protocols($url, $whitelist));
-    }
-
-    /**
-     * Test whitelist_protocols() with allowed protocols.
-     */
-    public function testWhitelistDisallowedProtocol()
-    {
-        $whitelist = ['ftp', 'magnet'];
-        $url = 'javascript:alert("xss");';
-        $this->assertEquals('http://alert("xss");', whitelist_protocols($url, $whitelist));
-        $url = 'other://test.tld/path/?query=value#hash';
-        $this->assertEquals('http://test.tld/path/?query=value#hash', whitelist_protocols($url, $whitelist));
-    }
-}