Skip to content

Fix to allow for use with PHP8 #118

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

Open
gforsythe-godaddy wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix to allow for use with PHP8 #118

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
301b099
rename protected method to allow for php 8.x usage
gforsythe-godaddy Jan 10, 2023
098d8d5
add php 8.2 to test matrix
gforsythe-godaddy Jan 10, 2023
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
1 change: 1 addition & 0 deletions .github/workflows/ci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ jobs:
- "7.4"
- "8.0"
- "8.1"
- "8.2"

steps:
- uses: actions/checkout@v2
Expand Down
4 changes: 2 additions & 2 deletions src/Negotiation/AbstractNegotiator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ abstract protected function acceptFactory($header);
*
* @return AcceptMatch|null Headers matched
*/
protected function match(AcceptHeader $header, AcceptHeader $priority, $index)
protected function matchHeader(AcceptHeader $header, AcceptHeader $priority, $index)
{
$ac = $header->getType();
$pc = $priority->getType();
Expand Down Expand Up @@ -154,7 +154,7 @@ private function findMatches(array $headerParts, array $priorities)
$matches = [];
foreach ($priorities as $index => $p) {
foreach ($headerParts as $h) {
if (null !== $match = $this->match($h, $p, $index)) {
if (null !== $match = $this->matchHeader($h, $p, $index)) {
$matches[] = $match;
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/Negotiation/LanguageNegotiator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ protected function acceptFactory($accept)
/**
* {@inheritdoc}
*/
protected function match(AcceptHeader $acceptLanguage, AcceptHeader $priority, $index)
protected function matchHeader(AcceptHeader $acceptLanguage, AcceptHeader $priority, $index)
{
if (!$acceptLanguage instanceof AcceptLanguage || !$priority instanceof AcceptLanguage) {
return null;
Expand Down
2 changes: 1 addition & 1 deletion src/Negotiation/Negotiator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ protected function acceptFactory($accept)
/**
* {@inheritdoc}
*/
protected function match(AcceptHeader $accept, AcceptHeader $priority, $index)
protected function matchHeader(AcceptHeader $accept, AcceptHeader $priority, $index)
{
if (!$accept instanceof Accept || !$priority instanceof Accept) {
return null;
Expand Down