From 8ff4dba177693bfe8c1fa5996d6b4591d065368e Mon Sep 17 00:00:00 2001 From: Olivier Bellone Date: Thu, 15 Nov 2018 15:40:05 +0100 Subject: [PATCH 1/2] Bump dependencies --- composer.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index 28691c35e..7e8ad5662 100644 --- a/composer.json +++ b/composer.json @@ -21,9 +21,9 @@ "ext-mbstring": "*" }, "require-dev": { - "phpunit/phpunit": "~4.0", - "php-coveralls/php-coveralls": "1.*", - "squizlabs/php_codesniffer": "~2.0" + "phpunit/phpunit": "^5.7", + "php-coveralls/php-coveralls": "^2.1", + "squizlabs/php_codesniffer": "^3.3" }, "autoload": { "psr-4": { "Stripe\\" : "lib/" } From 28d23e02c7741dd2b88f9bb6bcac3f2ab06fe7be Mon Sep 17 00:00:00 2001 From: Olivier Bellone Date: Thu, 15 Nov 2018 16:25:23 +0100 Subject: [PATCH 2/2] Replace getMock() with createMock() --- tests/Stripe/HttpClient/CurlClientTest.php | 2 +- tests/TestCase.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/Stripe/HttpClient/CurlClientTest.php b/tests/Stripe/HttpClient/CurlClientTest.php index 89cf203f2..25c24cede 100644 --- a/tests/Stripe/HttpClient/CurlClientTest.php +++ b/tests/Stripe/HttpClient/CurlClientTest.php @@ -60,7 +60,7 @@ private function setInitialNetworkRetryDelay($initialNetworkRetryDelay) private function createFakeRandomGenerator($returnValue = 1.0) { - $fakeRandomGenerator = $this->getMock('Stripe\Util\RandomGenetator', ['randFloat']); + $fakeRandomGenerator = $this->createMock('Stripe\Util\RandomGenerator', ['randFloat']); $fakeRandomGenerator->method('randFloat')->willReturn($returnValue); return $fakeRandomGenerator; } diff --git a/tests/TestCase.php b/tests/TestCase.php index 93be3d128..69714db01 100644 --- a/tests/TestCase.php +++ b/tests/TestCase.php @@ -42,7 +42,7 @@ protected function setUp() Stripe::setAccountId(null); // Set up the HTTP client mocker - $this->clientMock = $this->getMock('\Stripe\HttpClient\ClientInterface'); + $this->clientMock = $this->createMock('\Stripe\HttpClient\ClientInterface'); // By default, use the real HTTP client ApiRequestor::setHttpClient(HttpClient\CurlClient::instance());