From 709317f23d09594d4514873e3ca1e98cca7110ad Mon Sep 17 00:00:00 2001
From: Frederic Guillot <fred@miniflux.net>
Date: Thu, 13 Aug 2015 20:07:29 -0400
Subject: [PATCH] Update PicoFeed

---
 composer.json                                        |  2 +-
 vendor/composer/installed.json                       | 12 ++++++------
 .../picofeed/lib/PicoFeed/Rules/explosm.net.php      |  1 -
 vendor/fguillot/picofeed/tests/Client/CurlTest.php   |  4 ++--
 vendor/fguillot/picofeed/tests/Client/StreamTest.php |  4 ++--
 5 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/composer.json b/composer.json
index a8a8668..4fd97da 100644
--- a/composer.json
+++ b/composer.json
@@ -6,7 +6,7 @@
         "fguillot/simple-validator": "v0.0.3",
         "fguillot/json-rpc": "v0.0.3",
         "fguillot/picodb": "v0.0.3",
-        "fguillot/picofeed": "v0.1.7",
+        "fguillot/picofeed": "v0.1.8",
         "fguillot/picofarad": "dev-master"
     },
     "autoload": {
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index 576f3f1..df37fc7 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -156,17 +156,17 @@
     },
     {
         "name": "fguillot/picofeed",
-        "version": "v0.1.7",
-        "version_normalized": "0.1.7.0",
+        "version": "v0.1.8",
+        "version_normalized": "0.1.8.0",
         "source": {
             "type": "git",
             "url": "https://github.com/fguillot/picoFeed.git",
-            "reference": "8ed3f1a9f777938611645d523ddc707a7cd0e7d7"
+            "reference": "a6d01a62514530dea91b2c8da5e194d680e1d91b"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/fguillot/picoFeed/zipball/8ed3f1a9f777938611645d523ddc707a7cd0e7d7",
-            "reference": "8ed3f1a9f777938611645d523ddc707a7cd0e7d7",
+            "url": "https://api.github.com/repos/fguillot/picoFeed/zipball/a6d01a62514530dea91b2c8da5e194d680e1d91b",
+            "reference": "a6d01a62514530dea91b2c8da5e194d680e1d91b",
             "shasum": ""
         },
         "require": {
@@ -180,7 +180,7 @@
         "suggest": {
             "ext-curl": "PicoFeed will use cURL if present"
         },
-        "time": "2015-08-02 17:56:46",
+        "time": "2015-08-13 23:56:50",
         "bin": [
             "picofeed"
         ],
diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/explosm.net.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/explosm.net.php
index 3a65871..83a0890 100644
--- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/explosm.net.php
+++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/explosm.net.php
@@ -5,7 +5,6 @@ return array(
             'test_url' => 'http://explosm.net/comics/3803/',
             'body' => array(
                 '//div[@id="comic-container"]',
-                '//div[@id="comic-container"]//img/@src'
             ),
             'strip' => array(
             ),
diff --git a/vendor/fguillot/picofeed/tests/Client/CurlTest.php b/vendor/fguillot/picofeed/tests/Client/CurlTest.php
index a1410ce..ec7b398 100644
--- a/vendor/fguillot/picofeed/tests/Client/CurlTest.php
+++ b/vendor/fguillot/picofeed/tests/Client/CurlTest.php
@@ -47,8 +47,8 @@ class CurlTest extends PHPUnit_Framework_TestCase
         $this->assertTrue(is_array($result));
         $this->assertEquals(200, $result['status']);
         $this->assertEquals('<!DOCTYPE', substr($result['body'], 0, 9));
-        $this->assertEquals('text/html', $result['headers']['Content-Type']);
-        $this->assertEquals('http://www.01net.com/editorial/643722/android-google-now-s-ouvre-aux-applications-tierces/', str_replace('#?xtor=RSS-16', '', $client->getUrl()));
+        $this->assertEquals('text/html; charset=utf-8', $result['headers']['Content-Type']);
+        $this->assertEquals('http://www.01net.com/actualites/android-google-now-s-ouvre-aux-applications-tierces-643722.html', $client->getUrl());
     }
 
     /**
diff --git a/vendor/fguillot/picofeed/tests/Client/StreamTest.php b/vendor/fguillot/picofeed/tests/Client/StreamTest.php
index 9a72789..764850d 100644
--- a/vendor/fguillot/picofeed/tests/Client/StreamTest.php
+++ b/vendor/fguillot/picofeed/tests/Client/StreamTest.php
@@ -59,8 +59,8 @@ class StreamTest extends PHPUnit_Framework_TestCase
         $this->assertTrue(is_array($result));
         $this->assertEquals(200, $result['status']);
         $this->assertEquals('<!DOCTYPE', substr($result['body'], 0, 9));
-        $this->assertEquals('text/html', $result['headers']['Content-Type']);
-        $this->assertEquals('http://www.01net.com/editorial/643722/android-google-now-s-ouvre-aux-applications-tierces/#?xtor=RSS-16', $client->getUrl());
+        $this->assertEquals('text/html; charset=utf-8', $result['headers']['Content-Type']);
+        $this->assertEquals('http://www.01net.com/actualites/android-google-now-s-ouvre-aux-applications-tierces-643722.html', $client->getUrl());
     }
 
     /**