Skip to content

Commit 0e3aa57

Browse files
committed
Fix dependency checker
1 parent 311902b commit 0e3aa57

File tree

3 files changed

+38
-7
lines changed

3 files changed

+38
-7
lines changed

.github/workflows/php.yml

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ jobs:
7272
run: composer validate
7373

7474
- name: Install Composer dependencies
75-
run: composer install --no-progress --prefer-dist --optimize-autoloader --ignore-platform-req ext-krb5
75+
run: composer install --no-progress --prefer-dist --optimize-autoloader
7676

7777
- name: Check code for hard dependencies missing in composer.json
7878
run: composer-require-checker check --config-file=tools/composer-require-checker.json composer.json
@@ -135,13 +135,13 @@ jobs:
135135
restore-keys: ${{ runner.os }}-composer-
136136

137137
- name: Install Composer dependencies
138-
run: composer install --no-progress --prefer-dist --optimize-autoloader --ignore-platform-req ext-krb5
138+
run: composer install --no-progress --prefer-dist --optimize-autoloader
139139

140140
- name: Security check for locked dependencies
141141
run: composer audit
142142

143143
- name: Update Composer dependencies
144-
run: composer update --no-progress --prefer-dist --optimize-autoloader --ignore-platform-req ext-krb5
144+
run: composer update --no-progress --prefer-dist --optimize-autoloader
145145

146146
- name: Security check for updated dependencies
147147
run: composer audit
@@ -157,6 +157,9 @@ jobs:
157157
php-versions: ['8.0', '8.1', '8.2']
158158

159159
steps:
160+
- name: Install libkrb5-dev
161+
run: sudo apt-get install -y libkrb5-dev
162+
160163
- name: Setup PHP, with composer and extensions
161164
# https://github.com/shivammathur/setup-php
162165
uses: shivammathur/setup-php@v2
@@ -191,7 +194,7 @@ jobs:
191194
restore-keys: ${{ runner.os }}-composer-
192195

193196
- name: Install Composer dependencies
194-
run: composer install --no-progress --prefer-dist --optimize-autoloader --ignore-platform-req ext-krb5
197+
run: composer install --no-progress --prefer-dist --optimize-autoloader
195198

196199
- name: Run unit tests with coverage
197200
if: ${{ matrix.php-versions == '8.2' }}
@@ -253,7 +256,7 @@ jobs:
253256
restore-keys: ${{ runner.os }}-composer-
254257

255258
- name: Install Composer dependencies
256-
run: composer install --no-progress --prefer-dist --optimize-autoloader --ignore-platform-req ext-krb5
259+
run: composer install --no-progress --prefer-dist --optimize-autoloader
257260

258261
- name: Run unit tests
259262
run: vendor/bin/phpunit --no-coverage

composer.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,12 @@
3535
},
3636
"require": {
3737
"php": ">=7.4 || ^8.0",
38-
"ext-krb5": ">=1.1.4",
3938

4039
"simplesamlphp/composer-module-installer": "^1.3.4",
40+
"simplesamlphp/assert": "^0.8 || ^1.0",
4141
"simplesamlphp/simplesamlphp": "^2.0.0",
42-
"simplesamlphp/simplesamlphp-module-ldap": "^2.1.8"
42+
"simplesamlphp/simplesamlphp-module-ldap": "^2.1.8",
43+
"symfony/http-foundation": "^5.4 || ^6.0"
4344
},
4445
"require-dev": {
4546
"simplesamlphp/simplesamlphp-test-framework": "^1.5.5"

psalm-dev.xml

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
<?xml version="1.0"?>
2+
<psalm
3+
name="SimpleSAMLphp testsuite"
4+
useDocblockTypes="true"
5+
errorLevel="4"
6+
reportMixedIssues="false"
7+
hideExternalErrors="true"
8+
allowStringToStandInForClass="true"
9+
>
10+
<projectFiles>
11+
<directory name="tests" />
12+
13+
<!-- Ignore certain directories -->
14+
<ignoreFiles>
15+
<directory name="vendor" />
16+
</ignoreFiles>
17+
</projectFiles>
18+
19+
<issueHandlers>
20+
<!-- Ignore UnresolvableInclude on CLI-scripts -->
21+
<UnresolvableInclude>
22+
<errorLevel type="suppress">
23+
<file name="tests/bootstrap.php" />
24+
</errorLevel>
25+
</UnresolvableInclude>
26+
</issueHandlers>
27+
</psalm>

0 commit comments

Comments
 (0)