Skip to content

Bugfix: headers not being passed to request #529

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 4 commits into from
Feb 23, 2017
Merged

Bugfix: headers not being passed to request #529

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
97ed744
Add IDE files to gitignore
emmetog Feb 23, 2017
9b5c491
Add failing UT to show bug
emmetog Feb 23, 2017
bd63fa2
Fix bug: reset plugin when headers change
emmetog Feb 23, 2017
0bd2ea1
Remove IDEs from gitignore
emmetog Feb 23, 2017
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
3 changes: 3 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,6 @@ phpunit.xml
composer.lock
composer.phar
vendor/*

# IDEs
/.idea/
Copy link
Collaborator

@Nyholm Nyholm Feb 23, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should never be in the gitignore. They should be in your global gitignore file.

Copy link
Contributor Author

@emmetog emmetog Feb 23, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wasn't familiar with the global gitignore, thanks

3 changes: 3 additions & 0 deletions lib/Github/HttpClient/Builder.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,9 @@ public function addHeaderValue($header, $headerValue)
} else {
$this->headers[$header] = array_merge((array)$this->headers[$header], array($headerValue));
}

$this->removePlugin(Plugin\HeaderAppendPlugin::class);
$this->addPlugin(new Plugin\HeaderAppendPlugin($this->headers));
}

/**
Expand Down
24 changes: 24 additions & 0 deletions test/Github/Tests/HttpClient/BuilderTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,4 +49,28 @@ public function shouldAddHeaders()

$client->addHeaders($headers);
}

/**
* @test
*/
public function appendingHeaderShouldAddAndRemovePlugin()
{
$expectedHeaders = [
'Accept' => 'application/vnd.github.v3',
];

$client = $this->getMockBuilder(\Github\HttpClient\Builder::class)
->setMethods(array('removePlugin', 'addPlugin'))
->getMock();

$client->expects($this->once())
->method('removePlugin')
->with(Plugin\HeaderAppendPlugin::class);

$client->expects($this->once())
->method('addPlugin')
->with(new Plugin\HeaderAppendPlugin($expectedHeaders));

$client->addHeaderValue('Accept', 'application/vnd.github.v3');
}
}