Skip to content

Commit b5e9783

Browse files
fschmttfschmtt
committed
Update dev deps
1 parent f23c21e commit b5e9783

File tree

73 files changed

+147
-216
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

73 files changed

+147
-216
lines changed

‎.github/workflows/php-analysis.yml

+2-5
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,7 @@ jobs:
1717
run: composer install --prefer-dist --no-progress
1818

1919
- name: Run phpstan
20-
run: vendor/bin/phpstan analyze src tests examples
21-
22-
- name: Run psalm
23-
run: vendor/bin/psalm src tests examples
20+
run: vendor/bin/phpstan analyze
2421

2522
- name: Run ecs
26-
run: vendor/bin/ecs check src tests examples
23+
run: vendor/bin/ecs check

‎.github/workflows/php-integration-legacy.yml

+1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ jobs:
1717
env:
1818
KEYCLOAK_VERSION: ${{ matrix.keycloak }}
1919
KEYCLOAK_BASE_URL: 'http://localhost:8080/auth'
20+
XDEBUG_MODE: coverage
2021

2122
services:
2223
keycloak:

‎.github/workflows/php-integration.yml

+1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ jobs:
1717
env:
1818
KEYCLOAK_VERSION: ${{ matrix.keycloak }}
1919
KEYCLOAK_BASE_URL: 'http://localhost:8080'
20+
XDEBUG_MODE: coverage
2021

2122
steps:
2223
- uses: actions/checkout@v2

‎.gitignore

+9-1
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,18 @@
11
/.idea/
22
/vendor/
3-
.phpunit.result.cache
3+
4+
# Composer
45
composer.lock
6+
7+
# PHPUnit
8+
/.phpunit.cache/
9+
.phpunit.result.cache
510
phpunit.cobertura.xml
611

712
# Devenv
813
.devenv*
914
devenv.local.nix
1015

