Skip to content

Commit c96abc5

Browse files
DanielBaduraDanielBadura
committed
Merge remote-tracking branch 'origin/4.0.x' into 3.13.x-merge-up-into-4.0.x
2 parents 29f6737 + 292b76a commit c96abc5

247 files changed

Lines changed: 6499 additions & 7834 deletions

File tree

Some content is hidden

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

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ phpstan-baseline: vendor
2626

2727
.PHONY: psalm
2828
psalm: vendor ## run psalm static code analyser
29-
vendor/bin/psalm
29+
php -d memory_limit=312M vendor/bin/psalm
3030

3131
.PHONY: psalm-baseline
3232
psalm-baseline: vendor ## run psalm static code analyser

‎UPGRADE-2.0.md‎

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

‎UPGRADE-3.0.md‎

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

‎UPGRADE-4.0.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
The upgrade path is located in our docs. Please have a look at
2+
[here](https://patchlevel.github.io/event-sourcing-docs/4.0/UPGRADE-4.0/).

‎baseline.xml‎

Lines changed: 36 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,14 @@
3333
<code><![CDATA[setPrimaryKey]]></code>
3434
</DeprecatedMethod>
3535
</file>
36+
<file src="src/DecisionModel/DecisionModel.php">
37+
<ImplementedReturnTypeMismatch>
38+
<code><![CDATA[T[TKey]]]></code>
39+
</ImplementedReturnTypeMismatch>
40+
<InvalidCast>
41+
<code><![CDATA[$offset]]></code>
42+
</InvalidCast>
43+
</file>
3644
<file src="src/EventBus/AttributeListenerProvider.php">
3745
<MixedMethodCall>
3846
<code><![CDATA[$method->getName()]]></code>
@@ -75,6 +83,19 @@
7583
<code><![CDATA[require_once $file]]></code>
7684
</UnresolvableInclude>
7785
</file>
86+
<file src="src/Projection/BasicProjection.php">
87+
<MixedReturnStatement>
88+
<code><![CDATA[$this->{$applyMethods[$event::class]}($state, $event)]]></code>
89+
</MixedReturnStatement>
90+
</file>
91+
<file src="src/Projection/CompositeProjection.php">
92+
<MissingClosureReturnType>
93+
<code><![CDATA[static function (Projection $projection) {]]></code>
94+
</MissingClosureReturnType>
95+
<MixedAssignment>
96+
<code><![CDATA[$state[$name]]]></code>
97+
</MixedAssignment>
98+
</file>
7899
<file src="src/QueryBus/ServiceHandlerProvider.php">
79100
<MixedArgument>
80101
<code><![CDATA[$service::{$handler->method}(...)]]></code>
@@ -85,15 +106,9 @@
85106
</MixedMethodCall>
86107
</file>
87108
<file src="src/Repository/DefaultRepository.php">
88-
<PossiblyNullArgument>
89-
<code><![CDATA[$streamName]]></code>
90-
</PossiblyNullArgument>
91109
<PropertyTypeCoercion>
92110
<code><![CDATA[new WeakMap()]]></code>
93111
</PropertyTypeCoercion>
94-
<UndefinedInterfaceMethod>
95-
<code><![CDATA[archive]]></code>
96-
</UndefinedInterfaceMethod>
97112
</file>
98113
<file src="src/Schema/DoctrineHelper.php">
99114
<InternalMethod>
@@ -107,16 +122,16 @@
107122
<code><![CDATA[getName]]></code>
108123
</InternalMethod>
109124
</file>
125+
<file src="src/Serializer/AttributeEventTagExtractor.php">
126+
<RiskyTruthyFalsyComparison>
127+
<code><![CDATA[$attribute->hash]]></code>
128+
<code><![CDATA[$attribute->prefix]]></code>
129+
</RiskyTruthyFalsyComparison>
130+
</file>
110131
<file src="src/Serializer/Normalizer/IdNormalizer.php">
111-
<DeprecatedClass>
112-
<code><![CDATA[ReflectionTypeUtil::classStringInstanceOf(
113-
$reflectionType,
114-
AggregateRootId::class,
115-
)]]></code>
116-
</DeprecatedClass>
117-
<DeprecatedInterface>
118-
<code><![CDATA[IdNormalizer]]></code>
119-
</DeprecatedInterface>
132+
<PropertyTypeCoercion>
133+
<code><![CDATA[$type->getClassName()]]></code>
134+
</PropertyTypeCoercion>
120135
</file>
121136
<file src="src/Serializer/Upcast/Upcast.php">
122137
<MixedAssignment>
@@ -146,36 +161,23 @@
146161
<code><![CDATA[$streamName]]></code>
147162
</PropertyTypeCoercion>
148163
</file>
149-
<file src="src/Store/DoctrineDbalStore.php">
164+
<file src="src/Store/StreamDoctrineDbalStore.php">
150165
<DeprecatedMethod>
151166
<code><![CDATA[setPrimaryKey]]></code>
152167
</DeprecatedMethod>
153168
</file>
154-
<file src="src/Store/DoctrineDbalStoreStream.php">
169+
<file src="src/Store/StreamDoctrineDbalStoreStream.php">
155170
<ArgumentTypeCoercion>
156171
<code><![CDATA[(int)$data['playhead']]]></code>
157172
</ArgumentTypeCoercion>
158-
<MixedArgument>
159-
<code><![CDATA[$dateTimeType->convertToPHPValue($data['recorded_on'], $platform)]]></code>
160-
</MixedArgument>
161173
</file>
162-
<file src="src/Store/StreamDoctrineDbalStore.php">
163-
<DeprecatedMethod>
164-
<code><![CDATA[setPrimaryKey]]></code>
165-
</DeprecatedMethod>
166-
</file>
167-
<file src="src/Store/StreamDoctrineDbalStoreStream.php">
174+
<file src="src/Store/TaggableDoctrineDbalStoreStream.php">
168175
<ArgumentTypeCoercion>
169176
<code><![CDATA[(int)$data['playhead']]]></code>
170177
</ArgumentTypeCoercion>
171-
</file>
172-
<file src="src/Subscription/Engine/DefaultSubscriptionEngine.php">
173-
<DeprecatedInterface>
174-
<code><![CDATA[SubscriberAccessor|null]]></code>
175-
</DeprecatedInterface>
176-
<DeprecatedMethod>
177-
<code><![CDATA[realSubscriber]]></code>
178-
</DeprecatedMethod>
178+
<MixedArgument>
179+
<code><![CDATA[json_decode($data['tags'], true, 512, JSON_THROW_ON_ERROR)]]></code>
180+
</MixedArgument>
179181
</file>
180182
<file src="src/Subscription/Engine/GapResolverStoreMessageLoader.php">
181183
<InvalidReturnType>
@@ -214,10 +216,6 @@
214216
</PossiblyNullPropertyFetch>
215217
</file>
216218
<file src="src/Subscription/Subscriber/MetadataSubscriberAccessor.php">
217-
<DeprecatedInterface>
218-
<code><![CDATA[MetadataSubscriberAccessor]]></code>
219-
<code><![CDATA[MetadataSubscriberAccessor]]></code>
220-
</DeprecatedInterface>
221219
<MixedAssignment>
222220
<code><![CDATA[$arguments[]]]></code>
223221
</MixedAssignment>
@@ -232,17 +230,6 @@
232230
<code><![CDATA[Closure(Message, Throwable):void|null]]></code>
233231
</MixedReturnTypeCoercion>
234232
</file>
235-
<file src="src/Subscription/Subscriber/MetadataSubscriberAccessorRepository.php">
236-
<DeprecatedClass>
237-
<code><![CDATA[new AggregateIdArgumentResolver()]]></code>
238-
</DeprecatedClass>
239-
</file>
240-
<file src="src/Subscription/Subscriber/SubscriberAccessorRepository.php">
241-
<DeprecatedInterface>
242-
<code><![CDATA[SubscriberAccessor|null]]></code>
243-
<code><![CDATA[iterable<SubscriberAccessor>]]></code>
244-
</DeprecatedInterface>
245-
</file>
246233
<file src="src/Subscription/ThrowableToErrorContextTransformer.php">
247234
<MixedAssignment>
248235
<code><![CDATA[$value]]></code>

‎composer.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141
"infection/infection": "^0.29.12",
4242
"league/commonmark": "^2.6.1",
4343
"patchlevel/coding-standard": "^1.3.0",
44+
"patchlevel/event-sourcing-phpstan-extension": "dev-event-sourcing-4.0",
4445
"patchlevel/event-sourcing-psalm-plugin": "^3.1.0",
4546
"phpat/phpat": "^0.12.0",
4647
"phpbench/phpbench": "^1.4.1",

0 commit comments

Comments
 (0)