Skip to content

Commit

Permalink
Merge pull request #24 from jonnyeom/4.x/update-standards
Browse files Browse the repository at this point in the history
4.x/update standards
  • Loading branch information
jonnyeom authored Jan 26, 2024
2 parents 9e69e62 + 4f1d013 commit c5a3e44
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 17 deletions.
4 changes: 2 additions & 2 deletions .docker/validate-against-schema/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
FROM alpine:3.11.3
FROM alpine:3.17.3

RUN apk add --no-cache libxml2-utils
RUN apk add --no-cache libxml2-utils=2.10.4-r0
23 changes: 13 additions & 10 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@ jobs:
runs-on: "ubuntu-22.04"

steps:
- uses: "actions/checkout@v2"
- uses: "actions/checkout@v4"

- uses: "shivammathur/setup-php@v2"
with:
coverage: none
php-version: 8.1
php-version: 8.3
extensions: curl
tools: composer:v2, cs2pr

Expand All @@ -34,11 +34,11 @@ jobs:
runs-on: "ubuntu-22.04"

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

- uses: shivammathur/setup-php@v2
with:
php-version: 8.1
php-version: 8.3
extensions: curl
coverage: none
tools: composer:v2
Expand All @@ -59,11 +59,12 @@ jobs:
strategy:
matrix:
php-version:
- "8.0"
- "8.1"
- "8.2"
- "8.3"

steps:
- uses: "actions/checkout@v2"
- uses: "actions/checkout@v4"

- uses: "shivammathur/setup-php@v2"
with:
Expand All @@ -85,11 +86,12 @@ jobs:
strategy:
matrix:
php-version:
- "8.0"
- "8.1"
- "8.2"
- "8.3"

steps:
- uses: "actions/checkout@v2"
- uses: "actions/checkout@v4"

- uses: "shivammathur/setup-php@v2"
with:
Expand All @@ -110,11 +112,12 @@ jobs:
strategy:
matrix:
php-version:
- "8.0"
- "8.1"
- "8.2"
- "8.3"

steps:
- uses: "actions/checkout@v2"
- uses: "actions/checkout@v4"

- uses: "shivammathur/setup-php@v2"
with:
Expand Down
8 changes: 4 additions & 4 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,13 @@
}
},
"require": {
"php": "^8.0",
"dealerdirect/phpcodesniffer-composer-installer": "^0.7.0",
"slevomat/coding-standard": "^8.6.4",
"php": "^8.1",
"dealerdirect/phpcodesniffer-composer-installer": "^0.7 || ^1.0.0",
"slevomat/coding-standard": "^8.11",
"squizlabs/php_codesniffer": "^3.7"
},
"require-dev": {
"symfony/phpunit-bridge": "^5.1"
"symfony/phpunit-bridge": "^6.4"
},
"scripts": {
"test": [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -78,9 +78,13 @@ public function register()
*
* @link https://github.com/squizlabs/PHP_CodeSniffer/blob/master/src/Standards/Generic/Sniffs/PHP/ForbiddenFunctionsSniff.php#L118
*
* @param int $stackPtr
*
* {@inheritDoc}
*
* @phpcsSuppress SlevomatCodingStandard.TypeHints.ParameterTypeHint.MissingNativeTypeHint
*/
public function process(File $phpcsFile, $stackPtr)
public function process(File $phpcsFile, $stackPtr): void
{
// Abort if we're not in namespaced code
$firstNamespacePointer = NamespaceHelper::getFirstNamespacePointer($phpcsFile);
Expand Down

0 comments on commit c5a3e44

Please sign in to comment.