Add PHP >=8.1 compatibility #75
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
SOHELAHMED7
changed the title
cebe
reviewed
Nov 17, 2023
| @@ -1629,7 +1628,7 @@ private function pipeline() | |||
|
|
|||
| $operations[] = new CompileHPKP($this->hpkp, $this->hpkpro); | |||
|
|
|||
| $operations[] = new RemoveCookies(array_keys($this->removedCookies)); | |||
| $operations[] = new RemoveCookies($this->removedCookies); | |||
SOHELAHMED7
commented
Nov 17, 2023
| @@ -1730,7 +1729,7 @@ private function cspAllow( | |||
| $reportOnly = null | |||
| ) { | |||
| Types::assert( | |||
| ['string' => [$friendlyDirective, $friendlySource]] | |||
| ['?string' => [$friendlyDirective, $friendlySource]] | |||
SOHELAHMED7
commented
Nov 17, 2023
| @@ -1749,9 +1748,9 @@ private function cspAllow( | |||
| */ | |||
| private function longDirective($friendlyDirective) | |||
| { | |||
| Types::assert(['string' => [$friendlyDirective]]); | |||
| Types::assert(['?string' => [$friendlyDirective]]); | |||
SOHELAHMED7
commented
Nov 17, 2023
|
|
||
| $friendlyDirective = strtolower($friendlyDirective); | ||
| $friendlyDirective = strtolower((string) $friendlyDirective); |
There was a problem hiding this comment.
This is PHP >= 8.1 compatibility fix.
SOHELAHMED7
commented
Nov 17, 2023
| @@ -1774,9 +1773,9 @@ private function longDirective($friendlyDirective) | |||
| */ | |||
| private function longSource($friendlySource) | |||
| { | |||
| Types::assert(['string' => [$friendlySource]]); | |||
| Types::assert(['?string' => [$friendlySource]]); | |||
SOHELAHMED7
commented
Nov 17, 2023
|
|
||
| $lowerFriendlySource = strtolower($friendlySource); | ||
| $lowerFriendlySource = strtolower((string) $friendlySource); |
There was a problem hiding this comment.
This is PHP >= 8.1 compatibility fix.
SOHELAHMED7
commented
Nov 17, 2023
| @@ -7,7 +7,7 @@ | |||
| use Aidantwoods\SecureHeaders\Operations\CompileCSP; | |||
| use PHPUnit\Framework\TestCase; | |||
|
|
|||
| class CSPTest extends TestCase | |||
| class CompileCSPTest extends TestCase | |||
There was a problem hiding this comment.
This is bug in test. PHPUnit was throwing warning.
SOHELAHMED7
commented
Nov 17, 2023
| 'Contains', | ||
| 'NotContains', | ||
| 'StringContainsString', | ||
| 'StringNotContainsString', |
There was a problem hiding this comment.
This and similar changes is for PHPUnit 10.4.* compatibility
|
I have added comments in PR to identify the bugs. I am giving description here for bug:
|
|
I would strongly suggest to split up the unrelated parts of this PR: compatibility changes, CI changes, and especially bug fixes. This drastically increases the chances of getting at least parts merged. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This pull request does the following:
This pull request is endorsed by ☁️ cebe.cloud