Skip to content

Commit 4d3d6a4

Browse files
tvdijentvdijen
authored
Merge branch 'master' into feature/xsd-types
2 parents 792d9c9 + ce6bf2d commit 4d3d6a4

File tree

3 files changed

+97
-74
lines changed

3 files changed

+97
-74
lines changed

‎.gitattributes‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@ codecov.yml export-ignore
88
phpcs.xml export-ignore
99
phpunit.xml export-ignore
1010
phpunit-interoperability.xml export-ignore
11-
psalm.xml export-ignore
12-
psalm-dev.xml export-ignore
11+
phpstan-baseline.neon export-ignore
12+
phpstan-baseline-dev.neon export-ignore
13+
phpstan.neon export-ignore
14+
phpstan-dev.neon export-ignore
1315
README-DEV.md export-ignore
1416
UPGRADING.md export-ignore

‎.github/workflows/php.yml‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
matrix:
2222
php-version: ['8.2', '8.3', '8.4']
2323

24-
uses: simplesamlphp/simplesamlphp-test-framework/.github/workflows/reusable_phplinter.yml@v1.10.2
24+
uses: simplesamlphp/simplesamlphp-test-framework/.github/workflows/reusable_phplinter.yml@v1.10.3
2525
with:
2626
php-version: ${{ matrix.php-version }}
2727

@@ -30,7 +30,7 @@ jobs:
3030
strategy:
3131
fail-fast: false
3232

33-
uses: simplesamlphp/simplesamlphp-test-framework/.github/workflows/reusable_linter.yml@v1.10.2
33+
uses: simplesamlphp/simplesamlphp-test-framework/.github/workflows/reusable_linter.yml@v1.10.3
3434
with:
3535
enable_eslinter: false
3636
enable_jsonlinter: true
@@ -94,7 +94,7 @@ jobs:
9494

9595
- name: Save coverage data
9696
if: ${{ matrix.php-versions == '8.4' }}
97-
uses: actions/upload-artifact@v4
97+
uses: actions/upload-artifact@v5
9898
with:
9999
name: coverage-data
100100
path: ${{ github.workspace }}/build
@@ -151,6 +151,7 @@ jobs:
151151

152152
quality:
153153
name: Quality control
154+
needs: [unit-tests-linux]
154155
runs-on: [ubuntu-latest]
155156

156157
steps:
@@ -205,7 +206,9 @@ jobs:
205206
206207
security:
207208
name: Security checks
209+
needs: [unit-tests-linux]
208210
runs-on: [ubuntu-latest]
211+
209212
steps:
210213
- name: Setup PHP, with composer and extensions
211214
# https://github.com/shivammathur/setup-php
@@ -251,7 +254,7 @@ jobs:
251254
steps:
252255
- uses: actions/checkout@v5
253256

254-
- uses: actions/download-artifact@v5
257+
- uses: actions/download-artifact@v6
255258
with:
256259
name: coverage-data
257260
path: ${{ github.workspace }}/build

‎phpstan-baseline.neon‎

Lines changed: 86 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,5 @@
11
parameters:
22
ignoreErrors:
3-
-
4-
message: '#^Call to an undefined method SimpleSAML\\SAML2\\XML\\samlp\\AbstractMessage\:\:addValidator\(\)\.$#'
5-
identifier: method.notFound
6-
count: 1
7-
path: src/Binding/HTTPArtifact.php
8-
9-
-
10-
message: '#^Call to an undefined method SimpleSAML\\SAML2\\XML\\samlp\\ArtifactResponse\:\:validate\(\)\.$#'
11-
identifier: method.notFound
12-
count: 1
13-
path: src/Binding/HTTPArtifact.php
14-
15-
-
16-
message: '#^Call to method addURLparameters\(\) on an unknown class SimpleSAML\\Utils\\HTTP\.$#'
17-
identifier: class.notFound
18-
count: 1
19-
path: src/Binding/HTTPArtifact.php
20-
21-
-
22-
message: '#^Call to method getString\(\) on an unknown class SimpleSAML\\Configuration\.$#'
23-
identifier: class.notFound
24-
count: 1
25-
path: src/Binding/HTTPArtifact.php
26-
273
-
284
message: '#^Call to static method addSign\(\) on an unknown class SimpleSAML\\Module\\saml\\Message\.$#'
295
identifier: class.notFound
@@ -57,74 +33,56 @@ parameters:
5733
-
5834
message: '#^Parameter \$key of method SimpleSAML\\SAML2\\Binding\\HTTPArtifact\:\:validateSignature\(\) has invalid type SimpleSAML\\XMLSecurity\\XMLSecurityKey\.$#'
5935
identifier: class.notFound
60-
count: 2
36+
count: 1
6137
path: src/Binding/HTTPArtifact.php
6238

