Skip to content

Remove set methods and lock phpunit #50

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 25, 2018
Merged

Remove set methods and lock phpunit #50

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"require-dev": {
"guzzlehttp/psr7": "^1.0",
"php-http/client-integration-tests": "dev-master",
"phpunit/phpunit": "^7.0",
"phpunit/phpunit": "^7.5",
"zendframework/zend-diactoros": "^1.0"
},
"autoload": {
Expand Down
11 changes: 1 addition & 10 deletions tests/BaseUnitTestCase.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,15 +63,6 @@ protected function createResponse()
*/
protected function createPromiseCore()
{
$class = new \ReflectionClass(PromiseCore::class);
$methods = $class->getMethods(\ReflectionMethod::IS_PUBLIC);
foreach ($methods as &$item) {
$item = $item->getName();
}
unset($item);
$core = $this->getMockBuilder(PromiseCore::class)->disableOriginalConstructor()
->setMethods($methods)->getMock();

return $core;
return $this->getMockBuilder(PromiseCore::class)->disableOriginalConstructor()->getMock();
}
}
29 changes: 23 additions & 6 deletions tests/ClientTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,7 @@ class ClientTest extends TestCase
*/
public function testExpectHeader()
{
$client = $this->getMockBuilder(Client::class)->disableOriginalConstructor()
->setMethods(['__none__'])->getMock();
$client = $this->getMockBuilder(Client::class)->disableOriginalConstructor()->getMock();

$createHeaders = new \ReflectionMethod(Client::class, 'createHeaders');
$createHeaders->setAccessible(true);
Expand All @@ -38,10 +37,29 @@ public function testExpectHeader()
static::assertContains('Expect:', $headers);
}

/**
* "Expect" header should be empty.
*
* @link https://github.com/php-http/curl-client/issues/18
*/
public function testWithNullPostFields()
{
$client = $this->getMockBuilder(Client::class)->disableOriginalConstructor()->getMock();

$createHeaders = new \ReflectionMethod(Client::class, 'createHeaders');
$createHeaders->setAccessible(true);

$request = new Request();
$request = $request->withHeader('content-length', '0');

$headers = $createHeaders->invoke($client, $request, [CURLOPT_POSTFIELDS => null]);

static::assertContains('content-length: 0', $headers);
}

public function testRewindStream()
{
$client = $this->getMockBuilder(Client::class)->disableOriginalConstructor()
->setMethods(['__none__'])->getMock();
$client = $this->getMockBuilder(Client::class)->disableOriginalConstructor()->getMock();

$bodyOptions = new \ReflectionMethod(Client::class, 'addRequestBodyOptions');
$bodyOptions->setAccessible(true);
Expand All @@ -56,8 +74,7 @@ public function testRewindStream()

public function testRewindLargeStream()
{
$client = $this->getMockBuilder(Client::class)->disableOriginalConstructor()
->setMethods(['__none__'])->getMock();
$client = $this->getMockBuilder(Client::class)->disableOriginalConstructor()->getMock();

$bodyOptions = new \ReflectionMethod(Client::class, 'addRequestBodyOptions');
$bodyOptions->setAccessible(true);
Expand Down
3 changes: 1 addition & 2 deletions tests/CurlPromiseTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,7 @@ public function testCoreCallWaitFulfilled()
public function testCoreCallWaitRejected()
{
$core = $this->createPromiseCore();
$runner = $this->getMockBuilder(MultiRunner::class)->disableOriginalConstructor()
->setMethods(['wait'])->getMock();
$runner = $this->getMockBuilder(MultiRunner::class)->disableOriginalConstructor()->getMock();
/** @var MultiRunner|\PHPUnit_Framework_MockObject_MockObject $runner */
$promise = new CurlPromise($core, $runner);

Expand Down
12 changes: 4 additions & 8 deletions tests/PromiseCoreTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,8 @@ class PromiseCoreTest extends BaseUnitTestCase
*/
public function testHandleIsNotAResource()
{
$this->expectException(
\InvalidArgumentException::class,
'Parameter $handle expected to be a cURL resource, NULL given'
);
$this->expectException(\InvalidArgumentException::class);
$this->expectExceptionMessage('Parameter $handle expected to be a cURL resource, NULL given');

new PromiseCore(
$this->createRequest('GET', '/'),
Expand All @@ -40,10 +38,8 @@ public function testHandleIsNotAResource()
*/
public function testHandleIsNotACurlResource()
{
$this->expectException(
\InvalidArgumentException::class,
'Parameter $handle expected to be a cURL resource, stream resource given'
);
$this->expectException(\InvalidArgumentException::class);
$this->expectExceptionMessage('Parameter $handle expected to be a cURL resource, stream resource given');

new PromiseCore(
$this->createRequest('GET', '/'),
Expand Down