Skip to content

Commit 4d4cf34

Browse files
committed
Merge branch 'master' into 3.2-merge
# Conflicts: # .github/workflows/test.yml # src/command/composer.json # src/serializer/src/Contract/CacheableSupportsMethodInterface.php # src/validation/src/ValidationRuleParser.php
2 parents 4a94510 + bc5c738 commit 4d4cf34

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

.gitattributes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
/tests export-ignore
22
/.github export-ignore
3+
/types export-ignore

src/Listener/BootSwaggerListener.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ public function process(object $event): void
123123
$result = [];
124124
/** @var Middleware $annotation */
125125
foreach ($middlewareAnnotations as $annotation) {
126-
$result[] = $annotation->middleware;
126+
$result[] = $annotation->priorityMiddleware;
127127
}
128128

129129
return $result;

0 commit comments

Comments
 (0)