diff --git a/composer.lock b/composer.lock index 69a9dee..2d393c7 100644 --- a/composer.lock +++ b/composer.lock @@ -682,16 +682,16 @@ }, { "name": "guzzlehttp/guzzle", - "version": "6.1.0", + "version": "6.1.1", "source": { "type": "git", "url": "https://github.com/guzzle/guzzle.git", - "reference": "66fd14b4d0b8f2389eaf37c5458608c7cb793a81" + "reference": "c6851d6e48f63b69357cbfa55bca116448140e0c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/guzzle/zipball/66fd14b4d0b8f2389eaf37c5458608c7cb793a81", - "reference": "66fd14b4d0b8f2389eaf37c5458608c7cb793a81", + "url": "https://api.github.com/repos/guzzle/guzzle/zipball/c6851d6e48f63b69357cbfa55bca116448140e0c", + "reference": "c6851d6e48f63b69357cbfa55bca116448140e0c", "shasum": "" }, "require": { @@ -740,7 +740,7 @@ "rest", "web service" ], - "time": "2015-09-08 17:36:26" + "time": "2015-11-23 00:47:50" }, { "name": "guzzlehttp/promises", @@ -1265,16 +1265,16 @@ }, { "name": "symfony/debug", - "version": "v2.7.6", + "version": "v2.7.7", "source": { "type": "git", "url": "https://github.com/symfony/debug.git", - "reference": "fb9e6887db716939f41af0ba8ef38a1582eb501b" + "reference": "0dbc119596f4afc82d9b2eb2a7e6a4af1ee763fa" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/debug/zipball/fb9e6887db716939f41af0ba8ef38a1582eb501b", - "reference": "fb9e6887db716939f41af0ba8ef38a1582eb501b", + "url": "https://api.github.com/repos/symfony/debug/zipball/0dbc119596f4afc82d9b2eb2a7e6a4af1ee763fa", + "reference": "0dbc119596f4afc82d9b2eb2a7e6a4af1ee763fa", "shasum": "" }, "require": { @@ -1297,7 +1297,10 @@ "autoload": { "psr-4": { "Symfony\\Component\\Debug\\": "" - } + }, + "exclude-from-classmap": [ + "/Tests/" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -1315,7 +1318,7 @@ ], "description": "Symfony Debug Component", "homepage": "https://symfony.com", - "time": "2015-10-11 09:39:48" + "time": "2015-10-30 20:10:21" }, { "name": "symfony/dependency-injection", @@ -1445,12 +1448,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/http-foundation.git", - "reference": "0b8376f836901d9562680c27952d58437118e6f7" + "reference": "5ed0ec39ef684bec84d1fd9f2a55104e403b7e49" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/0b8376f836901d9562680c27952d58437118e6f7", - "reference": "0b8376f836901d9562680c27952d58437118e6f7", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/5ed0ec39ef684bec84d1fd9f2a55104e403b7e49", + "reference": "5ed0ec39ef684bec84d1fd9f2a55104e403b7e49", "shasum": "" }, "require": { @@ -1490,7 +1493,7 @@ ], "description": "Symfony HttpFoundation Component", "homepage": "https://symfony.com", - "time": "2015-11-02 20:29:24" + "time": "2015-11-27 11:03:19" }, { "name": "symfony/http-kernel", @@ -2282,16 +2285,16 @@ }, { "name": "zendframework/zend-diactoros", - "version": "1.1.4", + "version": "1.2.0", "source": { "type": "git", "url": "https://github.com/zendframework/zend-diactoros.git", - "reference": "3f0ce6c0ba2106e018fb514a9f09dbb91eb6bfd0" + "reference": "edfda00b9831630c19c411f85f50a47bb66af457" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-diactoros/zipball/3f0ce6c0ba2106e018fb514a9f09dbb91eb6bfd0", - "reference": "3f0ce6c0ba2106e018fb514a9f09dbb91eb6bfd0", + "url": "https://api.github.com/repos/zendframework/zend-diactoros/zipball/edfda00b9831630c19c411f85f50a47bb66af457", + "reference": "edfda00b9831630c19c411f85f50a47bb66af457", "shasum": "" }, "require": { @@ -2308,8 +2311,8 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0-dev", - "dev-develop": "1.1-dev" + "dev-master": "1.2-dev", + "dev-develop": "1.3-dev" } }, "autoload": { @@ -2328,7 +2331,7 @@ "psr", "psr-7" ], - "time": "2015-10-16 15:24:05" + "time": "2015-11-24 19:16:22" }, { "name": "zendframework/zend-escaper", @@ -2376,16 +2379,16 @@ }, { "name": "zendframework/zend-feed", - "version": "2.5.2", + "version": "2.6.0", "source": { "type": "git", "url": "https://github.com/zendframework/zend-feed.git", - "reference": "0661345b82b51428619e05d3aadd3de65b57fa54" + "reference": "f76da2bbba414ebf3bb00c81e9fdd65b04c66a7f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-feed/zipball/0661345b82b51428619e05d3aadd3de65b57fa54", - "reference": "0661345b82b51428619e05d3aadd3de65b57fa54", + "url": "https://api.github.com/repos/zendframework/zend-feed/zipball/f76da2bbba414ebf3bb00c81e9fdd65b04c66a7f", + "reference": "f76da2bbba414ebf3bb00c81e9fdd65b04c66a7f", "shasum": "" }, "require": { @@ -2396,24 +2399,25 @@ "require-dev": { "fabpot/php-cs-fixer": "1.7.*", "phpunit/phpunit": "~4.0", + "psr/http-message": "^1.0", "zendframework/zend-cache": "~2.5", "zendframework/zend-db": "~2.5", "zendframework/zend-http": "~2.5", - "zendframework/zend-servicemanager": "~2.5", "zendframework/zend-validator": "~2.5" }, "suggest": { - "zendframework/zend-cache": "Zend\\Cache component", - "zendframework/zend-db": "Zend\\Db component", + "psr/http-message": "PSR-7 ^1.0, if you wish to use Zend\\Feed\\Reader\\Http\\Psr7ResponseDecorator", + "zendframework/zend-cache": "Zend\\Cache component, for optionally caching feeds between requests", + "zendframework/zend-db": "Zend\\Db component, for use with PubSubHubbub", "zendframework/zend-http": "Zend\\Http for PubSubHubbub, and optionally for use with Zend\\Feed\\Reader", - "zendframework/zend-servicemanager": "Zend\\ServiceManager component, for default/recommended ExtensionManager implementations", - "zendframework/zend-validator": "Zend\\Validator component" + "zendframework/zend-servicemanager": "Zend\\ServiceManager component, for easily extending ExtensionManager implementations", + "zendframework/zend-validator": "Zend\\Validator component, for validating feeds and Atom entries in the Writer subcomponent" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.5-dev", - "dev-develop": "2.6-dev" + "dev-master": "2.6-dev", + "dev-develop": "2.7-dev" } }, "autoload": { @@ -2431,7 +2435,7 @@ "feed", "zf2" ], - "time": "2015-08-04 21:39:18" + "time": "2015-11-24 15:38:00" }, { "name": "zendframework/zend-hydrator", @@ -3835,16 +3839,16 @@ }, { "name": "symfony/browser-kit", - "version": "v2.7.6", + "version": "v2.7.7", "source": { "type": "git", "url": "https://github.com/symfony/browser-kit.git", - "reference": "07d664a052572ccc28eb2ab7dbbe82155b1ad367" + "reference": "bd28847ea2193916074c7b11d4fdd78570049694" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/browser-kit/zipball/07d664a052572ccc28eb2ab7dbbe82155b1ad367", - "reference": "07d664a052572ccc28eb2ab7dbbe82155b1ad367", + "url": "https://api.github.com/repos/symfony/browser-kit/zipball/bd28847ea2193916074c7b11d4fdd78570049694", + "reference": "bd28847ea2193916074c7b11d4fdd78570049694", "shasum": "" }, "require": { @@ -3867,7 +3871,10 @@ "autoload": { "psr-4": { "Symfony\\Component\\BrowserKit\\": "" - } + }, + "exclude-from-classmap": [ + "/Tests/" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -3885,20 +3892,20 @@ ], "description": "Symfony BrowserKit Component", "homepage": "https://symfony.com", - "time": "2015-10-23 14:47:27" + "time": "2015-11-02 20:20:53" }, { "name": "symfony/css-selector", - "version": "v2.7.6", + "version": "v2.7.7", "source": { "type": "git", "url": "https://github.com/symfony/css-selector.git", - "reference": "e1b865b26be4a56d22a8dee398375044a80c865b" + "reference": "abb47717fb88aebd9437da2fc8bb01a50a36679f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/css-selector/zipball/e1b865b26be4a56d22a8dee398375044a80c865b", - "reference": "e1b865b26be4a56d22a8dee398375044a80c865b", + "url": "https://api.github.com/repos/symfony/css-selector/zipball/abb47717fb88aebd9437da2fc8bb01a50a36679f", + "reference": "abb47717fb88aebd9437da2fc8bb01a50a36679f", "shasum": "" }, "require": { @@ -3913,7 +3920,10 @@ "autoload": { "psr-4": { "Symfony\\Component\\CssSelector\\": "" - } + }, + "exclude-from-classmap": [ + "/Tests/" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -3935,20 +3945,20 @@ ], "description": "Symfony CssSelector Component", "homepage": "https://symfony.com", - "time": "2015-10-11 09:39:48" + "time": "2015-10-30 20:10:21" }, { "name": "symfony/dom-crawler", - "version": "v2.7.6", + "version": "v2.7.7", "source": { "type": "git", "url": "https://github.com/symfony/dom-crawler.git", - "reference": "5fef7d8b80d8f9992df99d8ee283f420484c9612" + "reference": "b33593cbfe1d81b50d48353f338aca76a08658d8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/5fef7d8b80d8f9992df99d8ee283f420484c9612", - "reference": "5fef7d8b80d8f9992df99d8ee283f420484c9612", + "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/b33593cbfe1d81b50d48353f338aca76a08658d8", + "reference": "b33593cbfe1d81b50d48353f338aca76a08658d8", "shasum": "" }, "require": { @@ -3969,7 +3979,10 @@ "autoload": { "psr-4": { "Symfony\\Component\\DomCrawler\\": "" - } + }, + "exclude-from-classmap": [ + "/Tests/" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -3987,7 +4000,7 @@ ], "description": "Symfony DomCrawler Component", "homepage": "https://symfony.com", - "time": "2015-10-11 09:39:48" + "time": "2015-11-02 20:20:53" } ], "aliases": [], diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index 75f9dc2..baf2705 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -761,131 +761,6 @@ ] }, { - "name": "zendframework/zend-feed", - "version": "2.5.2", - "version_normalized": "2.5.2.0", - "source": { - "type": "git", - "url": "https://github.com/zendframework/zend-feed.git", - "reference": "0661345b82b51428619e05d3aadd3de65b57fa54" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-feed/zipball/0661345b82b51428619e05d3aadd3de65b57fa54", - "reference": "0661345b82b51428619e05d3aadd3de65b57fa54", - "shasum": "" - }, - "require": { - "php": ">=5.5", - "zendframework/zend-escaper": "~2.5", - "zendframework/zend-stdlib": "~2.5" - }, - "require-dev": { - "fabpot/php-cs-fixer": "1.7.*", - "phpunit/phpunit": "~4.0", - "zendframework/zend-cache": "~2.5", - "zendframework/zend-db": "~2.5", - "zendframework/zend-http": "~2.5", - "zendframework/zend-servicemanager": "~2.5", - "zendframework/zend-validator": "~2.5" - }, - "suggest": { - "zendframework/zend-cache": "Zend\\Cache component", - "zendframework/zend-db": "Zend\\Db component", - "zendframework/zend-http": "Zend\\Http for PubSubHubbub, and optionally for use with Zend\\Feed\\Reader", - "zendframework/zend-servicemanager": "Zend\\ServiceManager component, for default/recommended ExtensionManager implementations", - "zendframework/zend-validator": "Zend\\Validator component" - }, - "time": "2015-08-04 21:39:18", - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.5-dev", - "dev-develop": "2.6-dev" - } - }, - "installation-source": "dist", - "autoload": { - "psr-4": { - "Zend\\Feed\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "description": "provides functionality for consuming RSS and Atom feeds", - "homepage": "https://github.com/zendframework/zend-feed", - "keywords": [ - "feed", - "zf2" - ] - }, - { - "name": "guzzlehttp/guzzle", - "version": "6.1.0", - "version_normalized": "6.1.0.0", - "source": { - "type": "git", - "url": "https://github.com/guzzle/guzzle.git", - "reference": "66fd14b4d0b8f2389eaf37c5458608c7cb793a81" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/guzzle/guzzle/zipball/66fd14b4d0b8f2389eaf37c5458608c7cb793a81", - "reference": "66fd14b4d0b8f2389eaf37c5458608c7cb793a81", - "shasum": "" - }, - "require": { - "guzzlehttp/promises": "~1.0", - "guzzlehttp/psr7": "~1.1", - "php": ">=5.5.0" - }, - "require-dev": { - "ext-curl": "*", - "phpunit/phpunit": "~4.0", - "psr/log": "~1.0" - }, - "time": "2015-09-08 17:36:26", - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "6.1-dev" - } - }, - "installation-source": "dist", - "autoload": { - "files": [ - "src/functions_include.php" - ], - "psr-4": { - "GuzzleHttp\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Michael Dowling", - "email": "mtdowling@gmail.com", - "homepage": "https://github.com/mtdowling" - } - ], - "description": "Guzzle is a PHP HTTP client library", - "homepage": "http://guzzlephp.org/", - "keywords": [ - "client", - "curl", - "framework", - "http", - "http client", - "rest", - "web service" - ] - }, - { "name": "behat/mink", "version": "v1.7.0", "version_normalized": "1.7.0.0", @@ -2040,90 +1915,105 @@ ] }, { - "name": "symfony/debug", - "version": "v2.7.6", - "version_normalized": "2.7.6.0", + "name": "twig/twig", + "version": "v1.23.1", + "version_normalized": "1.23.1.0", "source": { "type": "git", - "url": "https://github.com/symfony/debug.git", - "reference": "fb9e6887db716939f41af0ba8ef38a1582eb501b" + "url": "https://github.com/twigphp/Twig.git", + "reference": "d9b6333ae8dd2c8e3fd256e127548def0bc614c6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/debug/zipball/fb9e6887db716939f41af0ba8ef38a1582eb501b", - "reference": "fb9e6887db716939f41af0ba8ef38a1582eb501b", + "url": "https://api.github.com/repos/twigphp/Twig/zipball/d9b6333ae8dd2c8e3fd256e127548def0bc614c6", + "reference": "d9b6333ae8dd2c8e3fd256e127548def0bc614c6", "shasum": "" }, "require": { - "php": ">=5.3.9", - "psr/log": "~1.0" - }, - "conflict": { - "symfony/http-kernel": ">=2.3,<2.3.24|~2.4.0|>=2.5,<2.5.9|>=2.6,<2.6.2" + "php": ">=5.2.7" }, "require-dev": { - "symfony/class-loader": "~2.2", - "symfony/http-kernel": "~2.3.24|~2.5.9|~2.6,>=2.6.2" + "symfony/debug": "~2.7", + "symfony/phpunit-bridge": "~2.7" }, - "time": "2015-10-11 09:39:48", + "time": "2015-11-05 12:49:06", "type": "library", "extra": { "branch-alias": { - "dev-master": "2.7-dev" + "dev-master": "1.23-dev" } }, "installation-source": "dist", "autoload": { - "psr-4": { - "Symfony\\Component\\Debug\\": "" + "psr-0": { + "Twig_": "lib/" } }, "notification-url": "https://packagist.org/downloads/", "license": [ - "MIT" + "BSD-3-Clause" ], "authors": [ { "name": "Fabien Potencier", - "email": "fabien@symfony.com" + "email": "fabien@symfony.com", + "homepage": "http://fabien.potencier.org", + "role": "Lead Developer" }, { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" + "name": "Armin Ronacher", + "email": "armin.ronacher@active-4.com", + "role": "Project Founder" + }, + { + "name": "Twig Team", + "homepage": "http://twig.sensiolabs.org/contributors", + "role": "Contributors" } ], - "description": "Symfony Debug Component", - "homepage": "https://symfony.com" + "description": "Twig, the flexible, fast, and secure template language for PHP", + "homepage": "http://twig.sensiolabs.org", + "keywords": [ + "templating" + ] }, { - "name": "symfony/css-selector", - "version": "v2.7.6", - "version_normalized": "2.7.6.0", + "name": "wikimedia/composer-merge-plugin", + "version": "v1.3.0", + "version_normalized": "1.3.0.0", "source": { "type": "git", - "url": "https://github.com/symfony/css-selector.git", - "reference": "e1b865b26be4a56d22a8dee398375044a80c865b" + "url": "https://github.com/wikimedia/composer-merge-plugin.git", + "reference": "bfed1f8d4eb97e9ba80eee57ea46229d7e5364d9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/css-selector/zipball/e1b865b26be4a56d22a8dee398375044a80c865b", - "reference": "e1b865b26be4a56d22a8dee398375044a80c865b", + "url": "https://api.github.com/repos/wikimedia/composer-merge-plugin/zipball/bfed1f8d4eb97e9ba80eee57ea46229d7e5364d9", + "reference": "bfed1f8d4eb97e9ba80eee57ea46229d7e5364d9", "shasum": "" }, "require": { - "php": ">=5.3.9" + "composer-plugin-api": "^1.0", + "php": ">=5.3.2" }, - "time": "2015-10-11 09:39:48", - "type": "library", + "require-dev": { + "composer/composer": "1.0.*@dev", + "jakub-onderka/php-parallel-lint": "~0.8", + "phpunit/phpunit": "~4.8|~5.0", + "squizlabs/php_codesniffer": "~2.1.0" + }, + "time": "2015-11-06 20:31:16", + "type": "composer-plugin", "extra": { "branch-alias": { - "dev-master": "2.7-dev" - } + "dev-master": "1.3.x-dev" + }, + "class": "Wikimedia\\Composer\\MergePlugin" }, "installation-source": "dist", "autoload": { "psr-4": { - "Symfony\\Component\\CssSelector\\": "" + "Wikimedia\\Composer\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", @@ -2132,56 +2022,50 @@ ], "authors": [ { - "name": "Jean-François Simon", - "email": "jeanfrancois.simon@sensiolabs.com" - }, - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" + "name": "Bryan Davis", + "email": "bd808@wikimedia.org" } ], - "description": "Symfony CssSelector Component", - "homepage": "https://symfony.com" + "description": "Composer plugin to merge multiple composer.json files" }, { - "name": "symfony/dom-crawler", - "version": "v2.7.6", - "version_normalized": "2.7.6.0", + "name": "composer/installers", + "version": "v1.0.22", + "version_normalized": "1.0.22.0", "source": { "type": "git", - "url": "https://github.com/symfony/dom-crawler.git", - "reference": "5fef7d8b80d8f9992df99d8ee283f420484c9612" + "url": "https://github.com/composer/installers.git", + "reference": "bd9b14f094c89c8b5804a4e41edeb7853bb85046" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/5fef7d8b80d8f9992df99d8ee283f420484c9612", - "reference": "5fef7d8b80d8f9992df99d8ee283f420484c9612", + "url": "https://api.github.com/repos/composer/installers/zipball/bd9b14f094c89c8b5804a4e41edeb7853bb85046", + "reference": "bd9b14f094c89c8b5804a4e41edeb7853bb85046", "shasum": "" }, "require": { - "php": ">=5.3.9" + "composer-plugin-api": "1.0.0" }, - "require-dev": { - "symfony/css-selector": "~2.3" + "replace": { + "roundcube/plugin-installer": "*", + "shama/baton": "*" }, - "suggest": { - "symfony/css-selector": "" + "require-dev": { + "composer/composer": "1.0.*@dev", + "phpunit/phpunit": "4.1.*" }, - "time": "2015-10-11 09:39:48", - "type": "library", + "time": "2015-10-29 23:28:48", + "type": "composer-plugin", "extra": { + "class": "Composer\\Installers\\Plugin", "branch-alias": { - "dev-master": "2.7-dev" + "dev-master": "1.0-dev" } }, "installation-source": "dist", "autoload": { - "psr-4": { - "Symfony\\Component\\DomCrawler\\": "" + "psr-0": { + "Composer\\Installers\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", @@ -2190,236 +2074,9 @@ ], "authors": [ { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony DomCrawler Component", - "homepage": "https://symfony.com" - }, - { - "name": "symfony/browser-kit", - "version": "v2.7.6", - "version_normalized": "2.7.6.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/browser-kit.git", - "reference": "07d664a052572ccc28eb2ab7dbbe82155b1ad367" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/browser-kit/zipball/07d664a052572ccc28eb2ab7dbbe82155b1ad367", - "reference": "07d664a052572ccc28eb2ab7dbbe82155b1ad367", - "shasum": "" - }, - "require": { - "php": ">=5.3.9", - "symfony/dom-crawler": "~2.0,>=2.0.5" - }, - "require-dev": { - "symfony/css-selector": "~2.0,>=2.0.5", - "symfony/process": "~2.3.34|~2.7,>=2.7.6" - }, - "suggest": { - "symfony/process": "" - }, - "time": "2015-10-23 14:47:27", - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.7-dev" - } - }, - "installation-source": "dist", - "autoload": { - "psr-4": { - "Symfony\\Component\\BrowserKit\\": "" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony BrowserKit Component", - "homepage": "https://symfony.com" - }, - { - "name": "twig/twig", - "version": "v1.23.1", - "version_normalized": "1.23.1.0", - "source": { - "type": "git", - "url": "https://github.com/twigphp/Twig.git", - "reference": "d9b6333ae8dd2c8e3fd256e127548def0bc614c6" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/twigphp/Twig/zipball/d9b6333ae8dd2c8e3fd256e127548def0bc614c6", - "reference": "d9b6333ae8dd2c8e3fd256e127548def0bc614c6", - "shasum": "" - }, - "require": { - "php": ">=5.2.7" - }, - "require-dev": { - "symfony/debug": "~2.7", - "symfony/phpunit-bridge": "~2.7" - }, - "time": "2015-11-05 12:49:06", - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.23-dev" - } - }, - "installation-source": "dist", - "autoload": { - "psr-0": { - "Twig_": "lib/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com", - "homepage": "http://fabien.potencier.org", - "role": "Lead Developer" - }, - { - "name": "Armin Ronacher", - "email": "armin.ronacher@active-4.com", - "role": "Project Founder" - }, - { - "name": "Twig Team", - "homepage": "http://twig.sensiolabs.org/contributors", - "role": "Contributors" - } - ], - "description": "Twig, the flexible, fast, and secure template language for PHP", - "homepage": "http://twig.sensiolabs.org", - "keywords": [ - "templating" - ] - }, - { - "name": "wikimedia/composer-merge-plugin", - "version": "v1.3.0", - "version_normalized": "1.3.0.0", - "source": { - "type": "git", - "url": "https://github.com/wikimedia/composer-merge-plugin.git", - "reference": "bfed1f8d4eb97e9ba80eee57ea46229d7e5364d9" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/wikimedia/composer-merge-plugin/zipball/bfed1f8d4eb97e9ba80eee57ea46229d7e5364d9", - "reference": "bfed1f8d4eb97e9ba80eee57ea46229d7e5364d9", - "shasum": "" - }, - "require": { - "composer-plugin-api": "^1.0", - "php": ">=5.3.2" - }, - "require-dev": { - "composer/composer": "1.0.*@dev", - "jakub-onderka/php-parallel-lint": "~0.8", - "phpunit/phpunit": "~4.8|~5.0", - "squizlabs/php_codesniffer": "~2.1.0" - }, - "time": "2015-11-06 20:31:16", - "type": "composer-plugin", - "extra": { - "branch-alias": { - "dev-master": "1.3.x-dev" - }, - "class": "Wikimedia\\Composer\\MergePlugin" - }, - "installation-source": "dist", - "autoload": { - "psr-4": { - "Wikimedia\\Composer\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Bryan Davis", - "email": "bd808@wikimedia.org" - } - ], - "description": "Composer plugin to merge multiple composer.json files" - }, - { - "name": "composer/installers", - "version": "v1.0.22", - "version_normalized": "1.0.22.0", - "source": { - "type": "git", - "url": "https://github.com/composer/installers.git", - "reference": "bd9b14f094c89c8b5804a4e41edeb7853bb85046" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/composer/installers/zipball/bd9b14f094c89c8b5804a4e41edeb7853bb85046", - "reference": "bd9b14f094c89c8b5804a4e41edeb7853bb85046", - "shasum": "" - }, - "require": { - "composer-plugin-api": "1.0.0" - }, - "replace": { - "roundcube/plugin-installer": "*", - "shama/baton": "*" - }, - "require-dev": { - "composer/composer": "1.0.*@dev", - "phpunit/phpunit": "4.1.*" - }, - "time": "2015-10-29 23:28:48", - "type": "composer-plugin", - "extra": { - "class": "Composer\\Installers\\Plugin", - "branch-alias": { - "dev-master": "1.0-dev" - } - }, - "installation-source": "dist", - "autoload": { - "psr-0": { - "Composer\\Installers\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Kyle Robinson Young", - "email": "kyle@dontkry.com", - "homepage": "https://github.com/shama" + "name": "Kyle Robinson Young", + "email": "kyle@dontkry.com", + "homepage": "https://github.com/shama" } ], "description": "A multi-framework Composer library installer", @@ -2770,61 +2427,6 @@ ] }, { - "name": "symfony/http-foundation", - "version": "2.8.x-dev", - "version_normalized": "2.8.9999999.9999999-dev", - "source": { - "type": "git", - "url": "https://github.com/symfony/http-foundation.git", - "reference": "0b8376f836901d9562680c27952d58437118e6f7" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/0b8376f836901d9562680c27952d58437118e6f7", - "reference": "0b8376f836901d9562680c27952d58437118e6f7", - "shasum": "" - }, - "require": { - "php": ">=5.3.9", - "symfony/polyfill-php54": "~1.0" - }, - "require-dev": { - "symfony/expression-language": "~2.4|~3.0.0" - }, - "time": "2015-11-02 20:29:24", - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.8-dev" - } - }, - "installation-source": "dist", - "autoload": { - "psr-4": { - "Symfony\\Component\\HttpFoundation\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony HttpFoundation Component", - "homepage": "https://symfony.com" - }, - { "name": "symfony/event-dispatcher", "version": "v2.8.0-BETA1", "version_normalized": "2.8.0.0-beta1", @@ -3461,58 +3063,6 @@ ] }, { - "name": "zendframework/zend-diactoros", - "version": "1.1.4", - "version_normalized": "1.1.4.0", - "source": { - "type": "git", - "url": "https://github.com/zendframework/zend-diactoros.git", - "reference": "3f0ce6c0ba2106e018fb514a9f09dbb91eb6bfd0" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-diactoros/zipball/3f0ce6c0ba2106e018fb514a9f09dbb91eb6bfd0", - "reference": "3f0ce6c0ba2106e018fb514a9f09dbb91eb6bfd0", - "shasum": "" - }, - "require": { - "php": ">=5.4", - "psr/http-message": "~1.0" - }, - "provide": { - "psr/http-message-implementation": "~1.0.0" - }, - "require-dev": { - "phpunit/phpunit": "~4.6", - "squizlabs/php_codesniffer": "^2.3.1" - }, - "time": "2015-10-16 15:24:05", - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.0-dev", - "dev-develop": "1.1-dev" - } - }, - "installation-source": "dist", - "autoload": { - "psr-4": { - "Zend\\Diactoros\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-2-Clause" - ], - "description": "PSR HTTP Message implementations", - "homepage": "https://github.com/zendframework/zend-diactoros", - "keywords": [ - "http", - "psr", - "psr-7" - ] - }, - { "name": "composer/semver", "version": "1.2.0", "version_normalized": "1.2.0.0", @@ -4118,5 +3668,468 @@ "keywords": [ "scraper" ] + }, + { + "name": "guzzlehttp/guzzle", + "version": "6.1.1", + "version_normalized": "6.1.1.0", + "source": { + "type": "git", + "url": "https://github.com/guzzle/guzzle.git", + "reference": "c6851d6e48f63b69357cbfa55bca116448140e0c" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/guzzle/guzzle/zipball/c6851d6e48f63b69357cbfa55bca116448140e0c", + "reference": "c6851d6e48f63b69357cbfa55bca116448140e0c", + "shasum": "" + }, + "require": { + "guzzlehttp/promises": "~1.0", + "guzzlehttp/psr7": "~1.1", + "php": ">=5.5.0" + }, + "require-dev": { + "ext-curl": "*", + "phpunit/phpunit": "~4.0", + "psr/log": "~1.0" + }, + "time": "2015-11-23 00:47:50", + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "6.1-dev" + } + }, + "installation-source": "dist", + "autoload": { + "files": [ + "src/functions_include.php" + ], + "psr-4": { + "GuzzleHttp\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Michael Dowling", + "email": "mtdowling@gmail.com", + "homepage": "https://github.com/mtdowling" + } + ], + "description": "Guzzle is a PHP HTTP client library", + "homepage": "http://guzzlephp.org/", + "keywords": [ + "client", + "curl", + "framework", + "http", + "http client", + "rest", + "web service" + ] + }, + { + "name": "zendframework/zend-feed", + "version": "2.6.0", + "version_normalized": "2.6.0.0", + "source": { + "type": "git", + "url": "https://github.com/zendframework/zend-feed.git", + "reference": "f76da2bbba414ebf3bb00c81e9fdd65b04c66a7f" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/zendframework/zend-feed/zipball/f76da2bbba414ebf3bb00c81e9fdd65b04c66a7f", + "reference": "f76da2bbba414ebf3bb00c81e9fdd65b04c66a7f", + "shasum": "" + }, + "require": { + "php": ">=5.5", + "zendframework/zend-escaper": "~2.5", + "zendframework/zend-stdlib": "~2.5" + }, + "require-dev": { + "fabpot/php-cs-fixer": "1.7.*", + "phpunit/phpunit": "~4.0", + "psr/http-message": "^1.0", + "zendframework/zend-cache": "~2.5", + "zendframework/zend-db": "~2.5", + "zendframework/zend-http": "~2.5", + "zendframework/zend-validator": "~2.5" + }, + "suggest": { + "psr/http-message": "PSR-7 ^1.0, if you wish to use Zend\\Feed\\Reader\\Http\\Psr7ResponseDecorator", + "zendframework/zend-cache": "Zend\\Cache component, for optionally caching feeds between requests", + "zendframework/zend-db": "Zend\\Db component, for use with PubSubHubbub", + "zendframework/zend-http": "Zend\\Http for PubSubHubbub, and optionally for use with Zend\\Feed\\Reader", + "zendframework/zend-servicemanager": "Zend\\ServiceManager component, for easily extending ExtensionManager implementations", + "zendframework/zend-validator": "Zend\\Validator component, for validating feeds and Atom entries in the Writer subcomponent" + }, + "time": "2015-11-24 15:38:00", + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.6-dev", + "dev-develop": "2.7-dev" + } + }, + "installation-source": "dist", + "autoload": { + "psr-4": { + "Zend\\Feed\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "description": "provides functionality for consuming RSS and Atom feeds", + "homepage": "https://github.com/zendframework/zend-feed", + "keywords": [ + "feed", + "zf2" + ] + }, + { + "name": "zendframework/zend-diactoros", + "version": "1.2.0", + "version_normalized": "1.2.0.0", + "source": { + "type": "git", + "url": "https://github.com/zendframework/zend-diactoros.git", + "reference": "edfda00b9831630c19c411f85f50a47bb66af457" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/zendframework/zend-diactoros/zipball/edfda00b9831630c19c411f85f50a47bb66af457", + "reference": "edfda00b9831630c19c411f85f50a47bb66af457", + "shasum": "" + }, + "require": { + "php": ">=5.4", + "psr/http-message": "~1.0" + }, + "provide": { + "psr/http-message-implementation": "~1.0.0" + }, + "require-dev": { + "phpunit/phpunit": "~4.6", + "squizlabs/php_codesniffer": "^2.3.1" + }, + "time": "2015-11-24 19:16:22", + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.2-dev", + "dev-develop": "1.3-dev" + } + }, + "installation-source": "dist", + "autoload": { + "psr-4": { + "Zend\\Diactoros\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-2-Clause" + ], + "description": "PSR HTTP Message implementations", + "homepage": "https://github.com/zendframework/zend-diactoros", + "keywords": [ + "http", + "psr", + "psr-7" + ] + }, + { + "name": "symfony/css-selector", + "version": "v2.7.7", + "version_normalized": "2.7.7.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/css-selector.git", + "reference": "abb47717fb88aebd9437da2fc8bb01a50a36679f" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/css-selector/zipball/abb47717fb88aebd9437da2fc8bb01a50a36679f", + "reference": "abb47717fb88aebd9437da2fc8bb01a50a36679f", + "shasum": "" + }, + "require": { + "php": ">=5.3.9" + }, + "time": "2015-10-30 20:10:21", + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.7-dev" + } + }, + "installation-source": "dist", + "autoload": { + "psr-4": { + "Symfony\\Component\\CssSelector\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Jean-François Simon", + "email": "jeanfrancois.simon@sensiolabs.com" + }, + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony CssSelector Component", + "homepage": "https://symfony.com" + }, + { + "name": "symfony/debug", + "version": "v2.7.7", + "version_normalized": "2.7.7.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/debug.git", + "reference": "0dbc119596f4afc82d9b2eb2a7e6a4af1ee763fa" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/debug/zipball/0dbc119596f4afc82d9b2eb2a7e6a4af1ee763fa", + "reference": "0dbc119596f4afc82d9b2eb2a7e6a4af1ee763fa", + "shasum": "" + }, + "require": { + "php": ">=5.3.9", + "psr/log": "~1.0" + }, + "conflict": { + "symfony/http-kernel": ">=2.3,<2.3.24|~2.4.0|>=2.5,<2.5.9|>=2.6,<2.6.2" + }, + "require-dev": { + "symfony/class-loader": "~2.2", + "symfony/http-kernel": "~2.3.24|~2.5.9|~2.6,>=2.6.2" + }, + "time": "2015-10-30 20:10:21", + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.7-dev" + } + }, + "installation-source": "dist", + "autoload": { + "psr-4": { + "Symfony\\Component\\Debug\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony Debug Component", + "homepage": "https://symfony.com" + }, + { + "name": "symfony/dom-crawler", + "version": "v2.7.7", + "version_normalized": "2.7.7.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/dom-crawler.git", + "reference": "b33593cbfe1d81b50d48353f338aca76a08658d8" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/b33593cbfe1d81b50d48353f338aca76a08658d8", + "reference": "b33593cbfe1d81b50d48353f338aca76a08658d8", + "shasum": "" + }, + "require": { + "php": ">=5.3.9" + }, + "require-dev": { + "symfony/css-selector": "~2.3" + }, + "suggest": { + "symfony/css-selector": "" + }, + "time": "2015-11-02 20:20:53", + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.7-dev" + } + }, + "installation-source": "dist", + "autoload": { + "psr-4": { + "Symfony\\Component\\DomCrawler\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony DomCrawler Component", + "homepage": "https://symfony.com" + }, + { + "name": "symfony/browser-kit", + "version": "v2.7.7", + "version_normalized": "2.7.7.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/browser-kit.git", + "reference": "bd28847ea2193916074c7b11d4fdd78570049694" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/browser-kit/zipball/bd28847ea2193916074c7b11d4fdd78570049694", + "reference": "bd28847ea2193916074c7b11d4fdd78570049694", + "shasum": "" + }, + "require": { + "php": ">=5.3.9", + "symfony/dom-crawler": "~2.0,>=2.0.5" + }, + "require-dev": { + "symfony/css-selector": "~2.0,>=2.0.5", + "symfony/process": "~2.3.34|~2.7,>=2.7.6" + }, + "suggest": { + "symfony/process": "" + }, + "time": "2015-11-02 20:20:53", + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.7-dev" + } + }, + "installation-source": "dist", + "autoload": { + "psr-4": { + "Symfony\\Component\\BrowserKit\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony BrowserKit Component", + "homepage": "https://symfony.com" + }, + { + "name": "symfony/http-foundation", + "version": "2.8.x-dev", + "version_normalized": "2.8.9999999.9999999-dev", + "source": { + "type": "git", + "url": "https://github.com/symfony/http-foundation.git", + "reference": "5ed0ec39ef684bec84d1fd9f2a55104e403b7e49" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/5ed0ec39ef684bec84d1fd9f2a55104e403b7e49", + "reference": "5ed0ec39ef684bec84d1fd9f2a55104e403b7e49", + "shasum": "" + }, + "require": { + "php": ">=5.3.9", + "symfony/polyfill-php54": "~1.0" + }, + "require-dev": { + "symfony/expression-language": "~2.4|~3.0.0" + }, + "time": "2015-11-27 11:03:19", + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.8-dev" + } + }, + "installation-source": "dist", + "autoload": { + "psr-4": { + "Symfony\\Component\\HttpFoundation\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony HttpFoundation Component", + "homepage": "https://symfony.com" } ] diff --git a/vendor/guzzlehttp/guzzle/.travis.yml b/vendor/guzzlehttp/guzzle/.travis.yml index c0689d1..d2060f4 100644 --- a/vendor/guzzlehttp/guzzle/.travis.yml +++ b/vendor/guzzlehttp/guzzle/.travis.yml @@ -1,5 +1,7 @@ language: php +sudo: false + php: - 5.5 - 5.6 diff --git a/vendor/guzzlehttp/guzzle/CHANGELOG.md b/vendor/guzzlehttp/guzzle/CHANGELOG.md index de7da2d..5b7669b 100644 --- a/vendor/guzzlehttp/guzzle/CHANGELOG.md +++ b/vendor/guzzlehttp/guzzle/CHANGELOG.md @@ -1,5 +1,20 @@ # CHANGELOG +## 6.1.1 - 2015-11-22 + +* Bug fix: Proxy::wrapSync() now correctly proxies to the appropriate handler + https://github.com/guzzle/guzzle/commit/911bcbc8b434adce64e223a6d1d14e9a8f63e4e4 +* Feature: HandlerStack is now more generic. + https://github.com/guzzle/guzzle/commit/f2102941331cda544745eedd97fc8fd46e1ee33e +* Bug fix: setting verify to false in the StreamHandler now disables peer + verification. https://github.com/guzzle/guzzle/issues/1256 +* Feature: Middleware now uses an exception factory, including more error + context. https://github.com/guzzle/guzzle/pull/1282 +* Feature: better support for disabled functions. + https://github.com/guzzle/guzzle/pull/1287 +* Bug fix: fixed regression where MockHandler was not using `sink`. + https://github.com/guzzle/guzzle/pull/1292 + ## 6.1.0 - 2015-09-08 * Feature: Added the `on_stats` request option to provide access to transfer diff --git a/vendor/guzzlehttp/guzzle/README.md b/vendor/guzzlehttp/guzzle/README.md index 2d721c0..3af1cc3 100644 --- a/vendor/guzzlehttp/guzzle/README.md +++ b/vendor/guzzlehttp/guzzle/README.md @@ -23,7 +23,7 @@ $res = $client->request('GET', 'https://api.github.com/user', [ 'auth' => ['user', 'pass'] ]); echo $res->getStatusCode(); -// "200" +// 200 echo $res->getHeader('content-type'); // 'application/json; charset=utf8' echo $res->getBody(); diff --git a/vendor/guzzlehttp/guzzle/src/ClientInterface.php b/vendor/guzzlehttp/guzzle/src/ClientInterface.php index b5b2306..19068e1 100644 --- a/vendor/guzzlehttp/guzzle/src/ClientInterface.php +++ b/vendor/guzzlehttp/guzzle/src/ClientInterface.php @@ -12,7 +12,7 @@ */ interface ClientInterface { - const VERSION = '6.1.0'; + const VERSION = '6.1.1'; /** * Send an HTTP request. diff --git a/vendor/guzzlehttp/guzzle/src/Cookie/CookieJar.php b/vendor/guzzlehttp/guzzle/src/Cookie/CookieJar.php index ea60068..11421fe 100644 --- a/vendor/guzzlehttp/guzzle/src/Cookie/CookieJar.php +++ b/vendor/guzzlehttp/guzzle/src/Cookie/CookieJar.php @@ -82,7 +82,7 @@ public static function getCookieValue($value) * that survives between requests. * * @param SetCookie $cookie Being evaluated. - * @param bool $allowSessionCookies If we should presist session cookies + * @param bool $allowSessionCookies If we should persist session cookies * @return bool */ public static function shouldPersist( diff --git a/vendor/guzzlehttp/guzzle/src/Cookie/FileCookieJar.php b/vendor/guzzlehttp/guzzle/src/Cookie/FileCookieJar.php index c55bb34..e4e6248 100644 --- a/vendor/guzzlehttp/guzzle/src/Cookie/FileCookieJar.php +++ b/vendor/guzzlehttp/guzzle/src/Cookie/FileCookieJar.php @@ -9,7 +9,7 @@ class FileCookieJar extends CookieJar /** @var string filename */ private $filename; - /** @var bool Control whether to presist session cookies or not. */ + /** @var bool Control whether to persist session cookies or not. */ private $storeSessionCookies; /** diff --git a/vendor/guzzlehttp/guzzle/src/Cookie/SessionCookieJar.php b/vendor/guzzlehttp/guzzle/src/Cookie/SessionCookieJar.php index d80c480..9cd5f9e 100644 --- a/vendor/guzzlehttp/guzzle/src/Cookie/SessionCookieJar.php +++ b/vendor/guzzlehttp/guzzle/src/Cookie/SessionCookieJar.php @@ -9,7 +9,7 @@ class SessionCookieJar extends CookieJar /** @var string session key */ private $sessionKey; - /** @var bool Control whether to presist session cookies or not. */ + /** @var bool Control whether to persist session cookies or not. */ private $storeSessionCookies; /** diff --git a/vendor/guzzlehttp/guzzle/src/Exception/RequestException.php b/vendor/guzzlehttp/guzzle/src/Exception/RequestException.php index 23dd02c..56b1831 100644 --- a/vendor/guzzlehttp/guzzle/src/Exception/RequestException.php +++ b/vendor/guzzlehttp/guzzle/src/Exception/RequestException.php @@ -79,25 +79,69 @@ public static function create( $level = floor($response->getStatusCode() / 100); if ($level == '4') { - $label = 'Client error response'; + $label = 'Client error'; $className = __NAMESPACE__ . '\\ClientException'; } elseif ($level == '5') { - $label = 'Server error response'; + $label = 'Server error'; $className = __NAMESPACE__ . '\\ServerException'; } else { - $label = 'Unsuccessful response'; + $label = 'Unsuccessful request'; $className = __CLASS__; } - $message = $label . ' [url] ' . $request->getUri() - . ' [http method] ' . $request->getMethod() - . ' [status code] ' . $response->getStatusCode() - . ' [reason phrase] ' . $response->getReasonPhrase(); + // Server Error: `GET /` resulted in a `404 Not Found` response: + // ... (truncated) + $message = sprintf( + '%s: `%s` resulted in a `%s` response', + $label, + $request->getMethod() . ' ' . $request->getUri(), + $response->getStatusCode() . ' ' . $response->getReasonPhrase() + ); + + $summary = static::getResponseBodySummary($response); + + if ($summary !== null) { + $message .= ":\n{$summary}\n"; + } return new $className($message, $request, $response, $previous, $ctx); } /** + * Get a short summary of the response + * + * Will return `null` if the response is not printable. + * + * @param ResponseInterface $response + * + * @return string|null + */ + public static function getResponseBodySummary(ResponseInterface $response) + { + $body = $response->getBody(); + + if (!$body->isSeekable()) { + return null; + } + + $size = $body->getSize(); + $summary = $body->read(120); + $body->rewind(); + + if ($size > 120) { + $summary .= ' (truncated...)'; + } + + // Matches any printable character, including unicode characters: + // letters, marks, numbers, punctuation, spacing, and separators. + if (preg_match('/[^\pL\pM\pN\pP\pS\pZ\n\r\t]/', $summary)) { + return null; + } + + return $summary; + } + + /** * Get the request that caused the exception * * @return RequestInterface diff --git a/vendor/guzzlehttp/guzzle/src/Handler/MockHandler.php b/vendor/guzzlehttp/guzzle/src/Handler/MockHandler.php index 4b1b0af..cd7898f 100644 --- a/vendor/guzzlehttp/guzzle/src/Handler/MockHandler.php +++ b/vendor/guzzlehttp/guzzle/src/Handler/MockHandler.php @@ -87,6 +87,19 @@ function ($value) use ($request, $options) { if ($this->onFulfilled) { call_user_func($this->onFulfilled, $value); } + if (isset($options['sink'])) { + $contents = (string) $value->getBody(); + $sink = $options['sink']; + + if (is_resource($sink)) { + fwrite($sink, $contents); + } elseif (is_string($sink)) { + file_put_contents($sink, $contents); + } elseif ($sink instanceof \Psr\Http\Message\StreamInterface) { + $sink->write($contents); + } + } + return $value; }, function ($reason) use ($request, $options) { diff --git a/vendor/guzzlehttp/guzzle/src/Handler/Proxy.php b/vendor/guzzlehttp/guzzle/src/Handler/Proxy.php index 9bd76d2..f8b00be 100644 --- a/vendor/guzzlehttp/guzzle/src/Handler/Proxy.php +++ b/vendor/guzzlehttp/guzzle/src/Handler/Proxy.php @@ -1,6 +1,7 @@ cached) { - $this->cached = $this->resolve(); - } + $handler = $this->resolve(); - $handler = $this->cached; return $handler($request, $options); } @@ -193,15 +190,19 @@ function ($tuple) use ($idx, $remove) { */ public function resolve() { - if (!($prev = $this->handler)) { - throw new \LogicException('No handler has been specified'); - } + if (!$this->cached) { + if (!($prev = $this->handler)) { + throw new \LogicException('No handler has been specified'); + } + + foreach (array_reverse($this->stack) as $fn) { + $prev = $fn[0]($prev); + } - foreach (array_reverse($this->stack) as $fn) { - $prev = $fn[0]($prev); + $this->cached = $prev; } - return $prev; + return $this->cached; } /** diff --git a/vendor/guzzlehttp/guzzle/src/Middleware.php b/vendor/guzzlehttp/guzzle/src/Middleware.php index 2f165f3..85d3165 100644 --- a/vendor/guzzlehttp/guzzle/src/Middleware.php +++ b/vendor/guzzlehttp/guzzle/src/Middleware.php @@ -2,9 +2,7 @@ namespace GuzzleHttp; use GuzzleHttp\Cookie\CookieJarInterface; -use GuzzleHttp\Exception\ClientException; use GuzzleHttp\Exception\RequestException; -use GuzzleHttp\Exception\ServerException; use GuzzleHttp\Promise\RejectedPromise; use GuzzleHttp\Psr7; use Psr\Http\Message\ResponseInterface; @@ -64,9 +62,7 @@ function (ResponseInterface $response) use ($request, $handler) { if ($code < 400) { return $response; } - throw $code > 499 - ? new ServerException("Server error: $code", $request, $response) - : new ClientException("Client error: $code", $request, $response); + throw RequestException::create($request, $response); } ); }; diff --git a/vendor/guzzlehttp/guzzle/src/Pool.php b/vendor/guzzlehttp/guzzle/src/Pool.php index bc41d6e..8f1be33 100644 --- a/vendor/guzzlehttp/guzzle/src/Pool.php +++ b/vendor/guzzlehttp/guzzle/src/Pool.php @@ -52,11 +52,11 @@ public function __construct( $iterable = \GuzzleHttp\Promise\iter_for($requests); $requests = function () use ($iterable, $client, $opts) { - foreach ($iterable as $rfn) { + foreach ($iterable as $key => $rfn) { if ($rfn instanceof RequestInterface) { - yield $client->sendAsync($rfn, $opts); + yield $key => $client->sendAsync($rfn, $opts); } elseif (is_callable($rfn)) { - yield $rfn($opts); + yield $key => $rfn($opts); } else { throw new \InvalidArgumentException('Each value yielded by ' . 'the iterator must be a Psr7\Http\Message\RequestInterface ' diff --git a/vendor/guzzlehttp/guzzle/src/functions.php b/vendor/guzzlehttp/guzzle/src/functions.php index d0a2ca8..5e93b22 100644 --- a/vendor/guzzlehttp/guzzle/src/functions.php +++ b/vendor/guzzlehttp/guzzle/src/functions.php @@ -104,8 +104,12 @@ function debug_resource($value = null) function choose_handler() { $handler = null; - if (extension_loaded('curl')) { + if (function_exists('curl_multi_exec') && function_exists('curl_exec')) { $handler = Proxy::wrapSync(new CurlMultiHandler(), new CurlHandler()); + } elseif (function_exists('curl_exec')) { + $handler = new CurlHandler(); + } elseif (function_exists('curl_multi_exec')) { + $handler = new CurlMultiHandler(); } if (ini_get('allow_url_fopen')) { diff --git a/vendor/symfony/browser-kit/composer.json b/vendor/symfony/browser-kit/composer.json index 2313c73..7c0234e 100644 --- a/vendor/symfony/browser-kit/composer.json +++ b/vendor/symfony/browser-kit/composer.json @@ -27,7 +27,10 @@ "symfony/process": "" }, "autoload": { - "psr-4": { "Symfony\\Component\\BrowserKit\\": "" } + "psr-4": { "Symfony\\Component\\BrowserKit\\": "" }, + "exclude-from-classmap": [ + "/Tests/" + ] }, "minimum-stability": "dev", "extra": { diff --git a/vendor/symfony/css-selector/composer.json b/vendor/symfony/css-selector/composer.json index 99eb4da..8836257 100644 --- a/vendor/symfony/css-selector/composer.json +++ b/vendor/symfony/css-selector/composer.json @@ -23,7 +23,10 @@ "php": ">=5.3.9" }, "autoload": { - "psr-4": { "Symfony\\Component\\CssSelector\\": "" } + "psr-4": { "Symfony\\Component\\CssSelector\\": "" }, + "exclude-from-classmap": [ + "/Tests/" + ] }, "minimum-stability": "dev", "extra": { diff --git a/vendor/symfony/debug/composer.json b/vendor/symfony/debug/composer.json index c1b128a..51b0df6 100644 --- a/vendor/symfony/debug/composer.json +++ b/vendor/symfony/debug/composer.json @@ -27,7 +27,10 @@ "symfony/http-kernel": "~2.3.24|~2.5.9|~2.6,>=2.6.2" }, "autoload": { - "psr-4": { "Symfony\\Component\\Debug\\": "" } + "psr-4": { "Symfony\\Component\\Debug\\": "" }, + "exclude-from-classmap": [ + "/Tests/" + ] }, "minimum-stability": "dev", "extra": { diff --git a/vendor/symfony/dom-crawler/composer.json b/vendor/symfony/dom-crawler/composer.json index f8033c5..5ea57b2 100644 --- a/vendor/symfony/dom-crawler/composer.json +++ b/vendor/symfony/dom-crawler/composer.json @@ -25,7 +25,10 @@ "symfony/css-selector": "" }, "autoload": { - "psr-4": { "Symfony\\Component\\DomCrawler\\": "" } + "psr-4": { "Symfony\\Component\\DomCrawler\\": "" }, + "exclude-from-classmap": [ + "/Tests/" + ] }, "minimum-stability": "dev", "extra": { diff --git a/vendor/symfony/http-foundation/ParameterBag.php b/vendor/symfony/http-foundation/ParameterBag.php index 35b4869..4560322 100644 --- a/vendor/symfony/http-foundation/ParameterBag.php +++ b/vendor/symfony/http-foundation/ParameterBag.php @@ -90,7 +90,7 @@ public function add(array $parameters = array()) */ public function get($key, $default = null, $deep = false) { - if (true === $deep) { + if ($deep) { @trigger_error('Using paths to find deeper items in '.__METHOD__.' is deprecated since version 2.8 and will be removed in 3.0. Filter the returned value in your own code instead.', E_USER_DEPRECATED); } @@ -214,7 +214,7 @@ public function getAlnum($key, $default = '', $deep = false) public function getDigits($key, $default = '', $deep = false) { // we need to remove - and + because they're allowed in the filter - return str_replace(array('-', '+'), '', $this->filter($key, $default, $deep, FILTER_SANITIZE_NUMBER_INT)); + return str_replace(array('-', '+'), '', $this->filter($key, $default, FILTER_SANITIZE_NUMBER_INT, array(), $deep)); } /** @@ -242,7 +242,7 @@ public function getInt($key, $default = 0, $deep = false) */ public function getBoolean($key, $default = false, $deep = false) { - return $this->filter($key, $default, $deep, FILTER_VALIDATE_BOOLEAN); + return $this->filter($key, $default, FILTER_VALIDATE_BOOLEAN, array(), $deep); } /** @@ -250,16 +250,31 @@ public function getBoolean($key, $default = false, $deep = false) * * @param string $key Key. * @param mixed $default Default = null. - * @param bool $deep Default = false. * @param int $filter FILTER_* constant. * @param mixed $options Filter options. + * @param bool $deep Default = false. * * @see http://php.net/manual/en/function.filter-var.php * * @return mixed */ - public function filter($key, $default = null, $deep = false, $filter = FILTER_DEFAULT, $options = array()) + public function filter($key, $default = null, $filter = FILTER_DEFAULT, $options = array(), $deep = false) { + static $filters = null; + + if (null === $filters) { + foreach (filter_list() as $tmp) { + $filters[filter_id($tmp)] = 1; + } + } + if (is_bool($filter) || !isset($filters[$filter]) || is_array($deep)) { + @trigger_error('Passing the $deep boolean as 3rd argument to the '.__METHOD__.' method is deprecated since version 2.8 and will be removed in 3.0. Remove it altogether as the $deep argument will be removed in 3.0.', E_USER_ERROR); + $tmp = $deep; + $deep = $filter; + $filter = $options; + $options = $tmp; + } + $value = $this->get($key, $default, $deep); // Always turn $options into an array - this allows filter_var option shortcuts. diff --git a/vendor/symfony/http-foundation/Request.php b/vendor/symfony/http-foundation/Request.php index edc77df..de36953 100644 --- a/vendor/symfony/http-foundation/Request.php +++ b/vendor/symfony/http-foundation/Request.php @@ -724,7 +724,7 @@ public static function getHttpMethodParameterOverride() */ public function get($key, $default = null, $deep = false) { - if (true === $deep) { + if ($deep) { @trigger_error('Using paths to find deeper items in '.__METHOD__.' is deprecated since version 2.8 and will be removed in 3.0. Filter the returned value in your own code instead.', E_USER_DEPRECATED); } diff --git a/vendor/symfony/http-foundation/Response.php b/vendor/symfony/http-foundation/Response.php index 96d5055..c88fb6c 100644 --- a/vendor/symfony/http-foundation/Response.php +++ b/vendor/symfony/http-foundation/Response.php @@ -329,9 +329,6 @@ public function sendHeaders() $this->setDate(\DateTime::createFromFormat('U', time())); } - // status - header(sprintf('HTTP/%s %s %s', $this->version, $this->statusCode, $this->statusText), true, $this->statusCode); - // headers foreach ($this->headers->allPreserveCase() as $name => $values) { foreach ($values as $value) { @@ -339,6 +336,9 @@ public function sendHeaders() } } + // status + header(sprintf('HTTP/%s %s %s', $this->version, $this->statusCode, $this->statusText), true, $this->statusCode); + // cookies foreach ($this->headers->getCookies() as $cookie) { setcookie($cookie->getName(), $cookie->getValue(), $cookie->getExpiresTime(), $cookie->getPath(), $cookie->getDomain(), $cookie->isSecure(), $cookie->isHttpOnly()); @@ -455,7 +455,7 @@ public function setStatusCode($code, $text = null) } if (null === $text) { - $this->statusText = isset(self::$statusTexts[$code]) ? self::$statusTexts[$code] : ''; + $this->statusText = isset(self::$statusTexts[$code]) ? self::$statusTexts[$code] : 'unknown status'; return $this; } diff --git a/vendor/zendframework/zend-diactoros/CHANGELOG.md b/vendor/zendframework/zend-diactoros/CHANGELOG.md index e6b35b9..aca2ab8 100644 --- a/vendor/zendframework/zend-diactoros/CHANGELOG.md +++ b/vendor/zendframework/zend-diactoros/CHANGELOG.md @@ -2,6 +2,38 @@ All notable changes to this project will be documented in this file, in reverse chronological order by release. +## 1.2.0 - 2015-11-24 + +### Added + +- [#88](https://github.com/zendframework/zend-diactoros/pull/88) updates the + `SapiEmitter` to emit a `Content-Length` header with the content length as + reported by the response body stream, assuming that + `StreamInterface::getSize()` returns an integer. +- [#77](https://github.com/zendframework/zend-diactoros/pull/77) adds a new + response type, `Zend\Diactoros\Response\TextResponse`, for returning plain + text responses. By default, it sets the content type to `text/plain; + charset=utf-8`; per the other response types, the signature is `new + TextResponse($text, $status = 200, array $headers = []`. +- [#90](https://github.com/zendframework/zend-diactoros/pull/90) adds a new + `Zend\Diactoros\CallbackStream`, allowing you to back a stream with a PHP + callable (such as a generator) to generate the message content. Its + constructor accepts the callable: `$stream = new CallbackStream($callable);` + +### Deprecated + +- Nothing. + +### Removed + +- Nothing. + +### Fixed + +- [#77](https://github.com/zendframework/zend-diactoros/pull/77) updates the + `HtmlResponse` to set the charset to utf-8 by default (if no content type + header is provided at instantiation). + ## 1.1.4 - 2015-10-16 ### Added @@ -31,7 +63,8 @@ All notable changes to this project will be documented in this file, in reverse ### Added -- Nothing. +- [#73](https://github.com/zendframework/zend-diactoros/pull/73) adds caching of + the vendor directory to the Travis-CI configuration, to speed up builds. ### Deprecated diff --git a/vendor/zendframework/zend-diactoros/composer.json b/vendor/zendframework/zend-diactoros/composer.json index fee75d9..3e59a48 100644 --- a/vendor/zendframework/zend-diactoros/composer.json +++ b/vendor/zendframework/zend-diactoros/composer.json @@ -15,8 +15,8 @@ }, "extra": { "branch-alias": { - "dev-master": "1.0-dev", - "dev-develop": "1.1-dev" + "dev-master": "1.2-dev", + "dev-develop": "1.3-dev" } }, "require": { diff --git a/vendor/zendframework/zend-diactoros/src/Response/HtmlResponse.php b/vendor/zendframework/zend-diactoros/src/Response/HtmlResponse.php index d298ee0..3342609 100644 --- a/vendor/zendframework/zend-diactoros/src/Response/HtmlResponse.php +++ b/vendor/zendframework/zend-diactoros/src/Response/HtmlResponse.php @@ -41,7 +41,7 @@ public function __construct($html, $status = 200, array $headers = []) parent::__construct( $this->createBody($html), $status, - $this->injectContentType('text/html', $headers) + $this->injectContentType('text/html; charset=utf-8', $headers) ); } diff --git a/vendor/zendframework/zend-diactoros/src/Response/SapiEmitter.php b/vendor/zendframework/zend-diactoros/src/Response/SapiEmitter.php index bba291e..c59257b 100644 --- a/vendor/zendframework/zend-diactoros/src/Response/SapiEmitter.php +++ b/vendor/zendframework/zend-diactoros/src/Response/SapiEmitter.php @@ -29,6 +29,14 @@ public function emit(ResponseInterface $response, $maxBufferLevel = null) throw new RuntimeException('Unable to emit response; headers already sent'); } + if (! $response->hasHeader('Content-Length')) { + // PSR-7 indicates int OR null for the stream size; for null values, + // we will not auto-inject the Content-Length. + if (null !== $response->getBody()->getSize()) { + $response = $response->withHeader('Content-Length', (string) $response->getBody()->getSize()); + } + } + $this->emitStatusLine($response); $this->emitHeaders($response); $this->emitBody($response, $maxBufferLevel); diff --git a/vendor/zendframework/zend-feed/CHANGELOG.md b/vendor/zendframework/zend-feed/CHANGELOG.md index 426cab5..850a7b1 100644 --- a/vendor/zendframework/zend-feed/CHANGELOG.md +++ b/vendor/zendframework/zend-feed/CHANGELOG.md @@ -2,11 +2,42 @@ All notable changes to this project will be documented in this file, in reverse chronological order by release. -## 2.5.2 - TBD +## 2.6.0 - 2015-11-24 ### Added -- Nothing. +- [#13](https://github.com/zendframework/zend-feed/pull/13) introduces + `Zend\Feed\Writer\StandaloneExtensionManager`, an implementation of + `Zend\Feed\Writer\ExtensionManagerInterface` that has no dependencies. + `Zend\Feed\Writer\ExtensionManager` now composes this by default, instead of + `Zend\Feed\Writer\ExtensionPluginManager`, for managing the various feed and + entry extensions. If you relied on `ExtensionPluginManager` previously, you + will need to create an instance manually and inject it into the `Writer` + instance. +- [#14](https://github.com/zendframework/zend-feed/pull/14) introduces: + - `Zend\Feed\Reader\Http\HeaderAwareClientInterface`, which extends + `ClientInterface` and adds an optional argument to the `get()` method, + `array $headers = []`; this argument allows specifying request headers for + the client to send. `$headers` should have header names for keys, and the + values should be arrays of strings/numbers representing the header values + (if only a single value is necessary, it should be represented as an single + value array). + - `Zend\Feed\Reader\Http\HeaderAwareResponseInterface`, which extends + `ResponseInterface` and adds the method `getHeader($name, $default = null)`. + Clients may return either a `ResponseInterface` or + `HeaderAwareResponseInterface` instance. + - `Zend\Feed\Reader\Http\Response`, which is an implementation of + `HeaderAwareResponseInterface`. Its constructor accepts the status code, + body, and, optionally, headers. + - `Zend\Feed\Reader\Http\Psr7ResponseDecorator`, which is an implementation of + `HeaderAwareResponseInterface`. Its constructor accepts a PSR-7 response + instance, and the various methdos then proxy to those methods. This should + make creating wrappers for PSR-7 HTTP clients trivial. + - `Zend\Feed\Reader\Http\ZendHttpClientDecorator`, which decorates a + `Zend\Http\Client` instance, implements `HeaderAwareClientInterface`, and + returns a `Response` instance seeded from the zend-http response upon + calling `get()`. The class exposes a `getDecoratedClient()` method to allow + retrieval of the decorated zend-http client instance. ### Deprecated @@ -23,3 +54,19 @@ All notable changes to this project will be documented in this file, in reverse - [#2](https://github.com/zendframework/zend-feed/pull/2) ensures that the routine for "absolutising" a link in `Reader\FeedSet` always generates a URI with a scheme. +- [#14](https://github.com/zendframework/zend-feed/pull/14) makes the following + changes to fix behavior around HTTP clients used within + `Zend\Feed\Reader\Reader`: + - `setHttpClient()` now ensures that the passed client is either a + `Zend\Feed\Reader\Http\ClientInterface` or `Zend\Http\Client`, raising an + `InvalidArgumentException` if neither. If a `Zend\Http\Client` is passed, it + is passed to the constructor of `Zend\Feed\Reader\Http\ZendHttpClientDecorator`, + and the decorator instance is used. + - `getHttpClient()` now *always* returns a `Zend\Feed\Reader\Http\ClientInterface` + instance. If no instance is currently registered, it lazy loads a + `ZendHttpClientDecorator` instance. + - `import()` was updated to consume a `ClientInterface` instance; when caches + are in play, it checks the client against `HeaderAwareClientInterface` to + determine if it can check for HTTP caching headers, and, if so, to retrieve + them. + - `findFeedLinks()` was updated to consume a `ClientInterface`. diff --git a/vendor/zendframework/zend-feed/composer.json b/vendor/zendframework/zend-feed/composer.json index 2c29f06..2daa130 100644 --- a/vendor/zendframework/zend-feed/composer.json +++ b/vendor/zendframework/zend-feed/composer.json @@ -21,24 +21,25 @@ "zendframework/zend-db": "~2.5", "zendframework/zend-cache": "~2.5", "zendframework/zend-http": "~2.5", - "zendframework/zend-servicemanager": "~2.5", "zendframework/zend-validator": "~2.5", "fabpot/php-cs-fixer": "1.7.*", - "phpunit/PHPUnit": "~4.0" + "phpunit/PHPUnit": "~4.0", + "psr/http-message": "^1.0" }, "suggest": { - "zendframework/zend-cache": "Zend\\Cache component", - "zendframework/zend-db": "Zend\\Db component", + "psr/http-message": "PSR-7 ^1.0, if you wish to use Zend\\Feed\\Reader\\Http\\Psr7ResponseDecorator", + "zendframework/zend-cache": "Zend\\Cache component, for optionally caching feeds between requests", + "zendframework/zend-db": "Zend\\Db component, for use with PubSubHubbub", "zendframework/zend-http": "Zend\\Http for PubSubHubbub, and optionally for use with Zend\\Feed\\Reader", - "zendframework/zend-servicemanager": "Zend\\ServiceManager component, for default/recommended ExtensionManager implementations", - "zendframework/zend-validator": "Zend\\Validator component" + "zendframework/zend-servicemanager": "Zend\\ServiceManager component, for easily extending ExtensionManager implementations", + "zendframework/zend-validator": "Zend\\Validator component, for validating feeds and Atom entries in the Writer subcomponent" }, "minimum-stability": "dev", "prefer-stable": true, "extra": { "branch-alias": { - "dev-master": "2.5-dev", - "dev-develop": "2.6-dev" + "dev-master": "2.6-dev", + "dev-develop": "2.7-dev" } }, "autoload-dev": { @@ -46,4 +47,4 @@ "ZendTest\\Feed\\": "test/" } } -} \ No newline at end of file +} diff --git a/vendor/zendframework/zend-feed/src/Reader/Entry/Atom.php b/vendor/zendframework/zend-feed/src/Reader/Entry/Atom.php index c68f360..84efaad 100644 --- a/vendor/zendframework/zend-feed/src/Reader/Entry/Atom.php +++ b/vendor/zendframework/zend-feed/src/Reader/Entry/Atom.php @@ -104,7 +104,7 @@ public function getContent() /** * Get the entry creation date * - * @return string + * @return \DateTime */ public function getDateCreated() { @@ -122,7 +122,7 @@ public function getDateCreated() /** * Get the entry modification date * - * @return string + * @return \DateTime */ public function getDateModified() { diff --git a/vendor/zendframework/zend-feed/src/Reader/Entry/EntryInterface.php b/vendor/zendframework/zend-feed/src/Reader/Entry/EntryInterface.php index c5e5fb2..250f4b6 100644 --- a/vendor/zendframework/zend-feed/src/Reader/Entry/EntryInterface.php +++ b/vendor/zendframework/zend-feed/src/Reader/Entry/EntryInterface.php @@ -38,14 +38,14 @@ public function getContent(); /** * Get the entry creation date * - * @return string + * @return \DateTime */ public function getDateCreated(); /** * Get the entry modification date * - * @return string + * @return \DateTime */ public function getDateModified(); diff --git a/vendor/zendframework/zend-feed/src/Reader/Entry/Rss.php b/vendor/zendframework/zend-feed/src/Reader/Entry/Rss.php index b55fdad..0832ba3 100644 --- a/vendor/zendframework/zend-feed/src/Reader/Entry/Rss.php +++ b/vendor/zendframework/zend-feed/src/Reader/Entry/Rss.php @@ -167,7 +167,7 @@ public function getContent() /** * Get the entry's date of creation * - * @return string + * @return \DateTime */ public function getDateCreated() { @@ -178,7 +178,7 @@ public function getDateCreated() * Get the entry's date of modification * * @throws Exception\RuntimeException - * @return string + * @return \DateTime */ public function getDateModified() { diff --git a/vendor/zendframework/zend-feed/src/Reader/Reader.php b/vendor/zendframework/zend-feed/src/Reader/Reader.php index 09bdcf4..693a3e2 100644 --- a/vendor/zendframework/zend-feed/src/Reader/Reader.php +++ b/vendor/zendframework/zend-feed/src/Reader/Reader.php @@ -14,6 +14,7 @@ use Zend\Cache\Storage\StorageInterface as CacheStorage; use Zend\Http as ZendHttp; use Zend\Stdlib\ErrorHandler; +use Zend\Feed\Reader\Exception\InvalidHttpClientException; /** */ @@ -57,7 +58,7 @@ class Reader implements ReaderImportInterface /** * HTTP client object to use for retrieving feeds * - * @var ZendHttp\Client + * @var Http\ClientInterface */ protected static $httpClient = null; @@ -117,23 +118,30 @@ public static function setCache(CacheStorage $cache) * * Sets the HTTP client object to use for retrieving the feeds. * - * @param ZendHttp\Client $httpClient + * @param ZendHttp\Client | Http\ClientInterface $httpClient * @return void */ - public static function setHttpClient(ZendHttp\Client $httpClient) + public static function setHttpClient($httpClient) { + if ($httpClient instanceof ZendHttp\Client) { + $httpClient = new Http\ZendHttpClientDecorator($httpClient); + } + + if (! $httpClient instanceof Http\ClientInterface) { + throw new InvalidHttpClientException(); + } static::$httpClient = $httpClient; } /** * Gets the HTTP client object. If none is set, a new ZendHttp\Client will be used. * - * @return ZendHttp\Client + * @return Http\ClientInterface */ public static function getHttpClient() { - if (!static::$httpClient instanceof ZendHttp\Client) { - static::$httpClient = new ZendHttp\Client(); + if (! static::$httpClient) { + static::$httpClient = new Http\ZendHttpClientDecorator(new ZendHttp\Client()); } return static::$httpClient; @@ -189,17 +197,16 @@ public static function useHttpConditionalGet($bool = true) */ public static function import($uri, $etag = null, $lastModified = null) { - $cache = self::getCache(); - $client = self::getHttpClient(); - $client->resetParameters(); - $headers = new ZendHttp\Headers(); - $client->setHeaders($headers); - $client->setUri($uri); + $cache = self::getCache(); + $client = self::getHttpClient(); $cacheId = 'Zend_Feed_Reader_' . md5($uri); if (static::$httpConditionalGet && $cache) { - $data = $cache->getItem($cacheId); - if ($data) { + $headers = []; + $data = $cache->getItem($cacheId); + if ($data && $client instanceof Http\HeaderAwareClientInterface) { + // Only check for ETag and last modified values in the cache + // if we have a client capable of emitting headers in the first place. if ($etag === null) { $etag = $cache->getItem($cacheId . '_etag'); } @@ -207,13 +214,13 @@ public static function import($uri, $etag = null, $lastModified = null) $lastModified = $cache->getItem($cacheId . '_lastmodified'); } if ($etag) { - $headers->addHeaderLine('If-None-Match', $etag); + $headers['If-None-Match'] = [$etag]; } if ($lastModified) { - $headers->addHeaderLine('If-Modified-Since', $lastModified); + $headers['If-Modified-Since'] = [$lastModified]; } } - $response = $client->send(); + $response = $client->get($uri, $headers); if ($response->getStatusCode() !== 200 && $response->getStatusCode() !== 304) { throw new Exception\RuntimeException('Feed failed to load, got response code ' . $response->getStatusCode()); } @@ -222,11 +229,14 @@ public static function import($uri, $etag = null, $lastModified = null) } else { $responseXml = $response->getBody(); $cache->setItem($cacheId, $responseXml); - if ($response->getHeaders()->get('ETag')) { - $cache->setItem($cacheId . '_etag', $response->getHeaders()->get('ETag')->getFieldValue()); - } - if ($response->getHeaders()->get('Last-Modified')) { - $cache->setItem($cacheId . '_lastmodified', $response->getHeaders()->get('Last-Modified')->getFieldValue()); + + if ($response instanceof Http\HeaderAwareResponseInterface) { + if ($response->getHeaderLine('ETag', false)) { + $cache->setItem($cacheId . '_etag', $response->getHeaderLine('ETag')); + } + if ($response->getHeaderLine('Last-Modified', false)) { + $cache->setItem($cacheId . '_lastmodified', $response->getHeaderLine('Last-Modified')); + } } } return static::importString($responseXml); @@ -235,7 +245,7 @@ public static function import($uri, $etag = null, $lastModified = null) if ($data) { return static::importString($data); } - $response = $client->send(); + $response = $client->get($uri); if ((int) $response->getStatusCode() !== 200) { throw new Exception\RuntimeException('Feed failed to load, got response code ' . $response->getStatusCode()); } @@ -243,7 +253,7 @@ public static function import($uri, $etag = null, $lastModified = null) $cache->setItem($cacheId, $responseXml); return static::importString($responseXml); } else { - $response = $client->send(); + $response = $client->get($uri); if ((int) $response->getStatusCode() !== 200) { throw new Exception\RuntimeException('Feed failed to load, got response code ' . $response->getStatusCode()); } @@ -270,7 +280,7 @@ public static function import($uri, $etag = null, $lastModified = null) public static function importRemoteFeed($uri, Http\ClientInterface $client) { $response = $client->get($uri); - if (!$response instanceof Http\ResponseInterface) { + if (! $response instanceof Http\ResponseInterface) { throw new Exception\RuntimeException(sprintf( 'Did not receive a %s\Http\ResponseInterface from the provided HTTP client; received "%s"', __NAMESPACE__, @@ -371,9 +381,8 @@ public static function importFile($filename) */ public static function findFeedLinks($uri) { - $client = static::getHttpClient(); - $client->setUri($uri); - $response = $client->send(); + $client = static::getHttpClient(); + $response = $client->get($uri); if ($response->getStatusCode() !== 200) { throw new Exception\RuntimeException("Failed to access $uri, got response code " . $response->getStatusCode()); } diff --git a/vendor/zendframework/zend-feed/src/Writer/Extension/ITunes/Feed.php b/vendor/zendframework/zend-feed/src/Writer/Extension/ITunes/Feed.php index 0b21b3b..054fe3e 100644 --- a/vendor/zendframework/zend-feed/src/Writer/Extension/ITunes/Feed.php +++ b/vendor/zendframework/zend-feed/src/Writer/Extension/ITunes/Feed.php @@ -14,8 +14,6 @@ use Zend\Stdlib\StringUtils; use Zend\Stdlib\StringWrapper\StringWrapperInterface; -/** -*/ class Feed { /** diff --git a/vendor/zendframework/zend-feed/src/Writer/ExtensionManager.php b/vendor/zendframework/zend-feed/src/Writer/ExtensionManager.php index b0e0e3b..a7efb3e 100644 --- a/vendor/zendframework/zend-feed/src/Writer/ExtensionManager.php +++ b/vendor/zendframework/zend-feed/src/Writer/ExtensionManager.php @@ -12,7 +12,7 @@ /** * Default implementation of ExtensionManagerInterface * - * Decorator of ExtensionPluginManager. + * Decorator for an ExtensionManagerInstance. */ class ExtensionManager implements ExtensionManagerInterface { @@ -22,14 +22,14 @@ class ExtensionManager implements ExtensionManagerInterface * Constructor * * Seeds the extension manager with a plugin manager; if none provided, - * creates an instance. + * creates and decorates an instance of StandaloneExtensionManager. * - * @param null|ExtensionPluginManager $pluginManager + * @param null|ExtensionManagerInterface $pluginManager */ - public function __construct(ExtensionPluginManager $pluginManager = null) + public function __construct(ExtensionManagerInterface $pluginManager = null) { if (null === $pluginManager) { - $pluginManager = new ExtensionPluginManager(); + $pluginManager = new StandaloneExtensionManager(); } $this->pluginManager = $pluginManager; } @@ -37,7 +37,7 @@ public function __construct(ExtensionPluginManager $pluginManager = null) /** * Method overloading * - * Proxy to composed ExtensionPluginManager instance. + * Proxy to composed ExtensionManagerInterface instance. * * @param string $method * @param array $args diff --git a/vendor/zendframework/zend-feed/src/Writer/Writer.php b/vendor/zendframework/zend-feed/src/Writer/Writer.php index a4f95bf..4c1e257 100644 --- a/vendor/zendframework/zend-feed/src/Writer/Writer.php +++ b/vendor/zendframework/zend-feed/src/Writer/Writer.php @@ -105,13 +105,16 @@ public static function registerExtension($name) return; } } - if (!$manager->has($feedName) - && !$manager->has($entryName) - && !$manager->has($feedRendererName) - && !$manager->has($entryRendererName) + if (! $manager->has($feedName) + && ! $manager->has($entryName) + && ! $manager->has($feedRendererName) + && ! $manager->has($entryRendererName) ) { - throw new Exception\RuntimeException('Could not load extension: ' . $name - . 'using Plugin Loader. Check prefix paths are configured and extension exists.'); + throw new Exception\RuntimeException(sprintf( + 'Could not load extension "%s" using Plugin Loader. ' + . 'Check prefix paths are configured and extension exists.', + $name + )); } if ($manager->has($feedName)) { static::$extensions['feed'][] = $feedName;