Skip to content

Commit 9b681da

Browse files
OskarStarkOskarStark
authored
Require phpstan/phpstan 2 (#17)
* Use PHPStan 2 * - * - * - * Allow `thecodingmachine/safe` 3 (#18) * - * - * - * - * -
1 parent 0914646 commit 9b681da

File tree

5 files changed

+74
-41
lines changed

5 files changed

+74
-41
lines changed

‎composer.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"symfony/cache": "^7.0",
2626
"symfony/cache-contracts": "^3.5",
2727
"symfony/http-client": "^6.0 || ^7.0",
28-
"thecodingmachine/safe": "^2.0",
28+
"thecodingmachine/safe": "^2.0 || ^3.0",
2929
"webmozart/assert": "^1.11"
3030
},
3131
"require-dev": {
@@ -34,10 +34,10 @@
3434
"ergebnis/php-cs-fixer-config": "^6.28",
3535
"ergebnis/test-util": "^1.5",
3636
"phpstan/extension-installer": "^1.0",
37-
"phpstan/phpstan": "^1.0",
38-
"phpstan/phpstan-webmozart-assert": "^1.0",
37+
"phpstan/phpstan": "^2.0",
38+
"phpstan/phpstan-webmozart-assert": "^2.0",
3939
"phpunit/phpunit": "^9.0",
40-
"thecodingmachine/phpstan-safe-rule": "^1.0"
40+
"thecodingmachine/phpstan-safe-rule": "^1.4"
4141
},
4242
"config": {
4343
"sort-packages": true,

‎phpstan-baseline.neon

+63-35
Original file line numberDiff line numberDiff line change
@@ -1,82 +1,110 @@
11
parameters:
22
ignoreErrors:
33
-
4-
message: "#^Method Storyblok\\\\Api\\\\Bridge\\\\Faker\\\\Provider\\\\StoryblokProvider\\:\\:assetResponse\\(\\) should return array\\{asset\\: array\\{filename\\: string, created_at\\: string, updated_at\\: string, expire_at\\: string\\|null, content_length\\: int, signed_url\\: string, content_type\\: string\\}\\} but returns array\\.$#"
4+
message: '#^Property Storyblok\\Api\\Domain\\Value\\Datasource\:\:\$dimensions \(list\<Storyblok\\Api\\Domain\\Value\\DatasourceDimension\>\) does not accept array\<Storyblok\\Api\\Domain\\Value\\DatasourceDimension\>\.$#'
5+
identifier: assign.propertyType
56
count: 1
6-
path: src/Bridge/Faker/Provider/StoryblokProvider.php
7+
path: src/Domain/Value/Datasource.php
78

89
-
9-
message: "#^Method Storyblok\\\\Api\\\\Bridge\\\\Faker\\\\Provider\\\\StoryblokProvider\\:\\:datasourceDimensionResponse\\(\\) should return array\\{id\\: int, name\\: string, entry_value\\: string, datasource_id\\: int, created_at\\: string, updated_at\\: string\\} but returns array\\.$#"
10+
message: '#^Property Storyblok\\Api\\Domain\\Value\\Field\\FieldCollection\:\:\$items \(list\<Storyblok\\Api\\Domain\\Value\\Field\\Field\>\) does not accept array\<int\<0, max\>, Storyblok\\Api\\Domain\\Value\\Field\\Field\>\.$#'
11+
identifier: assign.propertyType
1012
count: 1
11-
path: src/Bridge/Faker/Provider/StoryblokProvider.php
13+
path: src/Domain/Value/Field/FieldCollection.php
1214

1315
-
14-
message: "#^Method Storyblok\\\\Api\\\\Bridge\\\\Faker\\\\Provider\\\\StoryblokProvider\\:\\:datasourceEntriesResponse\\(\\) should return array\\{datasource_entries\\: array\\<int, array\\{id\\: int, name\\: string, value\\: string, dimension_value\\: string\\|null\\}\\>\\} but returns array\\.$#"
16+
message: '#^PHPDoc tag @return contains unresolvable type\.$#'
17+
identifier: return.unresolvableType
1518
count: 1
16-
path: src/Bridge/Faker/Provider/StoryblokProvider.php
19+
path: src/Domain/Value/Filter/FilterCollection.php
1720

1821
-
19-
message: "#^Method Storyblok\\\\Api\\\\Bridge\\\\Faker\\\\Provider\\\\StoryblokProvider\\:\\:datasourceEntryResponse\\(\\) should return array\\{id\\: int, name\\: string, value\\: string, dimension_value\\: string\\|null\\} but returns array\\.$#"
22+
message: '#^Property Storyblok\\Api\\Domain\\Value\\Filter\\FilterCollection\:\:\$items \(list\<Storyblok\\Api\\Domain\\Value\\Filter\\Filters\\Filter\>\) does not accept array\<int\<0, max\>, Storyblok\\Api\\Domain\\Value\\Filter\\Filters\\Filter\>\.$#'
23+
identifier: assign.propertyType
2024
count: 1
21-
path: src/Bridge/Faker/Provider/StoryblokProvider.php
25+
path: src/Domain/Value/Filter/FilterCollection.php
2226

2327
-
24-
message: "#^Method Storyblok\\\\Api\\\\Bridge\\\\Faker\\\\Provider\\\\StoryblokProvider\\:\\:datasourceResponse\\(\\) should return array\\{id\\: int, name\\: string, slug\\: string, dimensions\\: array\\<int, array\\{id\\: int, name\\: string, entry_value\\: string, datasource_id\\: int, created_at\\: string, updated_at\\: string\\}\\>\\} but returns array\\.$#"
28+
message: '#^Property Storyblok\\Api\\Domain\\Value\\IdCollection\:\:\$items \(list\<Storyblok\\Api\\Domain\\Value\\Id\>\) does not accept array\<int\<0, max\>, Storyblok\\Api\\Domain\\Value\\Id\>\.$#'
29+
identifier: assign.propertyType
2530
count: 1
26-
path: src/Bridge/Faker/Provider/StoryblokProvider.php
31+
path: src/Domain/Value/IdCollection.php
2732

2833
-
29-
message: "#^Method Storyblok\\\\Api\\\\Bridge\\\\Faker\\\\Provider\\\\StoryblokProvider\\:\\:datasourcesResponse\\(\\) should return array\\{datasources\\: array\\<int, array\\<string, mixed\\>\\>\\} but returns array\\.$#"
34+
message: '#^Property Storyblok\\Api\\Domain\\Value\\Link\:\:\$alternates \(list\<Storyblok\\Api\\Domain\\Value\\LinkAlternate\>\) does not accept array\<Storyblok\\Api\\Domain\\Value\\LinkAlternate\>\.$#'
35+
identifier: assign.propertyType
3036
count: 1
31-
path: src/Bridge/Faker/Provider/StoryblokProvider.php
37+
path: src/Domain/Value/Link.php
3238

3339
-
34-
message: "#^Method Storyblok\\\\Api\\\\Bridge\\\\Faker\\\\Provider\\\\StoryblokProvider\\:\\:linkAlternateResponse\\(\\) should return array\\{lang\\: string, name\\: string, path\\: string, published\\: bool, translated_slug\\: string\\} but returns array\\.$#"
40+
message: '#^Property Storyblok\\Api\\Domain\\Value\\Resolver\\RelationCollection\:\:\$items \(list\<Storyblok\\Api\\Domain\\Value\\Resolver\\Relation\>\) does not accept array\<int\<0, max\>, Storyblok\\Api\\Domain\\Value\\Resolver\\Relation\>\.$#'
41+
identifier: assign.propertyType
3542
count: 1
36-
path: src/Bridge/Faker/Provider/StoryblokProvider.php
43+
path: src/Domain/Value/Resolver/RelationCollection.php
3744

3845
-
39-
message: "#^Method Storyblok\\\\Api\\\\Bridge\\\\Faker\\\\Provider\\\\StoryblokProvider\\:\\:linkResponse\\(\\) should return array\\{uuid\\: string, id\\: int, parent_id\\: int\\|null, name\\: string, slug\\: string, path\\: string, real_path\\: string, is_folder\\: bool, \\.\\.\\.\\} but returns array\\.$#"
46+
message: '#^Property Storyblok\\Api\\Domain\\Value\\Tag\\TagCollection\:\:\$items \(list\<Storyblok\\Api\\Domain\\Value\\Tag\\Tag\>\) does not accept array\<int\<0, max\>, Storyblok\\Api\\Domain\\Value\\Tag\\Tag\>\.$#'
47+
identifier: assign.propertyType
4048
count: 1
41-
path: src/Bridge/Faker/Provider/StoryblokProvider.php
49+
path: src/Domain/Value/Tag/TagCollection.php
4250

4351
-
44-
message: "#^Method Storyblok\\\\Api\\\\Bridge\\\\Faker\\\\Provider\\\\StoryblokProvider\\:\\:linksResponse\\(\\) should return array\\{links\\: array\\<int, array\\<string, mixed\\>\\>\\} but returns array\\.$#"
52+
message: '#^Method Storyblok\\Api\\Request\\StoriesRequest\:\:toArray\(\) should return array\{language\: string, page\: int, per_page\: int, sort_by\?\: string, filter_query\?\: list\<mixed\>, with_tag\?\: string, excluding_fields\?\: string, excluding_ids\?\: string, \.\.\.\} but returns array\{language\: string, page\: int, per_page\: int, sort_by\?\: string, filter_query\?\: array, with_tag\?\: string, excluding_fields\?\: string, excluding_ids\?\: string, \.\.\.\}\.$#'
53+
identifier: return.type
4554
count: 1
46-
path: src/Bridge/Faker/Provider/StoryblokProvider.php
55+
path: src/Request/StoriesRequest.php
4756

4857
-
49-
message: "#^Method Storyblok\\\\Api\\\\Bridge\\\\Faker\\\\Provider\\\\StoryblokProvider\\:\\:spaceResponse\\(\\) should return array\\{id\\: int, name\\: string, domain\\: string, version\\: int, language_codes\\: array\\<int, string\\>\\} but returns array\\.$#"
58+
message: '#^Property Storyblok\\Api\\Response\\DatasourceEntriesResponse\:\:\$datasourceEntries \(list\<Storyblok\\Api\\Domain\\Value\\DatasourceEntry\>\) does not accept array\<Storyblok\\Api\\Domain\\Value\\DatasourceEntry\>\.$#'
59+
identifier: assign.propertyType
5060
count: 1
51-
path: src/Bridge/Faker/Provider/StoryblokProvider.php
61+
path: src/Response/DatasourceEntriesResponse.php
5262

5363
-
54-
message: "#^Method Storyblok\\\\Api\\\\Bridge\\\\Faker\\\\Provider\\\\StoryblokProvider\\:\\:storiesResponse\\(\\) should return array\\{cv\\: int, stories\\: array\\<int, array\\<string, mixed\\>\\>, links\\: array\\<string\\>, rels\\: array\\<string\\>\\} but returns array\\.$#"
64+
message: '#^Property Storyblok\\Api\\Response\\DatasourcesResponse\:\:\$datasources \(list\<Storyblok\\Api\\Domain\\Value\\Datasource\>\) does not accept array\<Storyblok\\Api\\Domain\\Value\\Datasource\>\.$#'
65+
identifier: assign.propertyType
5566
count: 1
56-
path: src/Bridge/Faker/Provider/StoryblokProvider.php
67+
path: src/Response/DatasourcesResponse.php
5768

5869
-
59-
message: "#^Method Storyblok\\\\Api\\\\Bridge\\\\Faker\\\\Provider\\\\StoryblokProvider\\:\\:storyResponse\\(\\) should return array\\{cv\\: int, story\\: array\\<string, mixed\\>, links\\: array\\<string\\>, rels\\: array\\<string\\>\\} but returns array\\.$#"
70+
message: '#^Property Storyblok\\Api\\Response\\TagsResponse\:\:\$tags \(list\<Storyblok\\Api\\Domain\\Value\\Tag\>\) does not accept array\<Storyblok\\Api\\Domain\\Value\\Tag\>\.$#'
71+
identifier: assign.propertyType
6072
count: 1
61-
path: src/Bridge/Faker/Provider/StoryblokProvider.php
73+
path: src/Response/TagsResponse.php
6274

6375
-
64-
message: "#^Method Storyblok\\\\Api\\\\Bridge\\\\Faker\\\\Provider\\\\StoryblokProvider\\:\\:tagsResponse\\(\\) should return array\\{tags\\: array\\<int, array\\{name\\: string, taggings_count\\: int\\}\\>\\} but returns array\\.$#"
76+
message: '#^Cannot call method format\(\) on DateTimeImmutable\|null\.$#'
77+
identifier: method.nonObject
6578
count: 1
66-
path: src/Bridge/Faker/Provider/StoryblokProvider.php
79+
path: tests/Unit/Domain/Value/AssetTest.php
6780

6881
-
69-
message: "#^Method Storyblok\\\\Api\\\\Domain\\\\Value\\\\Filter\\\\FilterCollection\\:\\:toArray\\(\\) return type has no value type specified in iterable type array\\.$#"
70-
count: 1
71-
path: src/Domain/Value/Filter/FilterCollection.php
82+
message: '#^Call to static method PHPUnit\\Framework\\Assert\:\:assertEmpty\(\) with Storyblok\\Api\\Domain\\Value\\Field\\FieldCollection will always evaluate to false\.$#'
83+
identifier: staticMethod.impossibleType
84+
count: 2
85+
path: tests/Unit/Domain/Value/Field/FieldCollectionTest.php
7286

7387
-
74-
message: "#^PHPDoc tag @return contains unresolvable type\\.$#"
75-
count: 1
76-
path: src/Domain/Value/Filter/FilterCollection.php
88+
message: '#^Call to static method PHPUnit\\Framework\\Assert\:\:assertEmpty\(\) with Storyblok\\Api\\Domain\\Value\\Filter\\FilterCollection will always evaluate to false\.$#'
89+
identifier: staticMethod.impossibleType
90+
count: 2
91+
path: tests/Unit/Domain/Value/Filter/FilterCollectionTest.php
7792

7893
-
79-
message: "#^Cannot call method format\\(\\) on DateTimeImmutable\\|null\\.$#"
80-
count: 1
81-
path: tests/Unit/Domain/Value/AssetTest.php
94+
message: '#^Call to static method PHPUnit\\Framework\\Assert\:\:assertEmpty\(\) with Storyblok\\Api\\Domain\\Value\\IdCollection will always evaluate to false\.$#'
95+
identifier: staticMethod.impossibleType
96+
count: 2
97+
path: tests/Unit/Domain/Value/IdCollectionTest.php
98+
99+
-
100+
message: '#^Call to static method PHPUnit\\Framework\\Assert\:\:assertEmpty\(\) with Storyblok\\Api\\Domain\\Value\\Resolver\\RelationCollection will always evaluate to false\.$#'
101+
identifier: staticMethod.impossibleType
102+
count: 2
103+
path: tests/Unit/Domain/Value/Resolver/RelationCollectionTest.php
104+
105+
-
106+
message: '#^Call to static method PHPUnit\\Framework\\Assert\:\:assertEmpty\(\) with Storyblok\\Api\\Domain\\Value\\Tag\\TagCollection will always evaluate to false\.$#'
107+
identifier: staticMethod.impossibleType
108+
count: 2
109+
path: tests/Unit/Domain/Value/Tag/TagCollectionTest.php
82110

‎phpstan.neon.dist

+5
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,11 @@ includes:
22
- phpstan-baseline.neon
33

44
parameters:
5+
ignoreErrors:
6+
-
7+
identifier: missingType.iterableValue
8+
-
9+
identifier: staticMethod.alreadyNarrowedType
510
inferPrivatePropertyTypeFromConstructor: true
611
level: 8
712
paths:

‎src/Domain/Value/Link.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
public bool $isPublished;
3535

3636
/**
37-
* @var list<LinkAlternate>1
37+
* @var list<LinkAlternate>
3838
*/
3939
public array $alternates;
4040

‎src/Domain/Value/Total.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public function __construct(
2727
}
2828

2929
/**
30-
* @param array<string, list<string>> $headers
30+
* @param array<string, array<string>> $headers
3131
*/
3232
public static function fromHeaders(array $headers): self
3333
{

0 commit comments

Comments
 (0)