diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a86556a..984e55a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -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 @@ -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 @@ -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 @@ -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 @@ -85,6 +82,3 @@ jobs: run: composer install - name: PHPUnit tests run: vendor/bin/phpunit - - - name: Static Analysis - run: vendor/bin/psalm diff --git a/.github/workflows/psalm.yml b/.github/workflows/psalm.yml new file mode 100644 index 0000000..a7d88a2 --- /dev/null +++ b/.github/workflows/psalm.yml @@ -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 diff --git a/psalm.xml b/psalm.xml index 76054fc..2e7e013 100644 --- a/psalm.xml +++ b/psalm.xml @@ -10,6 +10,15 @@ + + + + + + + + + diff --git a/tests/SpecialTest.php b/tests/SpecialTest.php index f022d87..2930e5a 100644 --- a/tests/SpecialTest.php +++ b/tests/SpecialTest.php @@ -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',