From 0dc7319f1f19526da73173e00ea43b92fbdbb206 Mon Sep 17 00:00:00 2001 From: Bernhard Posselt Date: Sat, 20 Feb 2016 17:58:58 +0100 Subject: [PATCH] update picofeed and zendxml --- composer.lock | 24 ++++++------ vendor/composer/installed.json | 26 ++++++------- .../lib/PicoFeed/Rules/channelate.com.php | 9 ----- .../lib/PicoFeed/Rules/dilbert.com.php | 12 ++++++ .../PicoFeed/Rules/gerbilwithajetpack.com.php | 13 +++++++ .../lib/PicoFeed/Rules/greekculture.com.php | 12 ++++++ .../PicoFeed/Rules/thedoghousediaries.com.php | 2 +- .../lib/PicoFeed/Rules/theodd1sout.com.php | 9 +++++ .../lib/PicoFeed/Rules/threepanelsoul.com.php | 7 ++-- .../PicoFeed/Rules/www.franceculture.fr.php | 5 ++- vendor/zendframework/zendxml/.travis.yml | 38 ++++++++++++++----- vendor/zendframework/zendxml/CHANGELOG.md | 24 ++++++++++++ vendor/zendframework/zendxml/composer.json | 6 +-- 13 files changed, 135 insertions(+), 52 deletions(-) delete mode 100644 vendor/fguillot/picofeed/lib/PicoFeed/Rules/channelate.com.php create mode 100644 vendor/fguillot/picofeed/lib/PicoFeed/Rules/dilbert.com.php create mode 100644 vendor/fguillot/picofeed/lib/PicoFeed/Rules/gerbilwithajetpack.com.php create mode 100644 vendor/fguillot/picofeed/lib/PicoFeed/Rules/greekculture.com.php create mode 100644 vendor/fguillot/picofeed/lib/PicoFeed/Rules/theodd1sout.com.php create mode 100644 vendor/zendframework/zendxml/CHANGELOG.md diff --git a/composer.lock b/composer.lock index 674d08484..cf3f2e04d 100644 --- 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": [], diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index 517dae1fa..7f5c5b671 100644 --- 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" ], diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/channelate.com.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/channelate.com.php deleted file mode 100644 index f07f79229..000000000 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/channelate.com.php +++ /dev/null @@ -1,9 +0,0 @@ - array( - '%.*%' => array( - '%href="http://www.channelate.com/(\\d+)/(\\d+)/(\\d+)/[^"]*"%' => 'href="http://www.channelate.com/extra-panel/$1$2$3/"', - ), - ), -); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/dilbert.com.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/dilbert.com.php new file mode 100644 index 000000000..17f2ec219 --- /dev/null +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/dilbert.com.php @@ -0,0 +1,12 @@ + array( + '%.*%' => array( + 'body' => array( + '//img[@class="img-responsive img-comic"]', + ), + 'test_url' => 'http://dilbert.com/strip/2016-01-28', + ), + ), +); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/gerbilwithajetpack.com.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/gerbilwithajetpack.com.php new file mode 100644 index 000000000..70e863587 --- /dev/null +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/gerbilwithajetpack.com.php @@ -0,0 +1,13 @@ + array( + '%.*%' => array( + 'body' => array( + '//div[@id="comic-1"]', + '//div[@class="entry"]', + ), + 'test_url' => 'http://gerbilwithajetpack.com/passing-the-digital-buck/', + ), + ), +); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/greekculture.com.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/greekculture.com.php new file mode 100644 index 000000000..9410de9c5 --- /dev/null +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/greekculture.com.php @@ -0,0 +1,12 @@ + array( + '%/joyoftech/.*%' => array( + 'body' => array( + '//img[@width="640"]', + ), + 'test_url' => 'http://www.geekculture.com/joyoftech/joyarchives/2235.html', + ), + ), +); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/thedoghousediaries.com.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/thedoghousediaries.com.php index 94955b23b..e1c4970da 100644 --- 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( diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/theodd1sout.com.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/theodd1sout.com.php new file mode 100644 index 000000000..6d1c66768 --- /dev/null +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/theodd1sout.com.php @@ -0,0 +1,9 @@ + array( + '%.*%' => array( + '%-150x150%' => '', + ), + ), +); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/threepanelsoul.com.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/threepanelsoul.com.php index 66c9ccab7..5407158e5 100644 --- 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', ), ), ); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/www.franceculture.fr.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/www.franceculture.fr.php index b56a29b51..67e3253a1 100644 --- 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"]', ), ) ) diff --git a/vendor/zendframework/zendxml/.travis.yml b/vendor/zendframework/zendxml/.travis.yml index 967d999ba..877b0650b 100644 --- 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" diff --git a/vendor/zendframework/zendxml/CHANGELOG.md b/vendor/zendframework/zendxml/CHANGELOG.md new file mode 100644 index 000000000..bca2961b9 --- /dev/null +++ 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. diff --git a/vendor/zendframework/zendxml/composer.json b/vendor/zendframework/zendxml/composer.json index 139f1e23b..d9efb2229 100644 --- 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" } }