Merge remote-tracking branch 'upstream/2.7'

dunglas · dunglas · commit 4ce99574f2ad · 2022-09-14T16:30:38.000+02:00
# Conflicts:
#	src/Metadata/Resource/Factory/NotExposedOperationResourceMetadataCollectionFactory.php
#	src/Symfony/EventListener/ReadListener.php
diff --git a/src/Symfony/EventListener/ReadListener.php b/src/Symfony/EventListener/ReadListener.php
@@ -60,7 +60,7 @@ public function onKernelRequest(RequestEvent $event): void
             return;
         }
 
-        if (!$operation || !($operation->canRead() ?? true) || !$attributes['receive'] || (!$operation->getUriVariables() && !$request->isMethodSafe())) {
+        if (!$attributes['receive'] || !$operation || !($operation->canRead() ?? true) || (!$operation->getUriVariables() && !$request->isMethodSafe())) {
             return;
         }
 

Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ public function onKernelRequest(RequestEvent $event): void`
`60`	`60`	`return;`
`61`	`61`	`}`
`62`	`62`
`63`		`- if (!$operation \|\| !($operation->canRead() ?? true) \|\| !$attributes['receive'] \|\| (!$operation->getUriVariables() && !$request->isMethodSafe())) {`
	`63`	`+ if (!$attributes['receive'] \|\| !$operation \|\| !($operation->canRead() ?? true) \|\| (!$operation->getUriVariables() && !$request->isMethodSafe())) {`
`64`	`64`	`return;`
`65`	`65`	`}`
`66`	`66`