From 849e20e821160252e74eb6b047f202d08fe1ab4c Mon Sep 17 00:00:00 2001 From: Nick Dekker Date: Sun, 6 Aug 2017 12:35:20 +0200 Subject: [PATCH 01/15] Fix memory leak in Client.php Headers are no longer added every time. They used to be added regardless, which caused the headers array to grow infinitely. --- src/Client.php | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/Client.php b/src/Client.php index 443e88f..34c5676 100644 --- a/src/Client.php +++ b/src/Client.php @@ -205,10 +205,14 @@ public function doRequest($request, $response = null) } $headers = $httpRequest->getHeaders(); - $headers->addHeaders([ - 'Content-Type: text/xml; charset=utf-8', - 'Accept: text/xml', - ]); + + if (!$headers->get('Content-Type')) { + $headers->addHeaderLine('Content-Type', 'text/xml; charset=utf-8'); + } + + if (!$headers->get('Accept')) { + $headers->addHeaderLine('Accept', 'text/xml'); + } if (!$headers->get('user-agent')) { $headers->addHeaderLine('user-agent', 'Zend_XmlRpc_Client'); From 7bdc53dc4df5665a2677191e72ec2b4a9312d254 Mon Sep 17 00:00:00 2001 From: Nick Dekker Date: Sun, 6 Aug 2017 23:14:40 +0200 Subject: [PATCH 02/15] [test] Add headers check for content-type & accept [cs] Remove whitespace on empty line --- src/Client.php | 4 ++-- test/ClientTest.php | 30 ++++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 2 deletions(-) diff --git a/src/Client.php b/src/Client.php index 34c5676..23e92e3 100644 --- a/src/Client.php +++ b/src/Client.php @@ -205,11 +205,11 @@ public function doRequest($request, $response = null) } $headers = $httpRequest->getHeaders(); - + if (!$headers->get('Content-Type')) { $headers->addHeaderLine('Content-Type', 'text/xml; charset=utf-8'); } - + if (!$headers->get('Accept')) { $headers->addHeaderLine('Accept', 'text/xml'); } diff --git a/test/ClientTest.php b/test/ClientTest.php index cf53363..c9aa4df 100644 --- a/test/ClientTest.php +++ b/test/ClientTest.php @@ -603,6 +603,36 @@ public function testCustomHttpClientUserAgentIsNotOverridden() $this->assertSame($expectedUserAgent, $this->httpClient->getHeader('user-agent')); } + public function testContentTypeAutomaticallySet() + { + $this->assertFalse( + $this->httpClient->getHeader('Content-Type'), + 'Content-Type is null if no request was made' + ); + + $expectedContentType = 'text/xml; charset=utf-8'; + $this->httpClient->setHeaders(['Content-Type' => $expectedContentType]); + + $this->setServerResponseTo(true); + $this->assertTrue($this->xmlrpcClient->call('method')); + $this->assertSame($expectedContentType, $this->httpClient->getHeader('')); + } + + public function testAcceptAutomaticallySet() + { + $this->assertFalse( + $this->httpClient->getHeader('Accept'), + 'Accept header is null if no request was made' + ); + + $expectedAccept = 'text/xml'; + $this->httpClient->setHeaders(['Accept' => $expectedAccept]); + + $this->setServerResponseTo(true); + $this->assertTrue($this->xmlrpcClient->call('method')); + $this->assertSame($expectedAccept, $this->httpClient->getHeader('')); + } + /** * @group ZF-8478 */ From 4fcd18f5a50f23968cccc8df9c85be968d02e415 Mon Sep 17 00:00:00 2001 From: Nick Dekker Date: Sun, 6 Aug 2017 12:35:20 +0200 Subject: [PATCH 03/15] Fix memory leak in Client.php Headers are no longer added every time. They used to be added regardless, which caused the headers array to grow infinitely. [test] Add headers check for content-type & accept [cs] Remove whitespace on empty line --- test/ClientTest.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/ClientTest.php b/test/ClientTest.php index c9aa4df..f8e311d 100644 --- a/test/ClientTest.php +++ b/test/ClientTest.php @@ -615,7 +615,7 @@ public function testContentTypeAutomaticallySet() $this->setServerResponseTo(true); $this->assertTrue($this->xmlrpcClient->call('method')); - $this->assertSame($expectedContentType, $this->httpClient->getHeader('')); + $this->assertSame($expectedContentType, $this->httpClient->getHeader('Content-Type')); } public function testAcceptAutomaticallySet() @@ -630,7 +630,7 @@ public function testAcceptAutomaticallySet() $this->setServerResponseTo(true); $this->assertTrue($this->xmlrpcClient->call('method')); - $this->assertSame($expectedAccept, $this->httpClient->getHeader('')); + $this->assertSame($expectedAccept, $this->httpClient->getHeader('Accept')); } /** From af4197c8304b492bc1a7e575a03254699f066a9b Mon Sep 17 00:00:00 2001 From: Marco Pivetta Date: Fri, 11 Aug 2017 13:00:15 +0200 Subject: [PATCH 04/15] #27 removing useless `get` call - a simple `has` call is more efficient --- src/Client.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Client.php b/src/Client.php index 23e92e3..91deab0 100644 --- a/src/Client.php +++ b/src/Client.php @@ -206,15 +206,15 @@ public function doRequest($request, $response = null) $headers = $httpRequest->getHeaders(); - if (!$headers->get('Content-Type')) { + if (!$headers->has('Content-Type')) { $headers->addHeaderLine('Content-Type', 'text/xml; charset=utf-8'); } - if (!$headers->get('Accept')) { + if (!$headers->has('Accept')) { $headers->addHeaderLine('Accept', 'text/xml'); } - if (!$headers->get('user-agent')) { + if (!$headers->has('user-agent')) { $headers->addHeaderLine('user-agent', 'Zend_XmlRpc_Client'); } From 1d34b834c47782fc1ace078215e2250c2f89c6f5 Mon Sep 17 00:00:00 2001 From: Marco Pivetta Date: Fri, 11 Aug 2017 13:00:53 +0200 Subject: [PATCH 05/15] #27 documenting thrown exception types caused by `addHeaderLine` calls --- src/Client.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/Client.php b/src/Client.php index 91deab0..4d0dffb 100644 --- a/src/Client.php +++ b/src/Client.php @@ -181,10 +181,13 @@ public function skipSystemLookup() /** * Perform an XML-RPC request and return a response. * - * @param \Zend\XmlRpc\Request $request + * @param \Zend\XmlRpc\Request $request * @param null|\Zend\XmlRpc\Response $response - * @return void + * + * @throws \Zend\Http\Exception\InvalidArgumentException * @throws \Zend\XmlRpc\Client\Exception\HttpException + * + * @return void */ public function doRequest($request, $response = null) { From e6bf6598eebdddfff1d58eec2a6c5d4a342bfd6b Mon Sep 17 00:00:00 2001 From: Marco Pivetta Date: Fri, 11 Aug 2017 13:02:11 +0200 Subject: [PATCH 06/15] #27 documenting further exceptions thrown by `Client#doRequest()` --- src/Client.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/Client.php b/src/Client.php index 4d0dffb..854db3e 100644 --- a/src/Client.php +++ b/src/Client.php @@ -185,7 +185,9 @@ public function skipSystemLookup() * @param null|\Zend\XmlRpc\Response $response * * @throws \Zend\Http\Exception\InvalidArgumentException + * @throws \Zend\Http\Client\Exception\RuntimeException * @throws \Zend\XmlRpc\Client\Exception\HttpException + * @throws \Zend\XmlRpc\Exception\ValueException * * @return void */ From 548494da8d7d737f2ad1dd7b9890e88be024aa42 Mon Sep 17 00:00:00 2001 From: Marco Pivetta Date: Fri, 11 Aug 2017 13:03:07 +0200 Subject: [PATCH 07/15] #27 corrected test naming to match the scenario being tested --- test/ClientTest.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/ClientTest.php b/test/ClientTest.php index f8e311d..cddd60a 100644 --- a/test/ClientTest.php +++ b/test/ClientTest.php @@ -603,7 +603,7 @@ public function testCustomHttpClientUserAgentIsNotOverridden() $this->assertSame($expectedUserAgent, $this->httpClient->getHeader('user-agent')); } - public function testContentTypeAutomaticallySet() + public function testContentTypeIsNotReplaced() { $this->assertFalse( $this->httpClient->getHeader('Content-Type'), @@ -618,7 +618,7 @@ public function testContentTypeAutomaticallySet() $this->assertSame($expectedContentType, $this->httpClient->getHeader('Content-Type')); } - public function testAcceptAutomaticallySet() + public function testAcceptIsNotReplaced() { $this->assertFalse( $this->httpClient->getHeader('Accept'), From f2cfe49dc057dfdc241726109025a0e2bf678a16 Mon Sep 17 00:00:00 2001 From: Marco Pivetta Date: Fri, 11 Aug 2017 13:03:41 +0200 Subject: [PATCH 08/15] #27 adding `@group` annotation for newly introduced tests --- test/ClientTest.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/test/ClientTest.php b/test/ClientTest.php index cddd60a..80f4cbe 100644 --- a/test/ClientTest.php +++ b/test/ClientTest.php @@ -603,6 +603,9 @@ public function testCustomHttpClientUserAgentIsNotOverridden() $this->assertSame($expectedUserAgent, $this->httpClient->getHeader('user-agent')); } + /** + * @group #27 + */ public function testContentTypeIsNotReplaced() { $this->assertFalse( @@ -618,6 +621,9 @@ public function testContentTypeIsNotReplaced() $this->assertSame($expectedContentType, $this->httpClient->getHeader('Content-Type')); } + /** + * @group #27 + */ public function testAcceptIsNotReplaced() { $this->assertFalse( From 843ea433575ae6459e34f93299a102b0d5d43517 Mon Sep 17 00:00:00 2001 From: Marco Pivetta Date: Fri, 11 Aug 2017 13:10:09 +0200 Subject: [PATCH 09/15] #27 adding patch changes to the release notes --- CHANGELOG.md | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bd47262..2e53cc2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -20,7 +20,7 @@ All notable changes to this project will be documented in this file, in reverse - Nothing. -## 2.6.1 - TBD +## 2.6.2 - TBD ### Added @@ -38,6 +38,26 @@ All notable changes to this project will be documented in this file, in reverse - Nothing. +## 2.6.1 - 2017-08-11 + +### Added + +- Nothing. + +### Deprecated + +- Nothing. + +### Removed + +- Nothing. + +### Fixed + +- [#27](https://github.com/zendframework/zend-xmlrpc/pull/19) fixed a memory leak + caused by repetitive addition of `Accept` and `Content-Type` headers on subsequent + HTTP requests produced by the `Zend\XmlRpc\Client`. + ## 2.6.0 - 2016-06-21 ### Added From a92976de98e81c631b88505961a750b630c32157 Mon Sep 17 00:00:00 2001 From: Marco Pivetta Date: Fri, 11 Aug 2017 13:21:43 +0200 Subject: [PATCH 10/15] Committing a `composer.lock` which is compatible with PHP 5.6 --- composer.lock | 403 +++++++++++++++++++++++++++++--------------------- 1 file changed, 234 insertions(+), 169 deletions(-) diff --git a/composer.lock b/composer.lock index cd2c80a..f52f5ed 100644 --- a/composer.lock +++ b/composer.lock @@ -4,23 +4,25 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "1b00932f5705a7882de159ba9cd663da", - "content-hash": "174a9300d7dee27c07ae28fdbef76805", + "content-hash": "6b7ea9034b1672b95c99795411139d43", "packages": [ { "name": "container-interop/container-interop", - "version": "1.1.0", + "version": "1.2.0", "source": { "type": "git", "url": "https://github.com/container-interop/container-interop.git", - "reference": "fc08354828f8fd3245f77a66b9e23a6bca48297e" + "reference": "79cbf1341c22ec75643d841642dd5d6acd83bdb8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/container-interop/container-interop/zipball/fc08354828f8fd3245f77a66b9e23a6bca48297e", - "reference": "fc08354828f8fd3245f77a66b9e23a6bca48297e", + "url": "https://api.github.com/repos/container-interop/container-interop/zipball/79cbf1341c22ec75643d841642dd5d6acd83bdb8", + "reference": "79cbf1341c22ec75643d841642dd5d6acd83bdb8", "shasum": "" }, + "require": { + "psr/container": "^1.0" + }, "type": "library", "autoload": { "psr-4": { @@ -32,20 +34,21 @@ "MIT" ], "description": "Promoting the interoperability of container objects (DIC, SL, etc.)", - "time": "2014-12-30 15:22:37" + "homepage": "https://github.com/container-interop/container-interop", + "time": "2017-02-14T19:40:03+00:00" }, { "name": "paragonie/random_compat", - "version": "v2.0.2", + "version": "v2.0.10", "source": { "type": "git", "url": "https://github.com/paragonie/random_compat.git", - "reference": "088c04e2f261c33bed6ca5245491cfca69195ccf" + "reference": "634bae8e911eefa89c1abfbf1b66da679ac8f54d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/paragonie/random_compat/zipball/088c04e2f261c33bed6ca5245491cfca69195ccf", - "reference": "088c04e2f261c33bed6ca5245491cfca69195ccf", + "url": "https://api.github.com/repos/paragonie/random_compat/zipball/634bae8e911eefa89c1abfbf1b66da679ac8f54d", + "reference": "634bae8e911eefa89c1abfbf1b66da679ac8f54d", "shasum": "" }, "require": { @@ -80,24 +83,73 @@ "pseudorandom", "random" ], - "time": "2016-04-03 06:00:07" + "time": "2017-03-13T16:27:32+00:00" + }, + { + "name": "psr/container", + "version": "1.0.0", + "source": { + "type": "git", + "url": "https://github.com/php-fig/container.git", + "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-fig/container/zipball/b7ce3b176482dbbc1245ebf52b181af44c2cf55f", + "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f", + "shasum": "" + }, + "require": { + "php": ">=5.3.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Psr\\Container\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "PHP-FIG", + "homepage": "http://www.php-fig.org/" + } + ], + "description": "Common Container Interface (PHP FIG PSR-11)", + "homepage": "https://github.com/php-fig/container", + "keywords": [ + "PSR-11", + "container", + "container-interface", + "container-interop", + "psr" + ], + "time": "2017-02-14T16:28:37+00:00" }, { "name": "zendframework/zend-code", - "version": "3.0.2", + "version": "3.1.0", "source": { "type": "git", "url": "https://github.com/zendframework/zend-code.git", - "reference": "57cfbcf794a79985278d6308325bc86060af588c" + "reference": "2899c17f83a7207f2d7f53ec2f421204d3beea27" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-code/zipball/57cfbcf794a79985278d6308325bc86060af588c", - "reference": "57cfbcf794a79985278d6308325bc86060af588c", + "url": "https://api.github.com/repos/zendframework/zend-code/zipball/2899c17f83a7207f2d7f53ec2f421204d3beea27", + "reference": "2899c17f83a7207f2d7f53ec2f421204d3beea27", "shasum": "" }, "require": { - "php": "^5.5 || 7.0.0 - 7.0.4 || ^7.0.6", + "php": "^5.6 || 7.0.0 - 7.0.4 || ^7.0.6", "zendframework/zend-eventmanager": "^2.6 || ^3.0" }, "require-dev": { @@ -114,8 +166,8 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.0-dev", - "dev-develop": "3.1-dev" + "dev-master": "3.1-dev", + "dev-develop": "3.2-dev" } }, "autoload": { @@ -133,24 +185,24 @@ "code", "zf2" ], - "time": "2016-04-20 17:34:49" + "time": "2016-10-24T13:23:32+00:00" }, { "name": "zendframework/zend-escaper", - "version": "2.5.1", + "version": "2.5.2", "source": { "type": "git", "url": "https://github.com/zendframework/zend-escaper.git", - "reference": "a4b227d8a477f4e7e9073f8e0a7ae7dbd3104a73" + "reference": "2dcd14b61a72d8b8e27d579c6344e12c26141d4e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-escaper/zipball/a4b227d8a477f4e7e9073f8e0a7ae7dbd3104a73", - "reference": "a4b227d8a477f4e7e9073f8e0a7ae7dbd3104a73", + "url": "https://api.github.com/repos/zendframework/zend-escaper/zipball/2dcd14b61a72d8b8e27d579c6344e12c26141d4e", + "reference": "2dcd14b61a72d8b8e27d579c6344e12c26141d4e", "shasum": "" }, "require": { - "php": ">=5.3.23" + "php": ">=5.5" }, "require-dev": { "fabpot/php-cs-fixer": "1.7.*", @@ -177,30 +229,30 @@ "escaper", "zf2" ], - "time": "2015-06-03 14:05:37" + "time": "2016-06-30T19:48:38+00:00" }, { "name": "zendframework/zend-eventmanager", - "version": "3.0.1", + "version": "3.2.0", "source": { "type": "git", "url": "https://github.com/zendframework/zend-eventmanager.git", - "reference": "5c80bdee0e952be112dcec0968bad770082c3a6e" + "reference": "9d72db10ceb6e42fb92350c0cb54460da61bd79c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-eventmanager/zipball/5c80bdee0e952be112dcec0968bad770082c3a6e", - "reference": "5c80bdee0e952be112dcec0968bad770082c3a6e", + "url": "https://api.github.com/repos/zendframework/zend-eventmanager/zipball/9d72db10ceb6e42fb92350c0cb54460da61bd79c", + "reference": "9d72db10ceb6e42fb92350c0cb54460da61bd79c", "shasum": "" }, "require": { - "php": "^5.5 || ^7.0" + "php": "^5.6 || ^7.0" }, "require-dev": { "athletic/athletic": "^0.1", "container-interop/container-interop": "^1.1.0", - "phpunit/phpunit": "~4.0", - "squizlabs/php_codesniffer": "^2.0", + "phpunit/phpunit": "^6.0.7 || ^5.7.14", + "zendframework/zend-coding-standard": "~1.0.0", "zendframework/zend-stdlib": "^2.7.3 || ^3.0" }, "suggest": { @@ -210,8 +262,8 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.0-dev", - "dev-develop": "3.1-dev" + "dev-master": "3.2-dev", + "dev-develop": "3.3-dev" } }, "autoload": { @@ -231,20 +283,20 @@ "events", "zf2" ], - "time": "2016-02-18 20:53:00" + "time": "2017-07-11T19:17:22+00:00" }, { "name": "zendframework/zend-http", - "version": "2.5.4", + "version": "2.6.0", "source": { "type": "git", "url": "https://github.com/zendframework/zend-http.git", - "reference": "7b920b4ec34b5ee58f76eb4e8c408b083121953c" + "reference": "09f4d279f46d86be63171ff62ee0f79eca878678" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-http/zipball/7b920b4ec34b5ee58f76eb4e8c408b083121953c", - "reference": "7b920b4ec34b5ee58f76eb4e8c408b083121953c", + "url": "https://api.github.com/repos/zendframework/zend-http/zipball/09f4d279f46d86be63171ff62ee0f79eca878678", + "reference": "09f4d279f46d86be63171ff62ee0f79eca878678", "shasum": "" }, "require": { @@ -255,15 +307,15 @@ "zendframework/zend-validator": "^2.5" }, "require-dev": { - "fabpot/php-cs-fixer": "1.7.*", "phpunit/phpunit": "^4.0", + "zendframework/zend-coding-standard": "~1.0.0", "zendframework/zend-config": "^2.5" }, "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": { @@ -281,7 +333,7 @@ "http", "zf2" ], - "time": "2016-02-04 20:36:48" + "time": "2017-01-31T14:41:02+00:00" }, { "name": "zendframework/zend-loader", @@ -325,7 +377,7 @@ "loader", "zf2" ], - "time": "2015-06-03 14:05:47" + "time": "2015-06-03T14:05:47+00:00" }, { "name": "zendframework/zend-math", @@ -375,7 +427,7 @@ "math", "zf2" ], - "time": "2016-04-28 17:37:42" + "time": "2016-04-28T17:37:42+00:00" }, { "name": "zendframework/zend-server", @@ -421,35 +473,35 @@ "server", "zf2" ], - "time": "2016-06-20 22:27:55" + "time": "2016-06-20T22:27:55+00:00" }, { "name": "zendframework/zend-stdlib", - "version": "3.0.1", + "version": "3.1.0", "source": { "type": "git", "url": "https://github.com/zendframework/zend-stdlib.git", - "reference": "8bafa58574204bdff03c275d1d618aaa601588ae" + "reference": "debedcfc373a293f9250cc9aa03cf121428c8e78" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-stdlib/zipball/8bafa58574204bdff03c275d1d618aaa601588ae", - "reference": "8bafa58574204bdff03c275d1d618aaa601588ae", + "url": "https://api.github.com/repos/zendframework/zend-stdlib/zipball/debedcfc373a293f9250cc9aa03cf121428c8e78", + "reference": "debedcfc373a293f9250cc9aa03cf121428c8e78", "shasum": "" }, "require": { - "php": "^5.5 || ^7.0" + "php": "^5.6 || ^7.0" }, "require-dev": { "athletic/athletic": "~0.1", - "fabpot/php-cs-fixer": "1.7.*", - "phpunit/phpunit": "~4.0" + "phpunit/phpunit": "~4.0", + "squizlabs/php_codesniffer": "^2.6.2" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.0-dev", - "dev-develop": "3.1-dev" + "dev-master": "3.1-dev", + "dev-develop": "3.2-dev" } }, "autoload": { @@ -466,7 +518,7 @@ "stdlib", "zf2" ], - "time": "2016-04-12 21:19:36" + "time": "2016-09-13T14:38:50+00:00" }, { "name": "zendframework/zend-uri", @@ -513,31 +565,31 @@ "uri", "zf2" ], - "time": "2016-02-17 22:38:51" + "time": "2016-02-17T22:38:51+00:00" }, { "name": "zendframework/zend-validator", - "version": "2.8.0", + "version": "2.9.2", "source": { "type": "git", "url": "https://github.com/zendframework/zend-validator.git", - "reference": "f956581bc5fa4cf3f2933fe24e77deded8d1937b" + "reference": "a58dbe8463b93de0d650e296d56cb7da4a129ff3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-validator/zipball/f956581bc5fa4cf3f2933fe24e77deded8d1937b", - "reference": "f956581bc5fa4cf3f2933fe24e77deded8d1937b", + "url": "https://api.github.com/repos/zendframework/zend-validator/zipball/a58dbe8463b93de0d650e296d56cb7da4a129ff3", + "reference": "a58dbe8463b93de0d650e296d56cb7da4a129ff3", "shasum": "" }, "require": { "container-interop/container-interop": "^1.1", - "php": "^5.5 || ^7.0", - "zendframework/zend-stdlib": "^2.7 || ^3.0" + "php": "^5.6 || ^7.0", + "zendframework/zend-stdlib": "^2.7.6 || ^3.1" }, "require-dev": { - "fabpot/php-cs-fixer": "1.7.*", - "phpunit/phpunit": "^4.0", + "phpunit/phpunit": "^6.0.8 || ^5.7.15", "zendframework/zend-cache": "^2.6.1", + "zendframework/zend-coding-standard": "~1.0.0", "zendframework/zend-config": "^2.6", "zendframework/zend-db": "^2.7", "zendframework/zend-filter": "^2.6", @@ -549,20 +601,20 @@ "zendframework/zend-uri": "^2.5" }, "suggest": { - "zendframework/zend-db": "Zend\\Db component", + "zendframework/zend-db": "Zend\\Db component, required by the (No)RecordExists validator", "zendframework/zend-filter": "Zend\\Filter component, required by the Digits validator", - "zendframework/zend-i18n": "Zend\\I18n component to allow translation of validation error messages as well as to use the various Date validators", + "zendframework/zend-i18n": "Zend\\I18n component to allow translation of validation error messages", "zendframework/zend-i18n-resources": "Translations of validator messages", - "zendframework/zend-math": "Zend\\Math component", + "zendframework/zend-math": "Zend\\Math component, required by the Csrf validator", "zendframework/zend-servicemanager": "Zend\\ServiceManager component to allow using the ValidatorPluginManager and validator chains", - "zendframework/zend-session": "Zend\\Session component", + "zendframework/zend-session": "Zend\\Session component, required by the Csrf validator", "zendframework/zend-uri": "Zend\\Uri component, required by the Uri and Sitemap\\Loc validators" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.8-dev", - "dev-develop": "2.9-dev" + "dev-master": "2.9-dev", + "dev-develop": "2.10-dev" }, "zf": { "component": "Zend\\Validator", @@ -584,7 +636,7 @@ "validator", "zf2" ], - "time": "2016-05-16 13:39:40" + "time": "2017-07-20T16:44:59+00:00" }, { "name": "zendframework/zendxml", @@ -629,7 +681,7 @@ "xml", "zf2" ], - "time": "2016-02-04 21:02:08" + "time": "2016-02-04T21:02:08+00:00" } ], "packages-dev": [ @@ -685,7 +737,7 @@ "constructor", "instantiate" ], - "time": "2015-06-14 21:17:01" + "time": "2015-06-14T21:17:01+00:00" }, { "name": "phpdocumentor/reflection-common", @@ -739,26 +791,26 @@ "reflection", "static analysis" ], - "time": "2015-12-27 11:43:31" + "time": "2015-12-27T11:43:31+00:00" }, { "name": "phpdocumentor/reflection-docblock", - "version": "3.1.0", + "version": "3.2.2", "source": { "type": "git", "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git", - "reference": "9270140b940ff02e58ec577c237274e92cd40cdd" + "reference": "4aada1f93c72c35e22fb1383b47fee43b8f1d157" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/9270140b940ff02e58ec577c237274e92cd40cdd", - "reference": "9270140b940ff02e58ec577c237274e92cd40cdd", + "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/4aada1f93c72c35e22fb1383b47fee43b8f1d157", + "reference": "4aada1f93c72c35e22fb1383b47fee43b8f1d157", "shasum": "" }, "require": { "php": ">=5.5", "phpdocumentor/reflection-common": "^1.0@dev", - "phpdocumentor/type-resolver": "^0.2.0", + "phpdocumentor/type-resolver": "^0.3.0", "webmozart/assert": "^1.0" }, "require-dev": { @@ -784,24 +836,24 @@ } ], "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.", - "time": "2016-06-10 09:48:41" + "time": "2017-08-08T06:39:58+00:00" }, { "name": "phpdocumentor/type-resolver", - "version": "0.2", + "version": "0.3.0", "source": { "type": "git", "url": "https://github.com/phpDocumentor/TypeResolver.git", - "reference": "b39c7a5b194f9ed7bd0dd345c751007a41862443" + "reference": "fb3933512008d8162b3cdf9e18dba9309b7c3773" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/b39c7a5b194f9ed7bd0dd345c751007a41862443", - "reference": "b39c7a5b194f9ed7bd0dd345c751007a41862443", + "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/fb3933512008d8162b3cdf9e18dba9309b7c3773", + "reference": "fb3933512008d8162b3cdf9e18dba9309b7c3773", "shasum": "" }, "require": { - "php": ">=5.5", + "php": "^5.5 || ^7.0", "phpdocumentor/reflection-common": "^1.0" }, "require-dev": { @@ -831,31 +883,32 @@ "email": "me@mikevanriel.com" } ], - "time": "2016-06-10 07:14:17" + "time": "2017-06-03T08:32:36+00:00" }, { "name": "phpspec/prophecy", - "version": "v1.6.1", + "version": "v1.7.0", "source": { "type": "git", "url": "https://github.com/phpspec/prophecy.git", - "reference": "58a8137754bc24b25740d4281399a4a3596058e0" + "reference": "93d39f1f7f9326d746203c7c056f300f7f126073" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpspec/prophecy/zipball/58a8137754bc24b25740d4281399a4a3596058e0", - "reference": "58a8137754bc24b25740d4281399a4a3596058e0", + "url": "https://api.github.com/repos/phpspec/prophecy/zipball/93d39f1f7f9326d746203c7c056f300f7f126073", + "reference": "93d39f1f7f9326d746203c7c056f300f7f126073", "shasum": "" }, "require": { "doctrine/instantiator": "^1.0.2", "php": "^5.3|^7.0", "phpdocumentor/reflection-docblock": "^2.0|^3.0.2", - "sebastian/comparator": "^1.1", - "sebastian/recursion-context": "^1.0" + "sebastian/comparator": "^1.1|^2.0", + "sebastian/recursion-context": "^1.0|^2.0|^3.0" }, "require-dev": { - "phpspec/phpspec": "^2.0" + "phpspec/phpspec": "^2.5|^3.2", + "phpunit/phpunit": "^4.8 || ^5.6.5" }, "type": "library", "extra": { @@ -893,7 +946,7 @@ "spy", "stub" ], - "time": "2016-06-07 08:13:47" + "time": "2017-03-02T20:05:34+00:00" }, { "name": "phpunit/php-code-coverage", @@ -955,20 +1008,20 @@ "testing", "xunit" ], - "time": "2015-10-06 15:47:00" + "time": "2015-10-06T15:47:00+00:00" }, { "name": "phpunit/php-file-iterator", - "version": "1.4.1", + "version": "1.4.2", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-file-iterator.git", - "reference": "6150bf2c35d3fc379e50c7602b75caceaa39dbf0" + "reference": "3cc8f69b3028d0f96a9078e6295d86e9bf019be5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/6150bf2c35d3fc379e50c7602b75caceaa39dbf0", - "reference": "6150bf2c35d3fc379e50c7602b75caceaa39dbf0", + "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/3cc8f69b3028d0f96a9078e6295d86e9bf019be5", + "reference": "3cc8f69b3028d0f96a9078e6295d86e9bf019be5", "shasum": "" }, "require": { @@ -1002,7 +1055,7 @@ "filesystem", "iterator" ], - "time": "2015-06-21 13:08:43" + "time": "2016-10-03T07:40:28+00:00" }, { "name": "phpunit/php-text-template", @@ -1043,29 +1096,34 @@ "keywords": [ "template" ], - "time": "2015-06-21 13:50:34" + "time": "2015-06-21T13:50:34+00:00" }, { "name": "phpunit/php-timer", - "version": "1.0.8", + "version": "1.0.9", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-timer.git", - "reference": "38e9124049cf1a164f1e4537caf19c99bf1eb260" + "reference": "3dcf38ca72b158baf0bc245e9184d3fdffa9c46f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/38e9124049cf1a164f1e4537caf19c99bf1eb260", - "reference": "38e9124049cf1a164f1e4537caf19c99bf1eb260", + "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/3dcf38ca72b158baf0bc245e9184d3fdffa9c46f", + "reference": "3dcf38ca72b158baf0bc245e9184d3fdffa9c46f", "shasum": "" }, "require": { - "php": ">=5.3.3" + "php": "^5.3.3 || ^7.0" }, "require-dev": { - "phpunit/phpunit": "~4|~5" + "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0" }, "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0-dev" + } + }, "autoload": { "classmap": [ "src/" @@ -1087,20 +1145,20 @@ "keywords": [ "timer" ], - "time": "2016-05-12 18:03:57" + "time": "2017-02-26T11:10:40+00:00" }, { "name": "phpunit/php-token-stream", - "version": "1.4.8", + "version": "1.4.11", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-token-stream.git", - "reference": "3144ae21711fb6cac0b1ab4cbe63b75ce3d4e8da" + "reference": "e03f8f67534427a787e21a385a67ec3ca6978ea7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/3144ae21711fb6cac0b1ab4cbe63b75ce3d4e8da", - "reference": "3144ae21711fb6cac0b1ab4cbe63b75ce3d4e8da", + "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/e03f8f67534427a787e21a385a67ec3ca6978ea7", + "reference": "e03f8f67534427a787e21a385a67ec3ca6978ea7", "shasum": "" }, "require": { @@ -1136,20 +1194,20 @@ "keywords": [ "tokenizer" ], - "time": "2015-09-15 10:49:45" + "time": "2017-02-27T10:12:30+00:00" }, { "name": "phpunit/phpunit", - "version": "4.8.26", + "version": "4.8.36", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "fc1d8cd5b5de11625979125c5639347896ac2c74" + "reference": "46023de9a91eec7dfb06cc56cb4e260017298517" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/fc1d8cd5b5de11625979125c5639347896ac2c74", - "reference": "fc1d8cd5b5de11625979125c5639347896ac2c74", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/46023de9a91eec7dfb06cc56cb4e260017298517", + "reference": "46023de9a91eec7dfb06cc56cb4e260017298517", "shasum": "" }, "require": { @@ -1165,7 +1223,7 @@ "phpunit/php-text-template": "~1.2", "phpunit/php-timer": "^1.0.6", "phpunit/phpunit-mock-objects": "~2.3", - "sebastian/comparator": "~1.1", + "sebastian/comparator": "~1.2.2", "sebastian/diff": "~1.2", "sebastian/environment": "~1.3", "sebastian/exporter": "~1.2", @@ -1208,7 +1266,7 @@ "testing", "xunit" ], - "time": "2016-05-17 03:09:28" + "time": "2017-06-21T08:07:12+00:00" }, { "name": "phpunit/phpunit-mock-objects", @@ -1264,26 +1322,26 @@ "mock", "xunit" ], - "time": "2015-10-02 06:51:40" + "time": "2015-10-02T06:51:40+00:00" }, { "name": "sebastian/comparator", - "version": "1.2.0", + "version": "1.2.4", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/comparator.git", - "reference": "937efb279bd37a375bcadf584dec0726f84dbf22" + "reference": "2b7424b55f5047b47ac6e5ccb20b2aea4011d9be" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/937efb279bd37a375bcadf584dec0726f84dbf22", - "reference": "937efb279bd37a375bcadf584dec0726f84dbf22", + "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/2b7424b55f5047b47ac6e5ccb20b2aea4011d9be", + "reference": "2b7424b55f5047b47ac6e5ccb20b2aea4011d9be", "shasum": "" }, "require": { "php": ">=5.3.3", "sebastian/diff": "~1.2", - "sebastian/exporter": "~1.2" + "sebastian/exporter": "~1.2 || ~2.0" }, "require-dev": { "phpunit/phpunit": "~4.4" @@ -1328,27 +1386,27 @@ "compare", "equality" ], - "time": "2015-07-26 15:48:44" + "time": "2017-01-29T09:50:25+00:00" }, { "name": "sebastian/diff", - "version": "1.4.1", + "version": "1.4.3", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/diff.git", - "reference": "13edfd8706462032c2f52b4b862974dd46b71c9e" + "reference": "7f066a26a962dbe58ddea9f72a4e82874a3975a4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/13edfd8706462032c2f52b4b862974dd46b71c9e", - "reference": "13edfd8706462032c2f52b4b862974dd46b71c9e", + "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/7f066a26a962dbe58ddea9f72a4e82874a3975a4", + "reference": "7f066a26a962dbe58ddea9f72a4e82874a3975a4", "shasum": "" }, "require": { - "php": ">=5.3.3" + "php": "^5.3.3 || ^7.0" }, "require-dev": { - "phpunit/phpunit": "~4.8" + "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0" }, "type": "library", "extra": { @@ -1380,27 +1438,27 @@ "keywords": [ "diff" ], - "time": "2015-12-08 07:14:41" + "time": "2017-05-22T07:24:03+00:00" }, { "name": "sebastian/environment", - "version": "1.3.7", + "version": "1.3.8", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/environment.git", - "reference": "4e8f0da10ac5802913afc151413bc8c53b6c2716" + "reference": "be2c607e43ce4c89ecd60e75c6a85c126e754aea" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/4e8f0da10ac5802913afc151413bc8c53b6c2716", - "reference": "4e8f0da10ac5802913afc151413bc8c53b6c2716", + "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/be2c607e43ce4c89ecd60e75c6a85c126e754aea", + "reference": "be2c607e43ce4c89ecd60e75c6a85c126e754aea", "shasum": "" }, "require": { - "php": ">=5.3.3" + "php": "^5.3.3 || ^7.0" }, "require-dev": { - "phpunit/phpunit": "~4.4" + "phpunit/phpunit": "^4.8 || ^5.0" }, "type": "library", "extra": { @@ -1430,7 +1488,7 @@ "environment", "hhvm" ], - "time": "2016-05-17 03:18:57" + "time": "2016-08-18T05:49:44+00:00" }, { "name": "sebastian/exporter", @@ -1497,7 +1555,7 @@ "export", "exporter" ], - "time": "2016-06-17 09:04:28" + "time": "2016-06-17T09:04:28+00:00" }, { "name": "sebastian/global-state", @@ -1548,20 +1606,20 @@ "keywords": [ "global state" ], - "time": "2015-10-12 03:26:01" + "time": "2015-10-12T03:26:01+00:00" }, { "name": "sebastian/recursion-context", - "version": "1.0.2", + "version": "1.0.5", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/recursion-context.git", - "reference": "913401df809e99e4f47b27cdd781f4a258d58791" + "reference": "b19cc3298482a335a95f3016d2f8a6950f0fbcd7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/913401df809e99e4f47b27cdd781f4a258d58791", - "reference": "913401df809e99e4f47b27cdd781f4a258d58791", + "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/b19cc3298482a335a95f3016d2f8a6950f0fbcd7", + "reference": "b19cc3298482a335a95f3016d2f8a6950f0fbcd7", "shasum": "" }, "require": { @@ -1601,7 +1659,7 @@ ], "description": "Provides functionality to recursively process PHP variables", "homepage": "http://www.github.com/sebastianbergmann/recursion-context", - "time": "2015-11-11 19:50:13" + "time": "2016-10-03T07:41:43+00:00" }, { "name": "sebastian/version", @@ -1636,20 +1694,20 @@ ], "description": "Library that helps with managing the version number of Git-hosted PHP projects", "homepage": "https://github.com/sebastianbergmann/version", - "time": "2015-06-21 13:59:46" + "time": "2015-06-21T13:59:46+00:00" }, { "name": "squizlabs/php_codesniffer", - "version": "2.6.1", + "version": "2.9.1", "source": { "type": "git", "url": "https://github.com/squizlabs/PHP_CodeSniffer.git", - "reference": "fb72ed32f8418db5e7770be1653e62e0d6f5dd3d" + "reference": "dcbed1074f8244661eecddfc2a675430d8d33f62" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/fb72ed32f8418db5e7770be1653e62e0d6f5dd3d", - "reference": "fb72ed32f8418db5e7770be1653e62e0d6f5dd3d", + "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/dcbed1074f8244661eecddfc2a675430d8d33f62", + "reference": "dcbed1074f8244661eecddfc2a675430d8d33f62", "shasum": "" }, "require": { @@ -1714,29 +1772,35 @@ "phpcs", "standards" ], - "time": "2016-05-30 22:24:32" + "time": "2017-05-22T02:43:20+00:00" }, { "name": "symfony/yaml", - "version": "v3.1.1", + "version": "v3.3.6", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "c5a7e7fc273c758b92b85dcb9c46149ccda89623" + "reference": "ddc23324e6cfe066f3dd34a37ff494fa80b617ed" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/c5a7e7fc273c758b92b85dcb9c46149ccda89623", - "reference": "c5a7e7fc273c758b92b85dcb9c46149ccda89623", + "url": "https://api.github.com/repos/symfony/yaml/zipball/ddc23324e6cfe066f3dd34a37ff494fa80b617ed", + "reference": "ddc23324e6cfe066f3dd34a37ff494fa80b617ed", "shasum": "" }, "require": { "php": ">=5.5.9" }, + "require-dev": { + "symfony/console": "~2.8|~3.0" + }, + "suggest": { + "symfony/console": "For validating YAML files using the lint command" + }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.1-dev" + "dev-master": "3.3-dev" } }, "autoload": { @@ -1763,32 +1827,33 @@ ], "description": "Symfony Yaml Component", "homepage": "https://symfony.com", - "time": "2016-06-14 11:18:07" + "time": "2017-07-23T12:43:26+00:00" }, { "name": "webmozart/assert", - "version": "1.0.2", + "version": "1.2.0", "source": { "type": "git", "url": "https://github.com/webmozart/assert.git", - "reference": "30eed06dd6bc88410a4ff7f77b6d22f3ce13dbde" + "reference": "2db61e59ff05fe5126d152bd0655c9ea113e550f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/webmozart/assert/zipball/30eed06dd6bc88410a4ff7f77b6d22f3ce13dbde", - "reference": "30eed06dd6bc88410a4ff7f77b6d22f3ce13dbde", + "url": "https://api.github.com/repos/webmozart/assert/zipball/2db61e59ff05fe5126d152bd0655c9ea113e550f", + "reference": "2db61e59ff05fe5126d152bd0655c9ea113e550f", "shasum": "" }, "require": { - "php": ">=5.3.3" + "php": "^5.3.3 || ^7.0" }, "require-dev": { - "phpunit/phpunit": "^4.6" + "phpunit/phpunit": "^4.6", + "sebastian/version": "^1.0.1" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0-dev" + "dev-master": "1.3-dev" } }, "autoload": { @@ -1812,7 +1877,7 @@ "check", "validate" ], - "time": "2015-08-24 13:29:44" + "time": "2016-11-23T20:04:58+00:00" } ], "aliases": [], From 573a226ca35cc2bf165bd4548158a55bd6bbccf2 Mon Sep 17 00:00:00 2001 From: Marco Pivetta Date: Fri, 11 Aug 2017 13:36:40 +0200 Subject: [PATCH 11/15] STOP IGNORING PLATFORM REQUIREMENTS OMG --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index fc63361..979955d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,7 +15,7 @@ cache: env: global: - - COMPOSER_ARGS="--no-interaction --ignore-platform-reqs" + - COMPOSER_ARGS="--no-interaction" - SITE_URL=https://zendframework.github.io/zend-xmlrpc - GH_USER_NAME="Matthew Weier O'Phinney" - GH_USER_EMAIL=matthew@weierophinney.net From 1a86e24a8f8f53561b643159f363cb168a22b7b9 Mon Sep 17 00:00:00 2001 From: webimpress Date: Thu, 12 Apr 2018 14:39:54 +0100 Subject: [PATCH 12/15] Dropped HHVM support --- .travis.yml | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8f90b26..2368b87 100644 --- a/.travis.yml +++ b/.travis.yml @@ -57,17 +57,6 @@ matrix: - php: 7.2 env: - DEPS=latest - - php: hhvm - env: - - DEPS=lowest - - php: hhvm - env: - - DEPS=locked - - php: hhvm - env: - - DEPS=latest - allow_failures: - - php: hhvm notifications: email: false From ac0410e340f0f917f0e9199ded4d4a8ac3018a69 Mon Sep 17 00:00:00 2001 From: Matthew Weier O'Phinney Date: Mon, 14 May 2018 14:15:16 -0500 Subject: [PATCH 13/15] Removes empty 2.6.3 stub from CHANGELOG --- CHANGELOG.md | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c5eb3d5..5e50d01 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -24,28 +24,6 @@ All notable changes to this project will be documented in this file, in reverse - Nothing. -## 2.6.3 - TBD - -### Added - -- Nothing. - -### Changed - -- Nothing. - -### Deprecated - -- Nothing. - -### Removed - -- Nothing. - -### Fixed - -- Nothing. - ## 2.6.2 - 2018-01-25 ### Added From b86bcabfb5821546c55c0ca22c14d0d73630edf0 Mon Sep 17 00:00:00 2001 From: Matthew Weier O'Phinney Date: Mon, 14 May 2018 14:15:42 -0500 Subject: [PATCH 14/15] Adds CHANGELOG entry for #32 --- CHANGELOG.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5e50d01..3ba549d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ All notable changes to this project will be documented in this file, in reverse chronological order by release. -## 2.7.0 - TBD +## 2.7.0 - 2018-05-14 ### Added @@ -18,7 +18,7 @@ All notable changes to this project will be documented in this file, in reverse ### Removed -- Nothing. +- [#32](https://github.com/zendframework/zend-xmlrpc/pull/32) removes support for HHVM. ### Fixed From 06efc12f2ba5d6ad2b5bfaabc94840da6fcf4219 Mon Sep 17 00:00:00 2001 From: Matthew Weier O'Phinney Date: Mon, 14 May 2018 14:16:07 -0500 Subject: [PATCH 15/15] Updates branch aliases - dev-master => 2.7.x-dev - dev-develop => 2.8.x-dev --- composer.json | 4 ++-- composer.lock | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/composer.json b/composer.json index 5857f6b..65f3815 100644 --- a/composer.json +++ b/composer.json @@ -49,8 +49,8 @@ }, "extra": { "branch-alias": { - "dev-master": "2.6.x-dev", - "dev-develop": "2.7.x-dev" + "dev-master": "2.7.x-dev", + "dev-develop": "2.8.x-dev" } }, "scripts": { diff --git a/composer.lock b/composer.lock index 1b121c9..c84842c 100644 --- a/composer.lock +++ b/composer.lock @@ -1,10 +1,10 @@ { "_readme": [ "This file locks the dependencies of your project to a known state", - "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", + "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "e6e0cc390e75de44a0701208cdff29ae", + "content-hash": "6c485ea26114ca99ed90615c18ee69c4", "packages": [ { "name": "container-interop/container-interop",