Removed default value from request->get

pimcore · Sep 4, 2024 · 0601e56 · 0601e56
1 parent b6433ed
commit 0601e56
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/src/Controller/WebserviceController.php b/src/Controller/WebserviceController.php
@@ -93,6 +93,7 @@ public function webonyxAction(
         LongRunningHelper $longRunningHelper
     ) {
         $clientname = $request->attributes->getString('clientname');
+        $variableValues = null;
 
         $configuration = Configuration::getByName($clientname);
         if (!$configuration || !$configuration->isActive()) {
@@ -161,7 +162,7 @@ public function webonyxAction(
         }
 
         $query = $input['query'] ?? '';
-        $variableValues = $input['variables'] ?? null;
+
 
         try {
             $rootValue = [];
@@ -178,7 +179,11 @@ public function webonyxAction(
             $this->eventDispatcher->dispatch($event, ExecutorEvents::PRE_EXECUTE);
 
             if ($event->getRequest() instanceof Request) {
-                $variableValues = $event->getRequest()->request->get('variables', $variableValues);
+                $variableValues = $event->getRequest()->request->get('variables');
+            }
+
+            if(empty($variableValues)) {
+                $variableValues = $input['variables'] ?? null;
             }
 
             $configAllowIntrospection = true;