16+
# Direnv
17+
/.direnv/
18+

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ docker compose run --rm php php examples/serverinfo.php
124124
```
125125

126126
### Composer scripts
127-
* `analyze`: Run phpstan and psalm analysis
127+
* `analyze`: Run phpstan analysis
128128
* `ecs`: Run Easy Coding Standard (ECS)
129129
* `ecs:fix`: Fix Easy Coding Standard (ECS) errors
130130
* `test`: Run unit and integration tests

‎composer.json

+3-4
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,11 @@
99
"lcobucci/jwt": "^4.1"
1010
},
1111
"require-dev": {
12-
"phpunit/phpunit": "^9.5",
1312
"phpmetrics/phpmetrics": "^2.7",
14-
"phpstan/phpstan": "^1.9",
15-
"vimeo/psalm": "^4.30",
13+
"phpstan/phpstan": "^1.10",
1614
"symplify/easy-coding-standard": "^11.1",
17-
"ramsey/uuid": "^4.6"
15+
"ramsey/uuid": "^4.7",
16+
"phpunit/phpunit": "^10"
1817
},
1918
"autoload": {
2019
"psr-4": {

‎devenv.nix

+6-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,12 @@
22

33
{
44
languages.php.enable = lib.mkDefault true;
5-
languages.php.package = lib.mkDefault pkgs.php81;
5+
languages.php.version = lib.mkDefault "8.1";
6+
languages.php.extensions = ["pcov"];
7+
languages.php.ini = ''
8+
memory_limit = 2G
9+
'';
610

711
env.KEYCLOAK_BASE_URL = lib.mkDefault "http://localhost:8080";
12+
env.XDEBUG_MODE = "coverage";
813
}

‎phpstan.neon

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,5 @@ parameters:
33
checkGenericClassInNonGenericObjectType: false
44
paths:
55
- src
6-
- tests
6+
- tests
7+
- examples

‎phpunit.xml

+6-13
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,21 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3-
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.5/phpunit.xsd"
4-
bootstrap="vendor/autoload.php"
5-
executionOrder="depends,defects"
6-
beStrictAboutOutputDuringTests="true"
7-
beStrictAboutTodoAnnotatedTests="true"
8-
verbose="true">
2+
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.2/phpunit.xsd" bootstrap="vendor/autoload.php" executionOrder="depends,defects" beStrictAboutOutputDuringTests="true" cacheDirectory=".phpunit.cache">
93
<coverage>
10-
<include>
11-
<directory suffix=".php">src</directory>
12-
</include>
13-
144
<report>
155
<cobertura outputFile="phpunit.cobertura.xml"/>
166
</report>
177
</coverage>
18-
198
<testsuites>
209
<testsuite name="unit">
2110
<directory suffix="Test.php">tests/Unit</directory>
2211
</testsuite>
23-
2412
<testsuite name="integration">
2513
<directory suffix="Test.php">tests/Integration</directory>
2614
</testsuite>
2715
</testsuites>
16+
<source>
17+
<include>
18+
<directory suffix=".php">src</directory>
19+
</include>
20+
</source>
2821
</phpunit>

‎psalm.xml

-18
This file was deleted.

‎src/Collection/AuthenticationExecutionExportCollection.php

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88

99
/**
1010
* @codeCoverageIgnore
11+
* @extends Collection<AuthenticationExecutionExport>
1112
*/
1213
class AuthenticationExecutionExportCollection extends Collection
1314
{

‎src/Collection/AuthenticationFlowCollection.php

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88

99
/**
1010
* @codeCoverageIgnore
11+
* @extends Collection<AuthenticationFlow>
1112
*/
1213
class AuthenticationFlowCollection extends Collection
1314
{

‎src/Collection/AuthenticatorConfigCollection.php

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88

99
/**
1010
* @codeCoverageIgnore
11+
* @extends Collection<AuthenticatorConfig>
1112
*/
1213
class AuthenticatorConfigCollection extends Collection
1314
{

‎src/Collection/ClientCollection.php

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88

99
/**
1010
* @codeCoverageIgnore
11+
* @extends Collection<Client>
1112
*/
1213
class ClientCollection extends Collection
1314
{

‎src/Collection/ClientPolicyCollection.php

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88

99
/**
1010
* @codeCoverageIgnore
11+
* @extends Collection<ClientPolicy>
1112
*/
1213
class ClientPolicyCollection extends Collection
1314
{

‎src/Collection/ClientPolicyExecutorCollection.php

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88

99
/**
1010
* @codeCoverageIgnore
11+
* @extends Collection<ClientPolicyExecutor>
1112
*/
1213
class ClientPolicyExecutorCollection extends Collection
1314
{

‎src/Collection/ClientProfileCollection.php

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88

99
/**
1010
* @codeCoverageIgnore
11+
* @extends Collection<ClientProfile>
1112
*/
1213
class ClientProfileCollection extends Collection
1314
{

‎src/Collection/ClientScopeCollection.php

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88

99
/**
1010
* @codeCoverageIgnore
11+
* @extends Collection<ClientScope>
1112
*/
1213
class ClientScopeCollection extends Collection
1314
{

‎src/Collection/Collection.php

+5-1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,10 @@
1313
use ReflectionClass;
1414
use Traversable;
1515

16+
/**
17+
* @template T of Representation
18+
* @implements IteratorAggregate<T>
19+
*/
1620
abstract class Collection implements Countable, IteratorAggregate, JsonSerializable
1721
{
1822
/**
@@ -21,7 +25,7 @@ abstract class Collection implements Countable, IteratorAggregate, JsonSerializa
2125
protected array $items = [];
2226

2327
/**
24-
* @param array<array-key, Representation> $items
28+
* @param iterable<T> $items
2529
*/
2630
public function __construct(iterable $items = [])
2731
{

‎src/Collection/CredentialCollection.php

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88

99
/**
1010
* @codeCoverageIgnore
11+
* @extends Collection<Credential>
1112
*/
1213
class CredentialCollection extends Collection
1314
{

‎src/Collection/FederatedIdentityCollection.php

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88

99
/**
1010
* @codeCoverageIgnore
11+
* @extends Collection<FederatedIdentity>
1112
*/
1213
class FederatedIdentityCollection extends Collection
1314
{

‎src/Collection/GroupCollection.php

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88

99
/**
1010
* @codeCoverageIgnore
11+
* @extends Collection<Group>
1112
*/
1213
class GroupCollection extends Collection
1314
{

‎src/Collection/IdentityProviderCollection.php

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88

99
/**
1010
* @codeCoverageIgnore
11+
* @extends Collection<IdentityProvider>
1112
*/
1213
class IdentityProviderCollection extends Collection
1314
{

‎src/Collection/IdentityProviderMapperCollection.php

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88

99
/**
1010
* @codeCoverageIgnore
11+
* @extends Collection<IdentityProviderMapper>
1112
*/
1213
class IdentityProviderMapperCollection extends Collection
1314
{

‎src/Collection/PasswordPolicyTypeCollection.php

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88

99
/**
1010
* @codeCoverageIgnore
11+
* @extends Collection<PasswordPolicyType>
1112
*/
1213
class PasswordPolicyTypeCollection extends Collection
1314
{

‎src/Collection/PolicyCollection.php

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88

99
/**
1010
* @codeCoverageIgnore
11+
* @extends Collection<Policy>
1112
*/
1213
class PolicyCollection extends Collection
1314
{

‎src/Collection/ProtocolMapperCollection.php

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88

99
/**
1010
* @codeCoverageIgnore
11+
* @extends Collection<ProtocolMapper>
1112
*/
1213
class ProtocolMapperCollection extends Collection
1314
{

‎src/Collection/RealmCollection.php

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88

99
/**
1010
* @codeCoverageIgnore
11+
* @extends Collection<Realm>
1112
*/
1213
class RealmCollection extends Collection
1314
{

‎src/Collection/RequiredActionProviderCollection.php

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88

99
/**
1010
* @codeCoverageIgnore
11+
* @extends Collection<RequiredActionProvider>
1112
*/
1213
class RequiredActionProviderCollection extends Collection
1314
{

‎src/Collection/ResourceCollection.php

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88

99
/**
1010
* @codeCoverageIgnore
11+
* @extends Collection<Resource>
1112
*/
1213
class ResourceCollection extends Collection
1314
{

‎src/Collection/RoleCollection.php

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88

99
/**
1010
* @codeCoverageIgnore
11+
* @extends Collection<Role>
1112
*/
1213
class RoleCollection extends Collection
1314
{

‎src/Collection/ScopeCollection.php

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88

99
/**
1010
* @codeCoverageIgnore
11+
* @extends Collection<Scope>
1112
*/
1213
class ScopeCollection extends Collection
1314
{

‎src/Collection/ScopeMappingCollection.php

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88

99
/**
1010
* @codeCoverageIgnore
11+
* @extends Collection<ScopeMapping>
1112
*/
1213
class ScopeMappingCollection extends Collection
1314
{

‎src/Collection/UserCollection.php

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88

99
/**
1010
* @codeCoverageIgnore
11+
* @extends Collection<User>
1112
*/
1213
class UserCollection extends Collection
1314
{

‎src/Collection/UserConsentCollection.php

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88

99
/**
1010
* @codeCoverageIgnore
11+
* @extends Collection<UserConsent>
1112
*/
1213
class UserConsentCollection extends Collection
1314
{

‎src/Collection/UserFederationMapperCollection.php

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88

99
/**
1010
* @codeCoverageIgnore
11+
* @extends Collection<UserFederationMapper>
1112
*/
1213
class UserFederationMapperCollection extends Collection
1314
{

‎src/Collection/UserFederationProviderCollection.php

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88

99
/**
1010
* @codeCoverageIgnore
11+
* @extends Collection<UserFederationProvider>
1112
*/
1213
class UserFederationProviderCollection extends Collection
1314
{

‎src/Serializer/CollectionSerializer.php

-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ public function serialize(string $type, mixed $value): Collection
3333
$representations[] = $representationClass::from($representation);
3434
}
3535

36-
/** @psalm-suppress UndefinedClass */
3736
return new $type($representations);
3837
}
3938
}

0 commit comments

Comments
 (0)