update picofeed and zendxml

2016-02-20 17:58:58 +01:00 · 2016-02-20 17:58:58 +01:00 · 0dc7319f1f
--- a/composer.lock
+++ b/composer.lock
@ -57,12 +57,12 @@
            "source": {
                "type": "git",
                "url": "https://github.com/fguillot/picoFeed.git",
-                "reference": "3486412c07260f9db9f87c3f4e8d9e8d3e8b2793"
+                "reference": "c270ef4474a2460d857f99c84612025c5f9975f2"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/fguillot/picoFeed/zipball/3486412c07260f9db9f87c3f4e8d9e8d3e8b2793",
-                "reference": "3486412c07260f9db9f87c3f4e8d9e8d3e8b2793",
+                "url": "https://api.github.com/repos/fguillot/picoFeed/zipball/c270ef4474a2460d857f99c84612025c5f9975f2",
+                "reference": "c270ef4474a2460d857f99c84612025c5f9975f2",
                "shasum": ""
            },
            "require": {
@ -97,7 +97,7 @@
            ],
            "description": "Modern library to handle RSS/Atom feeds",
            "homepage": "https://github.com/fguillot/picoFeed",
-            "time": "2016-01-26 14:43:55"
+            "time": "2016-02-11 19:52:02"
        },
        {
            "name": "pear/net_url2",
@ -207,24 +207,24 @@
        },
        {
            "name": "zendframework/zendxml",
-            "version": "1.0.1",
+            "version": "1.0.2",
            "source": {
                "type": "git",
                "url": "https://github.com/zendframework/ZendXml.git",
-                "reference": "54edb3875aba5b45f02824f65f311c9fb2743a38"
+                "reference": "7b64507bc35d841c9c5802d67f6f87ef8e1a58c9"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/ZendXml/zipball/54edb3875aba5b45f02824f65f311c9fb2743a38",
-                "reference": "54edb3875aba5b45f02824f65f311c9fb2743a38",
+                "url": "https://api.github.com/repos/zendframework/ZendXml/zipball/7b64507bc35d841c9c5802d67f6f87ef8e1a58c9",
+                "reference": "7b64507bc35d841c9c5802d67f6f87ef8e1a58c9",
                "shasum": ""
            },
            "require": {
-                "php": ">=5.3.3"
+                "php": "^5.3.3 || ^7.0"
            },
            "require-dev": {
-                "phpunit/phpunit": "~3.7",
-                "squizlabs/php_codesniffer": "~1.5"
+                "phpunit/phpunit": "^3.7 || ^4.0",
+                "squizlabs/php_codesniffer": "^1.5"
            },
            "type": "library",
            "extra": {
@ -248,7 +248,7 @@
                "xml",
                "zf2"
            ],
-            "time": "2015-08-03 14:50:10"
+            "time": "2016-02-04 21:02:08"
        }
    ],
    "packages-dev": [],
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@ -157,27 +157,27 @@
    },
    {
        "name": "zendframework/zendxml",
-        "version": "1.0.1",
-        "version_normalized": "1.0.1.0",
+        "version": "1.0.2",
+        "version_normalized": "1.0.2.0",
        "source": {
            "type": "git",
            "url": "https://github.com/zendframework/ZendXml.git",
-            "reference": "54edb3875aba5b45f02824f65f311c9fb2743a38"
+            "reference": "7b64507bc35d841c9c5802d67f6f87ef8e1a58c9"
        },
        "dist": {
            "type": "zip",
-            "url": "https://api.github.com/repos/zendframework/ZendXml/zipball/54edb3875aba5b45f02824f65f311c9fb2743a38",
-            "reference": "54edb3875aba5b45f02824f65f311c9fb2743a38",
+            "url": "https://api.github.com/repos/zendframework/ZendXml/zipball/7b64507bc35d841c9c5802d67f6f87ef8e1a58c9",
+            "reference": "7b64507bc35d841c9c5802d67f6f87ef8e1a58c9",
            "shasum": ""
        },
        "require": {
-            "php": ">=5.3.3"
+            "php": "^5.3.3 || ^7.0"
        },
        "require-dev": {
-            "phpunit/phpunit": "~3.7",
-            "squizlabs/php_codesniffer": "~1.5"
+            "phpunit/phpunit": "^3.7 || ^4.0",
+            "squizlabs/php_codesniffer": "^1.5"
        },
-        "time": "2015-08-03 14:50:10",
+        "time": "2016-02-04 21:02:08",
        "type": "library",
        "extra": {
            "branch-alias": {
@ -209,12 +209,12 @@
        "source": {
            "type": "git",
            "url": "https://github.com/fguillot/picoFeed.git",
-            "reference": "3486412c07260f9db9f87c3f4e8d9e8d3e8b2793"
+            "reference": "c270ef4474a2460d857f99c84612025c5f9975f2"
        },
        "dist": {
            "type": "zip",
-            "url": "https://api.github.com/repos/fguillot/picoFeed/zipball/3486412c07260f9db9f87c3f4e8d9e8d3e8b2793",
-            "reference": "3486412c07260f9db9f87c3f4e8d9e8d3e8b2793",
+            "url": "https://api.github.com/repos/fguillot/picoFeed/zipball/c270ef4474a2460d857f99c84612025c5f9975f2",
+            "reference": "c270ef4474a2460d857f99c84612025c5f9975f2",
            "shasum": ""
        },
        "require": {
@ -229,7 +229,7 @@
        "suggest": {
            "ext-curl": "PicoFeed will use cURL if present"
        },
-        "time": "2016-01-26 14:43:55",
+        "time": "2016-02-11 19:52:02",
        "bin": [
            "picofeed"
        ],
--- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/channelate.com.php
+++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/channelate.com.php
@ -1,9 +0,0 @@
-<?php
-
-return array(
-    'filter' => array(
-        '%.*%' => array(
-            '%href="http://www.channelate.com/(\\d+)/(\\d+)/(\\d+)/[^"]*"%' => 'href="http://www.channelate.com/extra-panel/$1$2$3/"',
-        ),
-    ),
-);
--- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/dilbert.com.php
+++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/dilbert.com.php
@ -0,0 +1,12 @@
+<?php
+
+return array(
+    'grabber' => array(
+        '%.*%' => array(
+            'body' => array(
+                '//img[@class="img-responsive img-comic"]',
+            ),
+            'test_url' => 'http://dilbert.com/strip/2016-01-28',
+        ),
+    ),
+);
--- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/gerbilwithajetpack.com.php
+++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/gerbilwithajetpack.com.php
@ -0,0 +1,13 @@
+<?php
+
+return array(
+    'grabber' => array(
+        '%.*%' => array(
+            'body' => array(
+                '//div[@id="comic-1"]',
+                '//div[@class="entry"]',
+            ),
+            'test_url' => 'http://gerbilwithajetpack.com/passing-the-digital-buck/',
+        ),
+    ),
+);
--- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/greekculture.com.php
+++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/greekculture.com.php
@ -0,0 +1,12 @@
+<?php
+
+return array(
+    'grabber' => array(
+        '%/joyoftech/.*%' => array(
+            'body' => array(
+                '//img[@width="640"]',
+            ),
+            'test_url' => 'http://www.geekculture.com/joyoftech/joyarchives/2235.html',
+        ),
+    ),
+);
--- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/thedoghousediaries.com.php
+++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/thedoghousediaries.com.php
@ -8,7 +8,7 @@ return array(
                '//div[@class="entry"]',
            ),
            'strip' => array(),
-            'test_url' => 'http://sentfromthemoon.com/archives/1417',
+            'test_url' => 'http://thedoghousediaries.com/6023',
        ),
    ),
    'filter' => array(
--- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/theodd1sout.com.php
+++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/theodd1sout.com.php
@ -0,0 +1,9 @@
+<?php
+
+return array(
+    'filter' => array(
+        '%.*%' => array(
+            '%-150x150%' => '',
+        ),
+    ),
+);
--- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/threepanelsoul.com.php
+++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/threepanelsoul.com.php
@ -3,9 +3,10 @@
 return array(
    'grabber' => array(
        '%.*%' => array(
-            'body' => array('//img[@id="cc-comic"]'),
-            'strip' => array(),
-            'test_url' => 'http://www.threepanelsoul.com/comic/subjective-tastes',
+            'body' => array(
+                '//img[@id="cc-comic"]',
+            ),
+            'test_url' => 'http://www.threepanelsoul.com/comic/uncloaking',
        ),
    ),
 );
--- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/www.franceculture.fr.php
+++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/www.franceculture.fr.php
@ -4,10 +4,11 @@ return array(
        '%.*%' => array(
            'test_url' => 'http://www.franceculture.fr/emission-culture-eco-la-finance-aime-toujours-la-france-2016-01-08',
            'body' => array(
-                '//div[@class="listen"]',
-                '//div[@class="field-items"]',
+                '//div[@class="heading"]/*/*/div[contains(@class,"player-inline")]',
+                '//article/div[@class="text-zone"]',
            ),
            'strip' => array(
+                '//ul[@class="tags"]',
            ),
        )
    )
--- a/vendor/zendframework/zendxml/.travis.yml
+++ b/vendor/zendframework/zendxml/.travis.yml
@ -1,22 +1,42 @@
+sudo: false
+
 language: php
-php:
-  - 5.3
-  - 5.4
-  - 5.5
-  - 5.6
-  - hhvm
+
+branches:
+  except:
+    - /^release-.*$/
+    - /^ghgfk-.*$/
+
+cache:
+  directories:
+    - $HOME/.composer/cache
 
 matrix:
    allow_failures:
        - php: hhvm
+matrix:
+  fast_finish: true
+  include:
+    - php: 5.3
+    - php: 5.4
+    - php: 5.5
+      env:
+        - EXECUTE_CS_CHECK=true
+    - php: 5.6
+    - php: 7
+    - php: hhvm 
+  allow_failures:
+    - php: hhvm

-before_script:
+before_install:
  - composer self-update
-  - composer install --dev
+
+install:
+  - travis_retry composer install --no-interaction --ignore-platform-reqs

 script:
  - ./vendor/bin/phpunit -c ./tests
-  - ./vendor/bin/phpcs --standard=PSR2 --ignore=tests/Bootstrap.php library tests
+  - if [[ $EXECUTE_CS_CHECK == 'true' ]]; then ./vendor/bin/phpcs --standard=PSR2 --ignore=tests/Bootstrap.php library tests ; fi
  
 notifications:
  irc: "irc.freenode.org#zftalk.dev"
--- a/vendor/zendframework/zendxml/CHANGELOG.md
+++ b/vendor/zendframework/zendxml/CHANGELOG.md
@ -0,0 +1,24 @@
+# Changelog
+
+All notable changes to this project will be documented in this file, in reverse chronological order by release.
+
+## 1.0.2 - 2016-02-04
+
+### Added
+
+- Nothing.
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- Nothing.
+
+### Fixed
+
+- [#11](https://github.com/zendframework/ZendXml/pull/11) updates the
+  dependencies to PHP `^5.3.3 || ^7.0` and PHPUnit `^3.7 || ^4.0`, ensuring
+  better compatibility with other components, and with PHP 7. The test matrix
+  was also expanded to add PHP 7 as a required platform.
--- a/vendor/zendframework/zendxml/composer.json
+++ b/vendor/zendframework/zendxml/composer.json
@ -26,7 +26,7 @@
        }
    ],
    "require": {
-        "php": ">=5.3.3"
+        "php": "^5.3.3 || ^7.0"
    },
    "extra": {
        "branch-alias": {
@ -34,7 +34,7 @@
        }
    },
    "require-dev": {
-        "phpunit/phpunit": "~3.7",
-        "squizlabs/php_codesniffer": "~1.5"
+        "phpunit/phpunit": "^3.7 || ^4.0",
+        "squizlabs/php_codesniffer": "^1.5"
    }
 }