Merge branch 'master' into vtk-master

LitusProject · Nov 2, 2024 · 7964e15 · 7964e15
2 parents 0551a7f + 74d5a3c
commit 7964e15
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git 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}

diff --git 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;