From 73f65c8fbadbdd2098448e77b6d3f0464ad8613e Mon Sep 17 00:00:00 2001 From: Bernhard Posselt Date: Tue, 27 Jan 2015 09:29:09 +0100 Subject: update picofeed --- vendor/fguillot/picofeed | 1 + .../fguillot/picofeed/tests/Client/ClientTest.php | 110 ----------- vendor/fguillot/picofeed/tests/Client/CurlTest.php | 53 ----- .../fguillot/picofeed/tests/Client/GrabberTest.php | 59 ------ .../picofeed/tests/Client/HttpHeadersTest.php | 19 -- .../fguillot/picofeed/tests/Client/StreamTest.php | 63 ------ vendor/fguillot/picofeed/tests/Client/UrlTest.php | 220 --------------------- 7 files changed, 1 insertion(+), 524 deletions(-) create mode 160000 vendor/fguillot/picofeed delete mode 100644 vendor/fguillot/picofeed/tests/Client/ClientTest.php delete mode 100644 vendor/fguillot/picofeed/tests/Client/CurlTest.php delete mode 100644 vendor/fguillot/picofeed/tests/Client/GrabberTest.php delete mode 100644 vendor/fguillot/picofeed/tests/Client/HttpHeadersTest.php delete mode 100644 vendor/fguillot/picofeed/tests/Client/StreamTest.php delete mode 100644 vendor/fguillot/picofeed/tests/Client/UrlTest.php (limited to 'vendor/fguillot/picofeed/tests/Client') diff --git a/vendor/fguillot/picofeed b/vendor/fguillot/picofeed new file mode 160000 index 000000000..0a1d0d395 --- /dev/null +++ b/vendor/fguillot/picofeed @@ -0,0 +1 @@ +Subproject commit 0a1d0d3950f7f047dc8fb1d80aa6296e15f306d0 diff --git a/vendor/fguillot/picofeed/tests/Client/ClientTest.php b/vendor/fguillot/picofeed/tests/Client/ClientTest.php deleted file mode 100644 index 3f094d04c..000000000 --- a/vendor/fguillot/picofeed/tests/Client/ClientTest.php +++ /dev/null @@ -1,110 +0,0 @@ -setUrl('http://php.net/robots.txt'); - $client->execute(); - - $this->assertTrue($client->isModified()); - $this->assertNotEmpty($client->getContent()); - $this->assertNotEmpty($client->getEtag()); - $this->assertNotEmpty($client->getLastModified()); - } - - public function testCacheBothHaveToMatch() - { - $client = Client::getInstance(); - $client->setUrl('http://php.net/robots.txt'); - $client->execute(); - $etag = $client->getEtag(); - - $client = Client::getInstance(); - $client->setUrl('http://php.net/robots.txt'); - $client->setEtag($etag); - $client->execute(); - - $this->assertTrue($client->isModified()); - } - - public function testCacheEtag() - { - $client = Client::getInstance(); - $client->setUrl('http://php.net/robots.txt'); - $client->execute(); - $etag = $client->getEtag(); - $lastModified = $client->getLastModified(); - - $client = Client::getInstance(); - $client->setUrl('http://php.net/robots.txt'); - $client->setEtag($etag); - $client->setLastModified($lastModified); - $client->execute(); - - $this->assertFalse($client->isModified()); - } - - public function testCacheLastModified() - { - $client = Client::getInstance(); - $client->setUrl('http://miniflux.net/humans.txt'); - $client->execute(); - $lastmod = $client->getLastModified(); - - $client = Client::getInstance(); - $client->setUrl('http://miniflux.net/humans.txt'); - $client->setLastModified($lastmod); - $client->execute(); - - $this->assertFalse($client->isModified()); - } - - public function testCacheBoth() - { - $client = Client::getInstance(); - $client->setUrl('http://miniflux.net/humans.txt'); - $client->execute(); - $lastmod = $client->getLastModified(); - $etag = $client->getEtag(); - - $client = Client::getInstance(); - $client->setUrl('http://miniflux.net/humans.txt'); - $client->setLastModified($lastmod); - $client->setEtag($etag); - $client->execute(); - - $this->assertFalse($client->isModified()); - } - - public function testCharset() - { - $client = Client::getInstance(); - $client->setUrl('http://php.net/'); - $client->execute(); - $this->assertEquals('utf-8', $client->getEncoding()); - - $client = Client::getInstance(); - $client->setUrl('http://php.net/robots.txt'); - $client->execute(); - $this->assertEquals('', $client->getEncoding()); - } - - public function testContentType() - { - $client = Client::getInstance(); - $client->setUrl('http://miniflux.net/assets/img/favicon.png'); - $client->execute(); - $this->assertEquals('image/png', $client->getContentType()); - - $client = Client::getInstance(); - $client->setUrl('http://miniflux.net/'); - $client->execute(); - $this->assertEquals('text/html; charset=utf-8', $client->getContentType()); - } -} diff --git a/vendor/fguillot/picofeed/tests/Client/CurlTest.php b/vendor/fguillot/picofeed/tests/Client/CurlTest.php deleted file mode 100644 index 668816036..000000000 --- a/vendor/fguillot/picofeed/tests/Client/CurlTest.php +++ /dev/null @@ -1,53 +0,0 @@ -setUrl('http://miniflux.net/index.html'); - $result = $client->doRequest(); - - $this->assertTrue(is_array($result)); - $this->assertEquals(200, $result['status']); - $this->assertEquals('assertEquals('text/html; charset=utf-8', $result['headers']['Content-Type']); - } - - - public function testRedirect() - { - $client = new Curl; - $client->setUrl('http://www.miniflux.net/index.html'); - $result = $client->doRequest(); - - $this->assertTrue(is_array($result)); - $this->assertEquals(200, $result['status']); - $this->assertEquals('assertEquals('text/html; charset=utf-8', $result['headers']['Content-Type']); - } - - /** - * @expectedException PicoFeed\Client\InvalidCertificateException - */ - public function testSSL() - { - $client = new Curl; - $client->setUrl('https://www.mjvmobile.com.br'); - $client->doRequest(); - } - - /** - * @expectedException PicoFeed\Client\InvalidUrlException - */ - public function testBadUrl() - { - $client = new Curl; - $client->setUrl('http://12345gfgfgf'); - $client->doRequest(); - } -} \ No newline at end of file diff --git a/vendor/fguillot/picofeed/tests/Client/GrabberTest.php b/vendor/fguillot/picofeed/tests/Client/GrabberTest.php deleted file mode 100644 index a29414ed0..000000000 --- a/vendor/fguillot/picofeed/tests/Client/GrabberTest.php +++ /dev/null @@ -1,59 +0,0 @@ -download(); - $this->assertTrue($grabber->parse()); - - $grabber = new Grabber('http://www.lemonde.fr/proche-orient/article/2013/08/30/la-france-nouvelle-plus-ancienne-alliee-des-etats-unis_3469218_3218.html'); - $grabber->download(); - $this->assertTrue($grabber->parse()); - - $grabber = new Grabber('http://www.rue89.com/2013/08/30/faisait-boris-boillon-ex-sarko-boy-350-000-euros-gare-nord-245315'); - $grabber->download(); - $this->assertTrue($grabber->parse()); - - $grabber = new Grabber('http://www.inc.com/suzanne-lucas/why-employee-turnover-is-so-costly.html'); - $grabber->download(); - $this->assertTrue($grabber->parse()); - - $grabber = new Grabber('http://arstechnica.com/information-technology/2013/08/sysadmin-security-fail-nsa-finds-snowden-hijacked-officials-logins/'); - $grabber->download(); - $this->assertTrue($grabber->parse()); - } - - public function testGetRules() - { - $grabber = new Grabber('http://www.egscomics.com/index.php?id=1690'); - $this->assertTrue(is_array($grabber->getRules())); - } - - public function testGrabContent() - { - $grabber = new Grabber('http://www.egscomics.com/index.php?id=1690'); - $grabber->download(); - $this->assertTrue($grabber->parse()); - - $this->assertEquals('', $grabber->getContent()); - } - - public function testRssGrabContent() - { - $reader = new Reader; - $client = $reader->download('http://www.egscomics.com/rss.php'); - $parser = $reader->getParser($client->getUrl(), $client->getContent(), $client->getEncoding()); - $parser->enableContentGrabber(); - $feed = $parser->execute(); - - $this->assertTrue(is_array($feed->items)); - $this->assertTrue(strpos($feed->items[0]->content, '= 0); - } -} diff --git a/vendor/fguillot/picofeed/tests/Client/HttpHeadersTest.php b/vendor/fguillot/picofeed/tests/Client/HttpHeadersTest.php deleted file mode 100644 index f577d00fa..000000000 --- a/vendor/fguillot/picofeed/tests/Client/HttpHeadersTest.php +++ /dev/null @@ -1,19 +0,0 @@ - 'test')); - $this->assertEquals('test', $headers['content-typE']); - $this->assertTrue(isset($headers['ConTent-Type'])); - - unset($headers['Content-Type']); - $this->assertFalse(isset($headers['ConTent-Type'])); - } - -} \ No newline at end of file diff --git a/vendor/fguillot/picofeed/tests/Client/StreamTest.php b/vendor/fguillot/picofeed/tests/Client/StreamTest.php deleted file mode 100644 index 8b2e2f8b8..000000000 --- a/vendor/fguillot/picofeed/tests/Client/StreamTest.php +++ /dev/null @@ -1,63 +0,0 @@ -setUrl('http://www.reddit.com/r/dwarffortress/.rss'); - $result = $client->doRequest(); - - $this->assertEquals('', substr($result['body'], -6)); - } - - public function testDownload() - { - $client = new Stream; - $client->setUrl('https://github.com/fguillot/picoFeed'); - $result = $client->doRequest(); - - $this->assertEquals(200, $result['status']); - $this->assertEquals('text/html; charset=utf-8', $result['headers']['Content-Type']); - $this->assertEquals('', substr(trim($result['body']), 0, 15)); - $this->assertEquals('', substr(trim($result['body']), -7)); - } - - public function testRedirect() - { - $client = new Stream; - $client->setUrl('http://github.com/fguillot/picoFeed'); - $result = $client->doRequest(); - - $this->assertEquals(200, $result['status']); - $this->assertEquals('', substr(trim($result['body']), 0, 15)); - $this->assertEquals('text/html; charset=utf-8', $result['headers']['Content-Type']); - } - - /** - * @expectedException PicoFeed\Client\InvalidUrlException - */ - public function testBadUrl() - { - $client = new Stream; - $client->setUrl('http://12345gfgfgf'); - $client->setTimeout(1); - $client->doRequest(); - } - - public function testDecodeGzip() - { - if (function_exists('gzdecode')) { - $client = new Stream; - $client->setUrl('https://github.com/fguillot/picoFeed'); - $result = $client->doRequest(); - - $this->assertEquals('gzip', $result['headers']['Content-Encoding']); - $this->assertEquals('assertTrue($url->hasScheme()); - - $url = new Url('//www.google.fr/'); - $this->assertFalse($url->hasScheme()); - - $url = new Url('/path'); - $this->assertFalse($url->hasScheme()); - - $url = new Url('anything'); - $this->assertFalse($url->hasScheme()); - } - - public function testHasPort() - { - $url = new Url('http://127.0.0.1:8000/'); - $this->assertTrue($url->hasPort()); - - $url = new Url('http://127.0.0.1/'); - $this->assertFalse($url->hasPort()); - } - - public function testIsProtocolRelative() - { - $url = new Url('http://www.google.fr/'); - $this->assertFalse($url->isProtocolRelative()); - - $url = new Url('//www.google.fr/'); - $this->assertTrue($url->isProtocolRelative()); - - $url = new Url('/path'); - $this->assertFalse($url->isProtocolRelative()); - - $url = new Url('anything'); - $this->assertFalse($url->isProtocolRelative()); - } - - public function testBaseUrl() - { - $url = new Url('../bla'); - $this->assertEquals('', $url->getBaseUrl()); - - $url = new Url('github.com'); - $this->assertEquals('', $url->getBaseUrl()); - - $url = new Url('http://127.0.0.1:8000'); - $this->assertEquals('http://127.0.0.1:8000', $url->getBaseUrl()); - - $url = new Url('http://127.0.0.1:8000/test?123'); - $this->assertEquals('http://127.0.0.1:8000', $url->getBaseUrl()); - - $url = new Url('http://localhost/test'); - $this->assertEquals('http://localhost', $url->getBaseUrl()); - - $url = new Url('https://localhost/test'); - $this->assertEquals('https://localhost', $url->getBaseUrl()); - - $url = new Url('//localhost/test?truc'); - $this->assertEquals('http://localhost', $url->getBaseUrl()); - } - - public function testIsRelativeUrl() - { - $url = new Url('http://www.google.fr/'); - $this->assertFalse($url->isRelativeUrl()); - - $url = new Url('//www.google.fr/'); - $this->assertFalse($url->isRelativeUrl()); - - $url = new Url('/path'); - $this->assertTrue($url->isRelativeUrl()); - - $url = new Url('../../path'); - $this->assertTrue($url->isRelativeUrl()); - - $url = new Url('anything'); - $this->assertTrue($url->isRelativeUrl()); - - $url = new Url('/2014/08/03/4668-noisettes'); - $this->assertTrue($url->isRelativeUrl()); - - $url = new Url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAUA -AAAFCAYAAACNbyblAAAAHElEQVQI12P4//8/w38GIAXDIBKE0DHxgljNBAAO -9TXL0Y4OHwAAAABJRU5ErkJggg=='); - $this->assertFalse($url->isRelativeUrl()); - } - - public function testGetFullPath() - { - $url = new Url('http://www.google.fr/'); - $this->assertEquals('/', $url->getFullPath()); - - $url = new Url('//www.google.fr/search'); - $this->assertEquals('/search', $url->getFullPath()); - - $url = new Url('/path'); - $this->assertEquals('/path', $url->getFullPath()); - - $url = new Url('/path#test'); - $this->assertEquals('/path#test', $url->getFullPath()); - - $url = new Url('anything'); - $this->assertEquals('/anything', $url->getFullPath()); - - $url = new Url('index.php?foo=bar&test=1'); - $this->assertEquals('/index.php?foo=bar&test=1', $url->getFullPath()); - } - - public function testAbsoluteUrl() - { - $url = new Url('http://google.fr/'); - $this->assertEquals('http://google.fr/', $url->getAbsoluteUrl()); - - $url = new Url('http://google.ca'); - $this->assertEquals('http://google.ca/', $url->getAbsoluteUrl()); - - $url = new Url('../bla'); - $this->assertEquals('', $url->getAbsoluteUrl('')); - - $url = new Url('/2014/08/03/4668-noisettes'); - $this->assertEquals('http://www.la-grange.net/2014/08/03/4668-noisettes', $url->getAbsoluteUrl('http://www.la-grange.net/')); - - $url = new Url('http://www.google.fr/../bla'); - $this->assertEquals('http://www.google.fr/../bla', $url->getAbsoluteUrl('http://www.google.fr/')); - - $url = new Url('http://www.google.fr/'); - $this->assertEquals('http://www.google.fr/', $url->getAbsoluteUrl('http://www.google.fr/')); - - $url = new Url('//www.google.fr/search'); - $this->assertEquals('http://www.google.fr/search', $url->getAbsoluteUrl('//www.google.fr/')); - - $url = new Url('//www.google.fr/search'); - $this->assertEquals('http://www.google.fr/search', $url->getAbsoluteUrl()); - - $url = new Url('/path'); - $this->assertEquals('http://www.google.fr/path', $url->getAbsoluteUrl('http://www.google.fr/')); - - $url = new Url('/path#test'); - $this->assertEquals('http://www.google.fr/path#test', $url->getAbsoluteUrl('http://www.google.fr/')); - - $url = new Url('anything'); - $this->assertEquals('http://www.google.fr/anything', $url->getAbsoluteUrl('http://www.google.fr/')); - - $url = new Url('index.php?foo=bar&test=1'); - $this->assertEquals('http://www.google.fr/index.php?foo=bar&test=1', $url->getAbsoluteUrl('http://www.google.fr/')); - - $url = new Url('index.php?foo=bar&test=1'); - $this->assertEquals('', $url->getAbsoluteUrl()); - - $url = new Url('https://127.0.0.1:8000/here/test?v=3'); - $this->assertEquals('https://127.0.0.1:8000/here/test?v=3', $url->getAbsoluteUrl()); - - $url = new Url('test?v=3'); - $this->assertEquals('https://127.0.0.1:8000/here/test?v=3', $url->getAbsoluteUrl('https://127.0.0.1:8000/here/')); - } - - public function testIsRelativePath() - { - $url = new Url(''); - $this->assertTrue($url->isRelativePath()); - - $url = new Url('http://google.fr'); - $this->assertTrue($url->isRelativePath()); - - $url = new Url('filename.json'); - $this->assertTrue($url->isRelativePath()); - - $url = new Url('folder/filename.json'); - $this->assertTrue($url->isRelativePath()); - - $url = new Url('/filename.json'); - $this->assertFalse($url->isRelativePath()); - - $url = new Url('/folder/filename.json'); - $this->assertFalse($url->isRelativePath()); - } - - public function testResolve() - { - $this->assertEquals( - 'http://www.la-grange.net/2014/08/03/4668-noisettes', - Url::resolve('/2014/08/03/4668-noisettes', 'http://www.la-grange.net') - ); - - $this->assertEquals( - 'http://www.la-grange.net/2014/08/03/4668-noisettes', - Url::resolve('/2014/08/03/4668-noisettes', 'http://www.la-grange.net/') - ); - - $this->assertEquals( - 'http://www.la-grange.net/2014/08/03/4668-noisettes', - Url::resolve('/2014/08/03/4668-noisettes', 'http://www.la-grange.net/feed.atom') - ); - - $this->assertEquals( - 'http://what-if.xkcd.com/imgs/a/112/driving.png', - Url::resolve('/imgs/a/112/driving.png', 'http://what-if.xkcd.com/feed.atom') - ); - - $this->assertEquals( - 'http://website/subfolder/img/foo.png', - Url::resolve('img/foo.png', 'http://website/subfolder/') - ); - - $this->assertEquals( - 'http://website/img/foo.png', - Url::resolve('/img/foo.png', 'http://website/subfolder/') - ); - } -} -- cgit v1.2.3