Skip to content

Commit a89a5cb

Browse files
ondrejmirtesondrejmirtes
committed
Update Larastan
1 parent cd1be1b commit a89a5cb

File tree

2 files changed

+26
-21
lines changed

2 files changed

+26
-21
lines changed

‎.github/workflows/integration-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ jobs:
176176
script: |
177177
git clone https://github.com/nunomaduro/larastan.git e2e/integration/repo
178178
cd e2e/integration/repo
179-
git checkout eef0b420dcb18b3e82708daba61b6c5ed24708de
179+
git checkout 79527d5700a27946786a6b1e071041dddf9441e5
180180
composer install
181181
cp ../../../phpstan.phar vendor/phpstan/phpstan/phpstan.phar
182182
cp ../../../phpstan vendor/phpstan/phpstan/phpstan

‎e2e/integration/larastan-baseline.neon

Lines changed: 25 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -11,22 +11,22 @@ parameters:
1111
path: repo/src/Methods/BuilderHelper.php
1212

1313
-
14-
message: "#^Doing instanceof PHPStan\\\\Type\\\\TypeWithClassName is error\\-prone and deprecated\\. Use Type\\:\\:getObjectClassNames\\(\\) instead\\.$#"
14+
message: "#^Doing instanceof PHPStan\\\\Type\\\\TypeWithClassName is error\\-prone and deprecated\\. Use Type\\:\\:getObjectClassNames\\(\\) or Type\\:\\:getObjectClassReflections\\(\\) instead\\.$#"
1515
count: 2
1616
path: repo/src/Methods/BuilderHelper.php
1717

1818
-
19-
message: "#^Doing instanceof PHPStan\\\\Type\\\\TypeWithClassName is error\\-prone and deprecated\\. Use Type\\:\\:getObjectClassNames\\(\\) instead\\.$#"
19+
message: "#^Doing instanceof PHPStan\\\\Type\\\\TypeWithClassName is error\\-prone and deprecated\\. Use Type\\:\\:getObjectClassNames\\(\\) or Type\\:\\:getObjectClassReflections\\(\\) instead\\.$#"
2020
count: 1
2121
path: repo/src/Methods/EloquentBuilderForwardsCallsExtension.php
2222

2323
-
24-
message: "#^Doing instanceof PHPStan\\\\Type\\\\TypeWithClassName is error\\-prone and deprecated\\. Use Type\\:\\:getObjectClassNames\\(\\) instead\\.$#"
24+
message: "#^Doing instanceof PHPStan\\\\Type\\\\TypeWithClassName is error\\-prone and deprecated\\. Use Type\\:\\:getObjectClassNames\\(\\) or Type\\:\\:getObjectClassReflections\\(\\) instead\\.$#"
2525
count: 1
2626
path: repo/src/Methods/HigherOrderTapProxyExtension.php
2727

2828
-
29-
message: "#^Doing instanceof PHPStan\\\\Type\\\\TypeWithClassName is error\\-prone and deprecated\\. Use Type\\:\\:getObjectClassNames\\(\\) instead\\.$#"
29+
message: "#^Doing instanceof PHPStan\\\\Type\\\\TypeWithClassName is error\\-prone and deprecated\\. Use Type\\:\\:getObjectClassNames\\(\\) or Type\\:\\:getObjectClassReflections\\(\\) instead\\.$#"
3030
count: 1
3131
path: repo/src/Methods/RelationForwardsCallsExtension.php
3232

@@ -41,7 +41,7 @@ parameters:
4141
path: repo/src/Properties/ModelCastHelper.php
4242

4343
-
44-
message: "#^Doing instanceof PHPStan\\\\Type\\\\TypeWithClassName is error\\-prone and deprecated\\. Use Type\\:\\:getObjectClassNames\\(\\) instead\\.$#"
44+
message: "#^Doing instanceof PHPStan\\\\Type\\\\TypeWithClassName is error\\-prone and deprecated\\. Use Type\\:\\:getObjectClassNames\\(\\) or Type\\:\\:getObjectClassReflections\\(\\) instead\\.$#"
4545
count: 1
4646
path: repo/src/Properties/ModelCastHelper.php
4747

