Skip to content

Commit 0a3b8c4

Browse files
authored
Revert "Support aggregation of attributes from multiple databases"
1 parent a159dbd commit 0a3b8c4

25 files changed

+133
-2790
lines changed

.github/workflows/php.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ jobs:
217217
with:
218218
# Should be the lowest supported version
219219
php-version: '8.2'
220-
extensions: ctype, date, dom, fileinfo, filter, hash, intl, mbstring, openssl, pcre, pdo, posix, spl, xml, zip
220+
extensions: ctype, date, dom, fileinfo, filter, hash, intl, mbstring, openssl, pcre, pdo, posix, spl, xml
221221
tools: composer
222222
coverage: none
223223

@@ -237,7 +237,7 @@ jobs:
237237
restore-keys: ${{ runner.os }}-composer-
238238

239239
- name: Install Composer dependencies
240-
run: composer install --no-progress --prefer-dist --optimize-autoloader --ignore-platform-req=ext-posix
240+
run: composer install --no-progress --prefer-dist --optimize-autoloader
241241

242242
- name: Security check for locked dependencies
243243
run: composer audit

composer.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,16 +30,15 @@
3030
},
3131
"autoload-dev": {
3232
"psr-4": {
33-
"SimpleSAML\\Test\\Utils\\": "vendor/simplesamlphp/simplesamlphp/tests/Utils",
34-
"SimpleSAML\\Test\\Module\\sqlauth\\Auth\\Source\\": "tests/src/Auth/Source/"
33+
"SimpleSAML\\Test\\Utils\\": "vendor/simplesamlphp/simplesamlphp/tests/Utils"
3534
}
3635
},
3736
"require": {
3837
"php": "^8.2",
3938
"ext-pdo": "*",
4039

4140
"simplesamlphp/assert": "~1.9.1",
42-
"simplesamlphp/composer-module-installer": "~1.6.0",
41+
"simplesamlphp/composer-module-installer": "~1.5.0",
4342
"simplesamlphp/simplesamlphp": "^2.2"
4443
},
4544
"require-dev": {

docs/sql.md

Lines changed: 55 additions & 492 deletions
Large diffs are not rendered by default.

phpstan-baseline-dev.neon

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,25 @@
11
parameters:
22
ignoreErrors:
33
-
4-
message: '#^Property SimpleSAML\\Test\\Module\\sqlauth\\Auth\\Source\\SQL2MultipleAuthTest\:\:\$config type has no value type specified in iterable type array\.$#'
5-
identifier: missingType.iterableValue
6-
count: 1
7-
path: tests/src/Auth/Source/SQL2MultipleAuthTest.php
4+
message: '#^Parameter \#1 \$array of function asort expects array, string given\.$#'
5+
identifier: argument.type
6+
count: 4
7+
path: tests/src/Auth/Source/PasswordVerifyTest.php
88

99
-
10-
message: '#^Property SimpleSAML\\Test\\Module\\sqlauth\\Auth\\Source\\SQL2NonExistentDbTest\:\:\$config type has no value type specified in iterable type array\.$#'
11-
identifier: missingType.iterableValue
12-
count: 1
13-
path: tests/src/Auth/Source/SQL2NonExistentDbTest.php
10+
message: '#^Property SimpleSAML\\Test\\Module\\sqlauth\\Auth\\Source\\PasswordVerifyTest\:\:\$config \(array\<string, string\|null\>\) does not accept array\<string, list\<string\>\|string\|null\>\.$#'
11+
identifier: assign.propertyType
12+
count: 4
13+
path: tests/src/Auth/Source/PasswordVerifyTest.php
1414

1515
-
16-
message: '#^Property SimpleSAML\\Test\\Module\\sqlauth\\Auth\\Source\\SQL2SimpleTest\:\:\$config type has no value type specified in iterable type array\.$#'
17-
identifier: missingType.iterableValue
18-
count: 1
19-
path: tests/src/Auth/Source/SQL2SimpleTest.php
16+
message: '#^Parameter \#1 \$array of function asort expects array, mixed given\.$#'
17+
identifier: argument.type
18+
count: 4
19+
path: tests/src/Auth/Source/SQLTest.php
20+
21+
-
22+
message: '#^Property SimpleSAML\\Test\\Module\\sqlauth\\Auth\\Source\\SQLTest\:\:\$config \(array\<string, string\|null\>\) does not accept array\<string, list\<string\>\|string\|null\>\.$#'
23+
identifier: assign.propertyType
24+
count: 4
25+
path: tests/src/Auth/Source/SQLTest.php

src/Auth/Source/PasswordVerify1Compat.php

Lines changed: 0 additions & 75 deletions
This file was deleted.

src/Auth/Source/SQL1Compat.php

Lines changed: 0 additions & 69 deletions
This file was deleted.

0 commit comments

Comments
 (0)