Skip to content

Commit 7df5f97

Browse files
tvdijenthijskh
authored andcommitted
Update test-suite
1 parent d904bf2 commit 7df5f97

4 files changed

Lines changed: 36 additions & 20 deletions

File tree

.github/workflows/documentation.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
run: composer install --no-progress --prefer-dist --optimize-autoloader
4444

4545
- name: Lint markdown files
46-
uses: nosborn/github-action-markdown-cli@v3.1.0
46+
uses: nosborn/github-action-markdown-cli@v3.2.0
4747
with:
4848
files: .
4949
ignore_path: .markdownlintignore

.github/workflows/php.yml

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -37,14 +37,14 @@ jobs:
3737
git config --global core.autocrlf false
3838
git config --global core.eol lf
3939
40-
- uses: actions/checkout@v2
40+
- uses: actions/checkout@v3
4141

4242
- name: Get composer cache directory
4343
id: composer-cache
4444
run: echo "::set-output name=dir::$(composer config cache-files-dir)"
4545

4646
- name: Cache composer dependencies
47-
uses: actions/cache@v1
47+
uses: actions/cache@v3
4848
with:
4949
path: ${{ steps.composer-cache.outputs.dir }}
5050
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
@@ -91,14 +91,14 @@ jobs:
9191
- name: Setup problem matchers for PHP
9292
run: echo "::add-matcher::${{ runner.tool_cache }}/php.json"
9393

94-
- uses: actions/checkout@v2
94+
- uses: actions/checkout@v3
9595

9696
- name: Get composer cache directory
9797
id: composer-cache
9898
run: echo "::set-output name=dir::$(composer config cache-files-dir)"
9999

100100
- name: Cache composer dependencies
101-
uses: actions/cache@v1
101+
uses: actions/cache@v3
102102
with:
103103
path: ${{ steps.composer-cache.outputs.dir }}
104104
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
@@ -132,14 +132,14 @@ jobs:
132132
- name: Setup problem matchers for PHP
133133
run: echo "::add-matcher::${{ runner.tool_cache }}/php.json"
134134

135-
- uses: actions/checkout@v2
135+
- uses: actions/checkout@v3
136136

137137
- name: Get composer cache directory
138138
id: composer-cache
139139
run: echo "::set-output name=dir::$(composer config cache-files-dir)"
140140

141141
- name: Cache composer dependencies
142-
uses: actions/cache@v1
142+
uses: actions/cache@v3
143143
with:
144144
path: ${{ steps.composer-cache.outputs.dir }}
145145
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
@@ -170,14 +170,14 @@ jobs:
170170
- name: Setup problem matchers for PHP
171171
run: echo "::add-matcher::${{ runner.tool_cache }}/php.json"
172172

173-
- uses: actions/checkout@v2
173+
- uses: actions/checkout@v3
174174

175175
- name: Get composer cache directory
176176
id: composer-cache
177177
run: echo "::set-output name=dir::$(composer config cache-files-dir)"
178178

179179
- name: Cache composer dependencies
180-
uses: actions/cache@v1
180+
uses: actions/cache@v3
181181
with:
182182
path: ${{ steps.composer-cache.outputs.dir }}
183183
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
@@ -192,16 +192,20 @@ jobs:
192192
path: ${{ github.workspace }}/build
193193

194194
- name: Codecov
195-
uses: codecov/codecov-action@v1
195+
uses: codecov/codecov-action@v3
196196

197197
- name: PHP Code Sniffer
198198
continue-on-error: true
199199
run: php vendor/bin/phpcs
200200

201201
- name: Psalm
202202
continue-on-error: true
203-
run: php vendor/bin/psalm --show-info=true --shepherd
203+
run: php vendor/bin/psalm -c psalm.xml --show-info=true --shepherd --php-version=${{ steps.setup-php.outputs.php-version }}
204+
205+
- name: Psalm (test-suite)
206+
continue-on-error: true
207+
run: php vendor/bin/psalm -c psalm-dev.xml --show-info=true --shepherd --php-version=${{ steps.setup-php.outputs.php-version }}
204208

205209
- name: Psalter
206210
continue-on-error: true
207-
run: php vendor/bin/psalter --issues=UnnecessaryVarAnnotation --dry-run
211+
run: php vendor/bin/psalter --issues=UnnecessaryVarAnnotation --dry-run --php-version=${{ steps.setup-php.outputs.php-version }}

psalm-dev.xml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
<?xml version="1.0"?>
2+
<psalm
3+
name="SimpleSAMLphp Module stepupsfo"
4+
useDocblockTypes="true"
5+
errorLevel="5"
6+
reportMixedIssues="false"
7+
>
8+
<projectFiles>
9+
<directory name="tests" />
10+
</projectFiles>
11+
12+
<issueHandlers>
13+
<!-- Ignore UnresolvableInclude -->
14+
<UnresolvableInclude>
15+
<errorLevel type="suppress">
16+
<file name="tests/bootstrap.php" />
17+
</errorLevel>
18+
</UnresolvableInclude>
19+
</issueHandlers>
20+
</psalm>

psalm.xml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
>
88
<projectFiles>
99
<directory name="src" />
10-
<directory name="tests" />
1110
</projectFiles>
1211

1312
<issueHandlers>
@@ -27,12 +26,5 @@
2726
<MissingParamType errorLevel="info" />
2827
<UnusedClass errorLevel="info" />
2928
<PossiblyUnusedMethod errorLevel="info" />
30-
31-
<!-- Ignore UnresolvableInclude -->
32-
<UnresolvableInclude>
33-
<errorLevel type="suppress">
34-
<file name="tests/bootstrap.php" />
35-
</errorLevel>
36-
</UnresolvableInclude>
3729
</issueHandlers>
3830
</psalm>

0 commit comments

Comments
 (0)