6339
-
6440
message: '#^Parameter \$sp of method SimpleSAML\\SAML2\\Binding\\HTTPArtifact\:\:setSPMetadata\(\) has invalid type SimpleSAML\\Configuration\.$#'
6541
identifier: class.notFound
66-
count: 2
42+
count: 1
6743
path: src/Binding/HTTPArtifact.php
6844

6945
-
7046
message: '#^Property SimpleSAML\\SAML2\\Binding\\HTTPArtifact\:\:\$spMetadata has unknown class SimpleSAML\\Configuration as its type\.$#'
7147
identifier: class.notFound
72-
count: 2
48+
count: 1
7349
path: src/Binding/HTTPArtifact.php
7450

7551
-
76-
message: '#^Access to property \$key on an unknown class SimpleSAML\\XMLSecurity\\XMLSecurityKey\.$#'
52+
message: '#^Parameter \$configuration of method SimpleSAML\\SAML2\\Configuration\\SimpleSAMLConverter\:\:convertToIdentityProvider\(\) has invalid type SimpleSAML\\Configuration\.$#'
7753
identifier: class.notFound
7854
count: 1
79-
path: src/SOAPClient.php
80-
81-
-
82-
message: '#^Call to an undefined method SimpleSAML\\SAML2\\XML\\samlp\\AbstractMessage\:\:addValidator\(\)\.$#'
83-
identifier: method.notFound
84-
count: 1
85-
path: src/SOAPClient.php
55+
path: src/Configuration/SimpleSAMLConverter.php
8656

8757
-
88-
message: '#^Call to method getCertPath\(\) on an unknown class SimpleSAML\\Utils\\Config\.$#'
58+
message: '#^Parameter \$configuration of method SimpleSAML\\SAML2\\Configuration\\SimpleSAMLConverter\:\:convertToServiceProvider\(\) has invalid type SimpleSAML\\Configuration\.$#'
8959
identifier: class.notFound
9060
count: 1
9161
path: src/SOAPClient.php
9262

9363
-
94-
message: '#^Call to method getPublicKeys\(\) on an unknown class SimpleSAML\\Configuration\.$#'
64+
message: '#^Parameter \$configuration of method SimpleSAML\\SAML2\\Configuration\\SimpleSAMLConverter\:\:enrichForDecryptionProvider\(\) has invalid type SimpleSAML\\Configuration\.$#'
9565
identifier: class.notFound
9666
count: 1
9767
path: src/SOAPClient.php
9868

9969
-
100-
message: '#^Call to method getString\(\) on an unknown class SimpleSAML\\Configuration\.$#'
101-
identifier: class.notFound
102-
count: 3
103-
path: src/SOAPClient.php
104-
105-
-
106-
message: '#^Call to method getValue\(\) on an unknown class SimpleSAML\\Configuration\.$#'
107-
identifier: class.notFound
108-
count: 3
109-
path: src/SOAPClient.php
110-
111-
-
112-
message: '#^Call to method hasValue\(\) on an unknown class SimpleSAML\\Configuration\.$#'
70+
message: '#^Parameter \$configuration of method SimpleSAML\\SAML2\\Configuration\\SimpleSAMLConverter\:\:enrichForIdentityProvider\(\) has invalid type SimpleSAML\\Configuration\.$#'
11371
identifier: class.notFound
114-
count: 5
72+
count: 1
11573
path: src/SOAPClient.php
11674

