Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
18 changes: 6 additions & 12 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ jobs:
runs-on: ${{ matrix.operating-system }}
strategy:
matrix:
operating-system: ['ubuntu-20.04']
operating-system: ['ubuntu-latest']
php-versions: ['7.0']
phpunit-versions: ['6.5.14']
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v4

- name: Setup PHP
uses: shivammathur/setup-php@v2
Expand All @@ -24,7 +24,7 @@ jobs:
tools: psalm, phpunit:${{ matrix.phpunit-versions }}

- name: Install dependencies
run: composer self-update --1; composer install
run: composer self-update; composer remove --dev vimeo/psalm; composer install

- name: PHPUnit tests
run: vendor/bin/phpunit
Expand All @@ -39,7 +39,7 @@ jobs:
phpunit-versions: ['latest']
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v4

- name: Setup PHP
uses: shivammathur/setup-php@v2
Expand All @@ -58,20 +58,17 @@ jobs:
- name: PHPUnit tests
run: vendor/bin/phpunit

- name: Static Analysis
run: vendor/bin/psalm

modern:
name: PHP ${{ matrix.php-versions }} Test on ${{ matrix.operating-system }}
runs-on: ${{ matrix.operating-system }}
strategy:
matrix:
operating-system: ['ubuntu-latest']
php-versions: ['7.4', '8.0', '8.1', '8.2', '8.3']
php-versions: ['7.4', '8.0', '8.1', '8.2', '8.3', '8.4', '8.5']
phpunit-versions: ['latest']
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v4

- name: Setup PHP
uses: shivammathur/setup-php@v2
Expand All @@ -85,6 +82,3 @@ jobs:
run: composer install
- name: PHPUnit tests
run: vendor/bin/phpunit

- name: Static Analysis
run: vendor/bin/psalm
30 changes: 30 additions & 0 deletions .github/workflows/psalm.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
name: Psalm

on: [push]

jobs:
psalm:
name: Psalm on PHP ${{ matrix.php-versions }}
runs-on: ${{ matrix.operating-system }}
strategy:
matrix:
operating-system: ['ubuntu-latest']
php-versions: ['8.4']
steps:
- name: Checkout
uses: actions/checkout@v4

- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: ${{ matrix.php-versions }}
tools: psalm:6
coverage: none

- name: Install Composer dependencies
uses: "ramsey/composer-install@v3"
with:
composer-options: --no-dev

- name: Static Analysis
run: psalm
9 changes: 9 additions & 0 deletions psalm.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,15 @@
</ignoreFiles>
</projectFiles>
<issueHandlers>
<ArgumentTypeCoercion errorLevel="info" />
<RiskyTruthyFalsyComparison errorLevel="info" />
<PossiblyNullArgument errorLevel="info" />
<PossiblyFalseArgument errorLevel="info" />
<ClassMustBeFinal errorLevel="info" />
<PossiblyUnusedMethod errorLevel="info" />
<PossiblyUnusedReturnValue errorLevel="info" />
<MissingOverrideAttribute errorLevel="info" />
<UnusedClass errorLevel="info" />
<MoreSpecificImplementedParamType errorLevel="info" />
<RedundantConditionGivenDocblockType errorLevel="info" />
<NonInvariantDocblockPropertyType errorLevel="info" />
Expand Down
1 change: 0 additions & 1 deletion tests/SpecialTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,6 @@ public function testEmailAddressFilter()
'"email"@domain.com',
'1234567890@domain.com',
'email@paragonie.com',
'email@pie-hosted.com',
'_______@domain.com',
'email@domain.name',
// 'email@domain.co.jp',
Expand Down