@@ -56,7 +56,7 @@ parameters:
5656
path: repo/src/Properties/SquashedMigrationHelper.php
5757

5858
-
59-
message: "#^Doing instanceof PHPStan\\\\Type\\\\TypeWithClassName is error\\-prone and deprecated\\. Use Type\\:\\:getObjectClassNames\\(\\) instead\\.$#"
59+
message: "#^Doing instanceof PHPStan\\\\Type\\\\TypeWithClassName is error\\-prone and deprecated\\. Use Type\\:\\:getObjectClassNames\\(\\) or Type\\:\\:getObjectClassReflections\\(\\) instead\\.$#"
6060
count: 1
6161
path: repo/src/ReturnTypes/BuilderModelFindExtension.php
6262

@@ -76,7 +76,7 @@ parameters:
7676
path: repo/src/ReturnTypes/CollectionGenericStaticMethodDynamicMethodReturnTypeExtension.php
7777

7878
-
79-
message: "#^Doing instanceof PHPStan\\\\Type\\\\TypeWithClassName is error\\-prone and deprecated\\. Use Type\\:\\:getObjectClassNames\\(\\) instead\\.$#"
79+
message: "#^Doing instanceof PHPStan\\\\Type\\\\TypeWithClassName is error\\-prone and deprecated\\. Use Type\\:\\:getObjectClassNames\\(\\) or Type\\:\\:getObjectClassReflections\\(\\) instead\\.$#"
8080
count: 1
8181
path: repo/src/ReturnTypes/CollectionGenericStaticMethodDynamicMethodReturnTypeExtension.php
8282

@@ -90,13 +90,18 @@ parameters:
9090
count: 1
9191
path: repo/src/ReturnTypes/CollectionGenericStaticMethodDynamicStaticMethodReturnTypeExtension.php
9292

93+
-
94+
message: "#^Doing instanceof PHPStan\\\\Type\\\\Generic\\\\GenericObjectType is error\\-prone and deprecated\\.$#"
95+
count: 1
96+
path: repo/src/ReturnTypes/CollectionWhereNotNullDynamicReturnTypeExtension.php
97+
9398
-
9499
message: "#^Doing instanceof PHPStan\\\\Type\\\\ObjectType is error\\-prone and deprecated\\. Use Type\\:\\:isObject\\(\\) or Type\\:\\:getObjectClassNames\\(\\) instead\\.$#"
95100
count: 1
96101
path: repo/src/ReturnTypes/EloquentBuilderExtension.php
97102

98103
-
99-
message: "#^Doing instanceof PHPStan\\\\Type\\\\TypeWithClassName is error\\-prone and deprecated\\. Use Type\\:\\:getObjectClassNames\\(\\) instead\\.$#"
104+
message: "#^Doing instanceof PHPStan\\\\Type\\\\TypeWithClassName is error\\-prone and deprecated\\. Use Type\\:\\:getObjectClassNames\\(\\) or Type\\:\\:getObjectClassReflections\\(\\) instead\\.$#"
100105
count: 1
101106
path: repo/src/ReturnTypes/EloquentBuilderExtension.php
102107

@@ -106,12 +111,12 @@ parameters:
106111
path: repo/src/ReturnTypes/HigherOrderTapProxyExtension.php
107112

108113
-
109-
message: "#^Doing instanceof PHPStan\\\\Type\\\\TypeWithClassName is error\\-prone and deprecated\\. Use Type\\:\\:getObjectClassNames\\(\\) instead\\.$#"
114+
message: "#^Doing instanceof PHPStan\\\\Type\\\\TypeWithClassName is error\\-prone and deprecated\\. Use Type\\:\\:getObjectClassNames\\(\\) or Type\\:\\:getObjectClassReflections\\(\\) instead\\.$#"
110115
count: 1
111116
path: repo/src/ReturnTypes/HigherOrderTapProxyExtension.php
112117