11775
-
118-
message: '#^Call to method loadPrivateKey\(\) on an unknown class SimpleSAML\\Utils\\Crypto\.$#'
76+
message: '#^Parameter \$configuration of method SimpleSAML\\SAML2\\Configuration\\SimpleSAMLConverter\:\:enrichForServiceProvider\(\) has invalid type SimpleSAML\\Configuration\.$#'
11977
identifier: class.notFound
12078
count: 1
12179
path: src/SOAPClient.php
12280

12381
-
124-
message: '#^Call to method loadPublicKey\(\) on an unknown class SimpleSAML\\Utils\\Crypto\.$#'
82+
message: '#^Parameter \$configuration of method SimpleSAML\\SAML2\\Configuration\\SimpleSAMLConverter\:\:pluckConfiguration\(\) has invalid type SimpleSAML\\Configuration\.$#'
12583
identifier: class.notFound
12684
count: 1
127-
path: src/SOAPClient.php
85+
path: src/Configuration/SimpleSAMLConverter.php
12886

12987
-
13088
message: '#^Instantiated class SimpleSAML\\Utils\\Config not found\.$#'
@@ -141,19 +99,19 @@ parameters:
14199
-
142100
message: '#^Parameter \$dstMetadata of method SimpleSAML\\SAML2\\SOAPClient\:\:send\(\) has invalid type SimpleSAML\\Configuration\.$#'
143101
identifier: class.notFound
144-
count: 2
102+
count: 1
145103
path: src/SOAPClient.php
146104

147105
-
148106
message: '#^Parameter \$key of method SimpleSAML\\SAML2\\SOAPClient\:\:validateSSL\(\) has invalid type SimpleSAML\\XMLSecurity\\XMLSecurityKey\.$#'
149107
identifier: class.notFound
150-
count: 2
108+
count: 1
151109
path: src/SOAPClient.php
152110

153111
-
154112
message: '#^Parameter \$srcMetadata of method SimpleSAML\\SAML2\\SOAPClient\:\:send\(\) has invalid type SimpleSAML\\Configuration\.$#'
155113
identifier: class.notFound
156-
count: 2
114+
count: 1
157115
path: src/SOAPClient.php
158116

159117
-
@@ -169,10 +127,22 @@ parameters:
169127
path: src/XML/md/AbstractIndexedEndpointType.php
170128

171129
-
172-
message: '#^Unsafe usage of new static\(\)\.$#'
173-
identifier: new.static
130+
message: '#^Access to undefined constant static\(SimpleSAML\\SAML2\\XML\\md\\AbstractRoleDescriptor\)\:\:XSI_TYPE_NAME\.$#'
131+
identifier: classConstant.notFound
174132
count: 2
175-
path: src/XML/md/AbstractLocalizedName.php
133+
path: src/XML/md/AbstractRoleDescriptor.php
134+
135+
-
136+
message: '#^Access to undefined constant static\(SimpleSAML\\SAML2\\XML\\md\\AbstractRoleDescriptor\)\:\:XSI_TYPE_NAMESPACE\.$#'
137+
identifier: classConstant.notFound
138+
count: 2
139+
path: src/XML/md/AbstractRoleDescriptor.php
140+
141+
-
142+
message: '#^Access to undefined constant static\(SimpleSAML\\SAML2\\XML\\md\\AbstractRoleDescriptor\)\:\:XSI_TYPE_PREFIX\.$#'
143+
identifier: classConstant.notFound
144+
count: 2
145+
path: src/XML/md/AbstractRoleDescriptor.php
176146

177147
-
178148
message: '#^Call to an undefined static method SimpleSAML\\SAML2\\XML\\md\\AbstractSignedMdElement\:\:getXsiTypeNamespaceURI\(\)\.$#'
@@ -181,20 +151,68 @@ parameters:
181151
path: src/XML/md/AbstractSignedMdElement.php
182152

