From d2142c4f48e088b4ae6b685508f8e87c55e4d498 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 30 Oct 2024 23:38:42 +0000 Subject: [PATCH 1/2] build(deps): bump composer from 2.8.1 to 2.8.2 Bumps composer from 2.8.1 to 2.8.2. --- updated-dependencies: - dependency-name: composer dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 13bebef66..7a63c8d27 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM caddy:2.8.4 AS caddy # development -FROM composer:2.8.1 AS composer +FROM composer:2.8.2 AS composer ARG APPLICATION_ENV=development ENV APPLICATION_ENV=${APPLICATION_ENV} From 74d5a3c10617e1b2bd6ee216a288c60f279fe576 Mon Sep 17 00:00:00 2001 From: Tiddo Date: Sat, 2 Nov 2024 20:04:35 +0100 Subject: [PATCH 2/2] Fix for broken API --- .../Controller/ActionController/ApiController.php | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/module/ApiBundle/Component/Controller/ActionController/ApiController.php b/module/ApiBundle/Component/Controller/ActionController/ApiController.php index 7ab1e2ee5..10851eff3 100644 --- a/module/ApiBundle/Component/Controller/ActionController/ApiController.php +++ b/module/ApiBundle/Component/Controller/ActionController/ApiController.php @@ -101,18 +101,14 @@ public function onDispatch(MvcEvent $e) ) ) { $error = $this->error(401, 'You do not have sufficient permissions to access this resource'); - if ($result instanceof \Laminas\View\Model\ViewModel) { - $error->setOptions($result->getOptions()); - } + $error->setOptions($result->getOptions()); $e->setResult($error); return $error; } } else { $error = $this->error(401, 'No key or OAuth token was provided or the token was invalid'); - if ($result instanceof \Laminas\View\Model\ViewModel) { - $error->setOptions($result->getOptions()); - } + $error->setOptions($result->getOptions()); $e->setResult($error); return $error;