113118
-
114-
message: "#^Doing instanceof PHPStan\\\\Type\\\\TypeWithClassName is error\\-prone and deprecated\\. Use Type\\:\\:getObjectClassNames\\(\\) instead\\.$#"
119+
message: "#^Doing instanceof PHPStan\\\\Type\\\\TypeWithClassName is error\\-prone and deprecated\\. Use Type\\:\\:getObjectClassNames\\(\\) or Type\\:\\:getObjectClassReflections\\(\\) instead\\.$#"
115120
count: 1
116121
path: repo/src/ReturnTypes/ModelFindExtension.php
117122

@@ -121,17 +126,17 @@ parameters:
121126
path: repo/src/ReturnTypes/ModelFindExtension.php
122127

123128
-
124-
message: "#^Doing instanceof PHPStan\\\\Type\\\\TypeWithClassName is error\\-prone and deprecated\\. Use Type\\:\\:getObjectClassNames\\(\\) instead\\.$#"
129+
message: "#^Doing instanceof PHPStan\\\\Type\\\\TypeWithClassName is error\\-prone and deprecated\\. Use Type\\:\\:getObjectClassNames\\(\\) or Type\\:\\:getObjectClassReflections\\(\\) instead\\.$#"
125130
count: 1
126131
path: repo/src/ReturnTypes/NewModelQueryDynamicMethodReturnTypeExtension.php
127132

128133
-
129-
message: "#^Doing instanceof PHPStan\\\\Type\\\\TypeWithClassName is error\\-prone and deprecated\\. Use Type\\:\\:getObjectClassNames\\(\\) instead\\.$#"
134+
message: "#^Doing instanceof PHPStan\\\\Type\\\\TypeWithClassName is error\\-prone and deprecated\\. Use Type\\:\\:getObjectClassNames\\(\\) or Type\\:\\:getObjectClassReflections\\(\\) instead\\.$#"
130135
count: 1
131136
path: repo/src/ReturnTypes/RelationCollectionExtension.php
132137

133138
-
134-
message: "#^Doing instanceof PHPStan\\\\Type\\\\TypeWithClassName is error\\-prone and deprecated\\. Use Type\\:\\:getObjectClassNames\\(\\) instead\\.$#"
139+
message: "#^Doing instanceof PHPStan\\\\Type\\\\TypeWithClassName is error\\-prone and deprecated\\. Use Type\\:\\:getObjectClassNames\\(\\) or Type\\:\\:getObjectClassReflections\\(\\) instead\\.$#"
135140
count: 1
136141
path: repo/src/ReturnTypes/RelationFindExtension.php
137142

@@ -141,7 +146,7 @@ parameters:
141146
path: repo/src/Rules/ModelProperties/ModelPropertiesRuleHelper.php
142147

143148
-
144-
message: "#^Doing instanceof PHPStan\\\\Type\\\\TypeWithClassName is error\\-prone and deprecated\\. Use Type\\:\\:getObjectClassNames\\(\\) instead\\.$#"
149+
message: "#^Doing instanceof PHPStan\\\\Type\\\\TypeWithClassName is error\\-prone and deprecated\\. Use Type\\:\\:getObjectClassNames\\(\\) or Type\\:\\:getObjectClassReflections\\(\\) instead\\.$#"
145150
count: 1
146151
path: repo/src/Rules/ModelProperties/ModelPropertyStaticCallRule.php
147152

@@ -151,7 +156,7 @@ parameters:
151156
path: repo/src/Rules/ModelRuleHelper.php
152157

