diff --git a/vendor/autoload.php b/vendor/autoload.php index 2595659..116aa8b 100644 --- a/vendor/autoload.php +++ b/vendor/autoload.php @@ -4,4 +4,4 @@ require_once __DIR__ . '/composer' . '/autoload_real.php'; -return ComposerAutoloaderInit093c65b5382fc7317d870fcd9f8036ba::getLoader(); +return ComposerAutoloaderInita56cecf18737d4c6655b021e5f21a1a6::getLoader(); diff --git a/vendor/bin/picofeed b/vendor/bin/picofeed new file mode 120000 index 0000000..0307acc --- /dev/null +++ b/vendor/bin/picofeed @@ -0,0 +1 @@ +../fguillot/picofeed/picofeed \ No newline at end of file diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php index 1f0d835..3fed2d2 100644 --- a/vendor/composer/autoload_real.php +++ b/vendor/composer/autoload_real.php @@ -2,7 +2,7 @@ // autoload_real.php @generated by Composer -class ComposerAutoloaderInit093c65b5382fc7317d870fcd9f8036ba +class ComposerAutoloaderInita56cecf18737d4c6655b021e5f21a1a6 { private static $loader; @@ -19,9 +19,9 @@ class ComposerAutoloaderInit093c65b5382fc7317d870fcd9f8036ba return self::$loader; } - spl_autoload_register(array('ComposerAutoloaderInit093c65b5382fc7317d870fcd9f8036ba', 'loadClassLoader'), true, true); + spl_autoload_register(array('ComposerAutoloaderInita56cecf18737d4c6655b021e5f21a1a6', 'loadClassLoader'), true, true); self::$loader = $loader = new \Composer\Autoload\ClassLoader(); - spl_autoload_unregister(array('ComposerAutoloaderInit093c65b5382fc7317d870fcd9f8036ba', 'loadClassLoader')); + spl_autoload_unregister(array('ComposerAutoloaderInita56cecf18737d4c6655b021e5f21a1a6', 'loadClassLoader')); $map = require __DIR__ . '/autoload_namespaces.php'; foreach ($map as $namespace => $path) { @@ -42,14 +42,14 @@ class ComposerAutoloaderInit093c65b5382fc7317d870fcd9f8036ba $includeFiles = require __DIR__ . '/autoload_files.php'; foreach ($includeFiles as $file) { - composerRequire093c65b5382fc7317d870fcd9f8036ba($file); + composerRequirea56cecf18737d4c6655b021e5f21a1a6($file); } return $loader; } } -function composerRequire093c65b5382fc7317d870fcd9f8036ba($file) +function composerRequirea56cecf18737d4c6655b021e5f21a1a6($file) { require $file; } diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index 767043c..c35838e 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -162,12 +162,12 @@ "source": { "type": "git", "url": "https://github.com/fguillot/picoFeed.git", - "reference": "a006fc10642fbdc5414bebd6542aeabd35f8c98b" + "reference": "acc16f1a0854fdaeae2416f1b12ee51a9c150b52" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/fguillot/picoFeed/zipball/a006fc10642fbdc5414bebd6542aeabd35f8c98b", - "reference": "a006fc10642fbdc5414bebd6542aeabd35f8c98b", + "url": "https://api.github.com/repos/fguillot/picoFeed/zipball/acc16f1a0854fdaeae2416f1b12ee51a9c150b52", + "reference": "acc16f1a0854fdaeae2416f1b12ee51a9c150b52", "shasum": "" }, "require": { @@ -178,7 +178,13 @@ "ext-xml": "*", "php": ">=5.3.0" }, - "time": "2015-03-03 03:14:01", + "suggest": { + "ext-curl": "PicoFeed will use cURL if present" + }, + "time": "2015-03-19 22:19:36", + "bin": [ + "picofeed" + ], "type": "library", "installation-source": "dist", "autoload": { diff --git a/vendor/fguillot/picofeed/composer.json b/vendor/fguillot/picofeed/composer.json index be2e24e..4c13bd6 100644 --- a/vendor/fguillot/picofeed/composer.json +++ b/vendor/fguillot/picofeed/composer.json @@ -18,7 +18,13 @@ "ext-libxml": "*", "ext-SimpleXML": "*" }, + "suggest": { + "ext-curl": "PicoFeed will use cURL if present" + }, "autoload": { "psr-0": {"PicoFeed": "lib/"} - } + }, + "bin" : [ + "picofeed" + ] } diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Filter/Attribute.php b/vendor/fguillot/picofeed/lib/PicoFeed/Filter/Attribute.php index e8012dd..ae77ff7 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Filter/Attribute.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Filter/Attribute.php @@ -215,7 +215,8 @@ class Attribute * @var array */ private $add_attributes = array( - 'a' => array('rel' => 'noreferrer', 'target' => '_blank') + 'a' => array('rel' => 'noreferrer', 'target' => '_blank'), + 'video' => array('controls' => 'true'), ); /** diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/lesjoiesducode.fr.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/lesjoiesducode.fr.php index 3ade94b..68e097a 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/lesjoiesducode.fr.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/lesjoiesducode.fr.php @@ -2,7 +2,7 @@ return array( 'test_url' => 'http://lesjoiesducode.fr/post/75576211207/quand-lappli-ne-fonctionne-plus-sans-aucune-raison', 'body' => array( - '//div[@class="post"]//img', + '//div[@class="blog-post-content"]', ), 'strip' => array( ) diff --git a/vendor/fguillot/picofeed/tests/Client/ClientTest.php b/vendor/fguillot/picofeed/tests/Client/ClientTest.php index 7959281..b508372 100644 --- a/vendor/fguillot/picofeed/tests/Client/ClientTest.php +++ b/vendor/fguillot/picofeed/tests/Client/ClientTest.php @@ -6,6 +6,9 @@ use PHPUnit_Framework_TestCase; class ClientTest extends PHPUnit_Framework_TestCase { + /** + * @group online + */ public function testDownload() { $client = Client::getInstance(); @@ -20,6 +23,7 @@ class ClientTest extends PHPUnit_Framework_TestCase /** * @runInSeparateProcess + * @group online */ public function testPassthrough() { @@ -31,6 +35,9 @@ class ClientTest extends PHPUnit_Framework_TestCase $this->expectOutputString(file_get_contents('tests/fixtures/miniflux_favicon.ico')); } + /** + * @group online + */ public function testCacheBothHaveToMatch() { $client = Client::getInstance(); @@ -46,6 +53,9 @@ class ClientTest extends PHPUnit_Framework_TestCase $this->assertTrue($client->isModified()); } + /** + * @group online + */ public function testCacheEtag() { $client = Client::getInstance(); @@ -63,6 +73,9 @@ class ClientTest extends PHPUnit_Framework_TestCase $this->assertFalse($client->isModified()); } + /** + * @group online + */ public function testCacheLastModified() { $client = Client::getInstance(); @@ -78,6 +91,9 @@ class ClientTest extends PHPUnit_Framework_TestCase $this->assertFalse($client->isModified()); } + /** + * @group online + */ public function testCacheBoth() { $client = Client::getInstance(); @@ -95,6 +111,9 @@ class ClientTest extends PHPUnit_Framework_TestCase $this->assertFalse($client->isModified()); } + /** + * @group online + */ public function testCharset() { $client = Client::getInstance(); @@ -108,6 +127,9 @@ class ClientTest extends PHPUnit_Framework_TestCase $this->assertEquals('', $client->getEncoding()); } + /** + * @group online + */ public function testContentType() { $client = Client::getInstance(); diff --git a/vendor/fguillot/picofeed/tests/Client/CurlTest.php b/vendor/fguillot/picofeed/tests/Client/CurlTest.php index e141a1f..3ee249f 100644 --- a/vendor/fguillot/picofeed/tests/Client/CurlTest.php +++ b/vendor/fguillot/picofeed/tests/Client/CurlTest.php @@ -6,6 +6,9 @@ use PHPUnit_Framework_TestCase; class CurlTest extends PHPUnit_Framework_TestCase { + /** + * @group online + */ public function testDownload() { $client = new Curl; @@ -20,6 +23,7 @@ class CurlTest extends PHPUnit_Framework_TestCase /** * @runInSeparateProcess + * @group online */ public function testPassthrough() { @@ -31,6 +35,9 @@ class CurlTest extends PHPUnit_Framework_TestCase $this->expectOutputString(file_get_contents('tests/fixtures/miniflux_favicon.ico')); } + /** + * @group online + */ public function testRedirect() { $client = new Curl; @@ -46,6 +53,7 @@ class CurlTest extends PHPUnit_Framework_TestCase /** * @expectedException PicoFeed\Client\InvalidCertificateException + * @group online */ public function testSSL() { diff --git a/vendor/fguillot/picofeed/tests/Client/GrabberTest.php b/vendor/fguillot/picofeed/tests/Client/GrabberTest.php index 8fc9c58..224dc14 100644 --- a/vendor/fguillot/picofeed/tests/Client/GrabberTest.php +++ b/vendor/fguillot/picofeed/tests/Client/GrabberTest.php @@ -7,6 +7,9 @@ use PicoFeed\Reader\Reader; class GrabberTest extends PHPUnit_Framework_TestCase { + /** + * @group online + */ public function testGrabContentWithCandidates() { $grabber = new Grabber('http://theonion.com.feedsportal.com/c/34529/f/632231/s/309a7fe4/sc/20/l/0L0Stheonion0N0Carticles0Cobama0Ethrows0Eup0Eright0Ethere0Eduring0Esyria0Emeeting0H336850C/story01.htm'); @@ -37,6 +40,9 @@ class GrabberTest extends PHPUnit_Framework_TestCase } // 01net.com - https://github.com/fguillot/miniflux/issues/267 + /** + * @group online + */ public function testGetRules_afterRedirection() { $grabber = new Grabber('http://rss.feedsportal.com/c/629/f/502199/s/422f8c8a/sc/44/l/0L0S0A1net0N0Ceditorial0C640A3130Cces0E20A150Eimprimer0Eune0Epizza0Eet0Edes0Ebiscuits0Evideo0C0T0Dxtor0FRSS0E16/story01.htm'); @@ -44,6 +50,9 @@ class GrabberTest extends PHPUnit_Framework_TestCase $this->assertTrue(is_array($grabber->getRules())); } + /** + * @group online + */ public function testGrabContent() { $grabber = new Grabber('http://www.egscomics.com/index.php?id=1690'); @@ -53,6 +62,9 @@ class GrabberTest extends PHPUnit_Framework_TestCase $this->assertEquals('', $grabber->getContent()); } + /** + * @group online + */ public function testRssGrabContent() { $reader = new Reader; diff --git a/vendor/fguillot/picofeed/tests/Client/StreamTest.php b/vendor/fguillot/picofeed/tests/Client/StreamTest.php index 314d488..9a72789 100644 --- a/vendor/fguillot/picofeed/tests/Client/StreamTest.php +++ b/vendor/fguillot/picofeed/tests/Client/StreamTest.php @@ -6,6 +6,9 @@ use PHPUnit_Framework_TestCase; class StreamTest extends PHPUnit_Framework_TestCase { + /** + * @group online + */ public function testChunkedResponse() { $client = new Stream; @@ -15,6 +18,9 @@ class StreamTest extends PHPUnit_Framework_TestCase $this->assertEquals('', substr($result['body'], -6)); } + /** + * @group online + */ public function testDownload() { $client = new Stream; @@ -29,6 +35,7 @@ class StreamTest extends PHPUnit_Framework_TestCase /** * @runInSeparateProcess + * @group online */ public function testPassthrough() { @@ -40,6 +47,9 @@ class StreamTest extends PHPUnit_Framework_TestCase $this->expectOutputString(file_get_contents('tests/fixtures/miniflux_favicon.ico')); } + /** + * @group online + */ public function testRedirect() { $client = new Stream; @@ -64,6 +74,9 @@ class StreamTest extends PHPUnit_Framework_TestCase $client->doRequest(); } + /** + * @group online + */ public function testDecodeGzip() { if (function_exists('gzdecode')) { diff --git a/vendor/fguillot/picofeed/tests/Parser/Rss20ParserTest.php b/vendor/fguillot/picofeed/tests/Parser/Rss20ParserTest.php index 0f8d736..71ee74f 100644 --- a/vendor/fguillot/picofeed/tests/Parser/Rss20ParserTest.php +++ b/vendor/fguillot/picofeed/tests/Parser/Rss20ParserTest.php @@ -94,7 +94,7 @@ class Rss20ParserTest extends PHPUnit_Framework_TestCase $parser = new Rss20(file_get_contents('tests/fixtures/fulltextrss.xml')); $feed = $parser->execute(); - $this->assertEquals(new DateTime, $feed->getDate()); + $this->assertEquals(time(), $feed->getDate()->getTimestamp(), '', 1); } public function testFeedLanguage() diff --git a/vendor/fguillot/picofeed/tests/Reader/FaviconTest.php b/vendor/fguillot/picofeed/tests/Reader/FaviconTest.php index 0652bc4..81c9a04 100644 --- a/vendor/fguillot/picofeed/tests/Reader/FaviconTest.php +++ b/vendor/fguillot/picofeed/tests/Reader/FaviconTest.php @@ -77,6 +77,9 @@ class FaviconTest extends PHPUnit_Framework_TestCase $this->assertEquals(array(), $favicon->extract($html)); } + /** + * @group online + */ public function testExists() { $favicon = new Favicon; @@ -87,6 +90,9 @@ class FaviconTest extends PHPUnit_Framework_TestCase $this->assertFalse($favicon->exists('')); } + /** + * @group online + */ public function testFind_inMeta() { $favicon = new Favicon; @@ -123,6 +129,9 @@ class FaviconTest extends PHPUnit_Framework_TestCase $this->assertEmpty($favicon->getContent()); } + /** + * @group online + */ public function testFind_directLinkFirst() { $favicon = new Favicon; @@ -135,6 +144,9 @@ class FaviconTest extends PHPUnit_Framework_TestCase $this->assertNotEmpty($favicon->getContent()); } + /** + * @group online + */ public function testFind_fallsBackToExtract() { $favicon = new Favicon; @@ -146,6 +158,9 @@ class FaviconTest extends PHPUnit_Framework_TestCase $this->assertNotEmpty($favicon->getContent()); } + /** + * @group online + */ public function testDataUri() { $favicon = new Favicon; @@ -160,6 +175,9 @@ class FaviconTest extends PHPUnit_Framework_TestCase $this->assertEquals($expected, $favicon->getDataUri()); } + /** + * @group online + */ public function testDataUri_withBadContentType() { $favicon = new Favicon; diff --git a/vendor/fguillot/picofeed/tests/Reader/ReaderTest.php b/vendor/fguillot/picofeed/tests/Reader/ReaderTest.php index 1bd60ff..821c6b9 100644 --- a/vendor/fguillot/picofeed/tests/Reader/ReaderTest.php +++ b/vendor/fguillot/picofeed/tests/Reader/ReaderTest.php @@ -15,6 +15,9 @@ class ReaderTest extends PHPUnit_Framework_TestCase $this->assertEquals('https://google.com', $reader->prependScheme('https://google.com')); } + /** + * @group online + */ public function testDownload_withHTTP() { $reader = new Reader; @@ -22,6 +25,9 @@ class ReaderTest extends PHPUnit_Framework_TestCase $this->assertNotEmpty($feed); } + /** + * @group online + */ public function testDownload_withHTTPS() { $reader = new Reader; @@ -29,6 +35,9 @@ class ReaderTest extends PHPUnit_Framework_TestCase $this->assertNotEmpty($feed); } + /** + * @group online + */ public function testDownload_withCache() { $reader = new Reader; @@ -210,6 +219,9 @@ class ReaderTest extends PHPUnit_Framework_TestCase $this->assertEquals(array(), $feeds); } + /** + * @group online + */ public function testDiscover() { $reader = new Reader;