From 838e097ef54827068c0b0cc36658513fa944fa85 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mario=20Bla=C5=BEek?= Date: Wed, 25 Oct 2017 23:27:39 +0200 Subject: [PATCH 1/3] Use PHPUnit v5 and namespaced TestCase --- composer.json | 2 +- tests/Doctrine/Tests/CouchDB/CouchDBClientTest.php | 3 ++- tests/Doctrine/Tests/CouchDB/CouchDBExceptionTest.php | 3 ++- tests/Doctrine/Tests/CouchDB/CouchDBFunctionalTestCase.php | 3 ++- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/composer.json b/composer.json index 9eb79eb..1d94faf 100644 --- a/composer.json +++ b/composer.json @@ -13,7 +13,7 @@ "php": ">=5.4" }, "require-dev": { - "phpunit/phpunit": "~4.0" + "phpunit/phpunit": "^5.7" }, "autoload": { "psr-0": { diff --git a/tests/Doctrine/Tests/CouchDB/CouchDBClientTest.php b/tests/Doctrine/Tests/CouchDB/CouchDBClientTest.php index 1d1caea..c2d4cf4 100644 --- a/tests/Doctrine/Tests/CouchDB/CouchDBClientTest.php +++ b/tests/Doctrine/Tests/CouchDB/CouchDBClientTest.php @@ -4,8 +4,9 @@ use Doctrine\CouchDB\CouchDBClient; use Doctrine\CouchDB\HTTP\SocketClient; +use PHPUnit\Framework\TestCase; -class CouchDBClientTest extends \PHPUnit_Framework_TestCase +class CouchDBClientTest extends TestCase { public function testConstants() { diff --git a/tests/Doctrine/Tests/CouchDB/CouchDBExceptionTest.php b/tests/Doctrine/Tests/CouchDB/CouchDBExceptionTest.php index 17f584e..aae90b0 100644 --- a/tests/Doctrine/Tests/CouchDB/CouchDBExceptionTest.php +++ b/tests/Doctrine/Tests/CouchDB/CouchDBExceptionTest.php @@ -3,11 +3,12 @@ namespace Doctrine\Tests\CouchDB; use Doctrine\CouchDB\CouchDBException; +use PHPUnit\Framework\TestCase; /** * @covers \Doctrine\CouchDB\CouchDBException */ -class CouchDBExceptionTest extends \PHPUnit_Framework_TestCase +class CouchDBExceptionTest extends TestCase { /** * @dataProvider staticFactoryDataProvider diff --git a/tests/Doctrine/Tests/CouchDB/CouchDBFunctionalTestCase.php b/tests/Doctrine/Tests/CouchDB/CouchDBFunctionalTestCase.php index 3a917cd..6db0b89 100644 --- a/tests/Doctrine/Tests/CouchDB/CouchDBFunctionalTestCase.php +++ b/tests/Doctrine/Tests/CouchDB/CouchDBFunctionalTestCase.php @@ -4,8 +4,9 @@ use Doctrine\CouchDB\CouchDBClient; use Doctrine\CouchDB\HTTP\SocketClient; +use PHPUnit\Framework\TestCase; -abstract class CouchDBFunctionalTestCase extends \PHPUnit_Framework_TestCase +abstract class CouchDBFunctionalTestCase extends TestCase { private $httpClient = null; From 07e7f4bd0b26a7bbeda39371caa7c5066cec1b69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mario=20Bla=C5=BEek?= Date: Wed, 25 Oct 2017 23:42:42 +0200 Subject: [PATCH 2/3] Stay on PHPUnit v4 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 1d94faf..115b8e0 100644 --- a/composer.json +++ b/composer.json @@ -13,7 +13,7 @@ "php": ">=5.4" }, "require-dev": { - "phpunit/phpunit": "^5.7" + "phpunit/phpunit": "^4.8.35" }, "autoload": { "psr-0": { From c2cd1135c1a4482de0c67c3f027c4e9c34afa7fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mario=20Bla=C5=BEek?= Date: Fri, 3 Nov 2017 13:38:27 +0100 Subject: [PATCH 3/3] Trigger build --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 89ac288..b54ac36 100644 --- a/README.md +++ b/README.md @@ -129,6 +129,7 @@ $result = $query->execute(); foreach ($result as $row) { echo 'Author ', $row['key'], ' has written ', $row['value'], ' articles', "\n"; } + // Author Alice has written 1 articles // Author Bob has written 2 articles -``` \ No newline at end of file +```