153158
-
154-
message: "#^Doing instanceof PHPStan\\\\Type\\\\TypeWithClassName is error\\-prone and deprecated\\. Use Type\\:\\:getObjectClassNames\\(\\) instead\\.$#"
159+
message: "#^Doing instanceof PHPStan\\\\Type\\\\TypeWithClassName is error\\-prone and deprecated\\. Use Type\\:\\:getObjectClassNames\\(\\) or Type\\:\\:getObjectClassReflections\\(\\) instead\\.$#"
155160
count: 1
156161
path: repo/src/Rules/ModelRuleHelper.php
157162

@@ -161,12 +166,12 @@ parameters:
161166
path: repo/src/Rules/NoUnnecessaryCollectionCallRule.php
162167

163168
-
164-
message: "#^Doing instanceof PHPStan\\\\Type\\\\TypeWithClassName is error\\-prone and deprecated\\. Use Type\\:\\:getObjectClassNames\\(\\) instead\\.$#"
169+
message: "#^Doing instanceof PHPStan\\\\Type\\\\TypeWithClassName is error\\-prone and deprecated\\. Use Type\\:\\:getObjectClassNames\\(\\) or Type\\:\\:getObjectClassReflections\\(\\) instead\\.$#"
165170
count: 1
166171
path: repo/src/Rules/OctaneCompatibilityRule.php
167172

168173
-
169-
message: "#^Doing instanceof PHPStan\\\\Type\\\\TypeWithClassName is error\\-prone and deprecated\\. Use Type\\:\\:getObjectClassNames\\(\\) instead\\.$#"
174+
message: "#^Doing instanceof PHPStan\\\\Type\\\\TypeWithClassName is error\\-prone and deprecated\\. Use Type\\:\\:getObjectClassNames\\(\\) or Type\\:\\:getObjectClassReflections\\(\\) instead\\.$#"
170175
count: 1
171176
path: repo/src/Support/CollectionHelper.php
172177

@@ -181,12 +186,12 @@ parameters:
181186
path: repo/src/Types/ModelProperty/GenericModelPropertyType.php
182187

183188
-
184-
message: "#^Doing instanceof PHPStan\\\\Type\\\\TypeWithClassName is error\\-prone and deprecated\\. Use Type\\:\\:getObjectClassNames\\(\\) instead\\.$#"
189+
message: "#^Doing instanceof PHPStan\\\\Type\\\\TypeWithClassName is error\\-prone and deprecated\\. Use Type\\:\\:getObjectClassNames\\(\\) or Type\\:\\:getObjectClassReflections\\(\\) instead\\.$#"
185190
count: 1
186191
path: repo/src/Types/ModelRelationsDynamicMethodReturnTypeExtension.php
187192

188193
-
189-
message: "#^Doing instanceof PHPStan\\\\Type\\\\TypeWithClassName is error\\-prone and deprecated\\. Use Type\\:\\:getObjectClassNames\\(\\) instead\\.$#"
194+
message: "#^Doing instanceof PHPStan\\\\Type\\\\TypeWithClassName is error\\-prone and deprecated\\. Use Type\\:\\:getObjectClassNames\\(\\) or Type\\:\\:getObjectClassReflections\\(\\) instead\\.$#"
190195
count: 1
191196
path: repo/src/Types/RelationDynamicMethodReturnTypeExtension.php
192197

@@ -196,7 +201,7 @@ parameters:
196201
path: repo/src/Types/RelationParserHelper.php
197202

198203
-
199-
message: "#^Doing instanceof PHPStan\\\\Type\\\\TypeWithClassName is error\\-prone and deprecated\\. Use Type\\:\\:getObjectClassNames\\(\\) instead\\.$#"
204+
message: "#^Doing instanceof PHPStan\\\\Type\\\\TypeWithClassName is error\\-prone and deprecated\\. Use Type\\:\\:getObjectClassNames\\(\\) or Type\\:\\:getObjectClassReflections\\(\\) instead\\.$#"
200205
count: 1
201206
path: repo/src/Types/RelationParserHelper.php
202207

0 commit comments

Comments
 (0)