183153
-
184-
message: '#^Call to an undefined method SimpleSAML\\XML\\AbstractElement\:\:getList\(\)\.$#'
185-
identifier: method.notFound
186-
count: 1
187-
path: src/XML/md/ContactPerson.php
154+
message: '#^Access to undefined constant static\(SimpleSAML\\SAML2\\XML\\saml\\AbstractBaseID\)\:\:XSI_TYPE_NAME\.$#'
155+
identifier: classConstant.notFound
156+
count: 2
157+
path: src/XML/saml/AbstractBaseID.php
158+
159+
-
160+
message: '#^Access to undefined constant static\(SimpleSAML\\SAML2\\XML\\saml\\AbstractBaseID\)\:\:XSI_TYPE_NAMESPACE\.$#'
161+
identifier: classConstant.notFound
162+
count: 2
163+
path: src/SOAPClient.php
164+
165+
-
166+
message: '#^Access to undefined constant static\(SimpleSAML\\SAML2\\XML\\saml\\AbstractBaseID\)\:\:XSI_TYPE_PREFIX\.$#'
167+
identifier: classConstant.notFound
168+
count: 2
169+
path: src/SOAPClient.php
170+
171+
-
172+
message: '#^Access to undefined constant static\(SimpleSAML\\SAML2\\XML\\saml\\AbstractCondition\)\:\:XSI_TYPE_NAME\.$#'
173+
identifier: classConstant.notFound
174+
count: 2
175+
path: src/SOAPClient.php
188176

189177
-
190-
message: '#^Call to an undefined method SimpleSAML\\XML\\AbstractElement\:\:getList\(\)\.$#'
191-
identifier: method.notFound
178+
message: '#^Access to undefined constant static\(SimpleSAML\\SAML2\\XML\\saml\\AbstractCondition\)\:\:XSI_TYPE_NAMESPACE\.$#'
179+
identifier: classConstant.notFound
180+
count: 2
181+
path: src/XML/md/AbstractEndpointType.php
182+
183+
-
184+
message: '#^Access to undefined constant static\(SimpleSAML\\SAML2\\XML\\saml\\AbstractCondition\)\:\:XSI_TYPE_PREFIX\.$#'
185+
identifier: classConstant.notFound
186+
count: 2
187+
path: src/XML/md/AbstractIndexedEndpointType.php
188+
189+
-
190+
message: '#^Access to undefined constant static\(SimpleSAML\\SAML2\\XML\\saml\\AbstractStatement\)\:\:XSI_TYPE_NAME\.$#'
191+
identifier: classConstant.notFound
192+
count: 2
193+
path: src/XML/md/AbstractLocalizedName.php
194+
195+
-
196+
message: '#^Access to undefined constant static\(SimpleSAML\\SAML2\\XML\\saml\\AbstractStatement\)\:\:XSI_TYPE_NAMESPACE\.$#'
197+
identifier: classConstant.notFound
198+
count: 2
199+
path: src/XML/saml/AbstractStatement.php
200+
201+
-
202+
message: '#^Access to undefined constant static\(SimpleSAML\\SAML2\\XML\\saml\\AbstractStatement\)\:\:XSI_TYPE_PREFIX\.$#'
203+
identifier: classConstant.notFound
204+
count: 2
205+
path: src/XML/saml/AbstractStatement.php
206+
207+
-
208+
message: '#^Unsafe usage of new static\(\)\.$#'
209+
identifier: new.static
192210
count: 1
193211
path: src/XML/md/EntitiesDescriptor.php
194212

195213
-
196-
message: '#^Call to an undefined method SimpleSAML\\XML\\AbstractElement\:\:getList\(\)\.$#'
197-
identifier: method.notFound
214+
message: '#^Unsafe usage of new static\(\)\.$#'
215+
identifier: new.static
198216
count: 1
199217
path: src/XML/md/Organization.php
200218

0 commit comments

Comments
 (0)