update picofeed and zendxml

3 files changed, 56 insertions, 12 deletions

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"
     }
 }