From 623ccfd08d2dd08c22580dbcba46adab6a53896e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20M=C3=BCller?= Date: Wed, 28 May 2025 22:25:52 +0200 Subject: [PATCH 1/2] ACFIVE-49781 tell the service if psr or not --- src/Http/HttpKernel.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Http/HttpKernel.php b/src/Http/HttpKernel.php index 2963c24..d120623 100644 --- a/src/Http/HttpKernel.php +++ b/src/Http/HttpKernel.php @@ -122,10 +122,10 @@ public function run(HttpRequestInterface $request, $send = true, ?callable $psrI $this->getApplicationState()->commit(); } if ($send) { + if ($psrInterfaceInjectedPipeline !== null) { + $response = $psrInterfaceInjectedPipeline($this->getMasterFactory(), $response, $route->isPsrRoute()); + } if ($route->isPsrRoute()) { - if ($psrInterfaceInjectedPipeline !== null) { - $response = $psrInterfaceInjectedPipeline($this->getMasterFactory(), $response); - } $this->getMasterFactory()->createEmitter()->emit($response); } else { $response->send(); From a6cc9375889c6a6b4bfac0666e66e1fdd789a4ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20M=C3=BCller?= Date: Tue, 3 Jun 2025 15:54:27 +0200 Subject: [PATCH 2/2] ACFIVE-49781 renamed to injectedPipeline --- src/Http/HttpKernel.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Http/HttpKernel.php b/src/Http/HttpKernel.php index d120623..d749fd4 100644 --- a/src/Http/HttpKernel.php +++ b/src/Http/HttpKernel.php @@ -48,7 +48,7 @@ public function __construct(MasterFactory $masterFactory) * @author mnoerenberg * @inheritdoc */ - public function run(HttpRequestInterface $request, $send = true, ?callable $psrInterfaceInjectedPipeline = null) + public function run(HttpRequestInterface $request, $send = true, ?callable $injectedPipeline = null) { try { $this->bundles = $this->registerBundles($request); @@ -122,8 +122,8 @@ public function run(HttpRequestInterface $request, $send = true, ?callable $psrI $this->getApplicationState()->commit(); } if ($send) { - if ($psrInterfaceInjectedPipeline !== null) { - $response = $psrInterfaceInjectedPipeline($this->getMasterFactory(), $response, $route->isPsrRoute()); + if ($injectedPipeline !== null) { + $response = $injectedPipeline($this->getMasterFactory(), $response, $route->isPsrRoute()); } if ($route->isPsrRoute()) { $this->getMasterFactory()->createEmitter()->emit($response);