Merge remote-tracking branch 'origin/1.7' into 1.8

pimcore · Nov 7, 2024 · 5195a8c · 5195a8c
2 parents 30fdaa1 + f627051
commit 5195a8c
Showing 1 changed file with 9 additions and 6 deletions.
diff --git a/src/GraphQL/Service.php b/src/GraphQL/Service.php
@@ -53,7 +53,6 @@
 use Pimcore\Model\Factory;
 use Pimcore\Translation\Translator;
 use Psr\Container\ContainerInterface;
-use stdClass;
 
 class Service
 {
@@ -782,8 +781,11 @@ public function getPropertyTypeDefinition($typeName)
      * @param string|null $brickType
      * @param string|null $brickKey
      * @param Data|null $fieldDefinition
+     * @param array $context
+     * @param array|null $brickDescriptor
+     * @param array $args
      *
-     * @return stdclass, value and objectid where the value comes from
+     * @return mixed
      */
     public static function getValueForObject($object, $key, $brickType = null, $brickKey = null, $fieldDefinition = null, $context = [], $brickDescriptor = null, $args = [])
     {
@@ -838,7 +840,7 @@ public static function getValueForObject($object, $key, $brickType = null, $bric
      * @param string $attribute
      * @param \Closure $callback
      *
-     * @return stdclass|null
+     * @return mixed result of the callback
      *
      * @throws \Exception
      */
@@ -1162,9 +1164,9 @@ public static function getValueFromObjectBrick(
         Concrete $object,
         string $brickType,
         string $brickKey,
-        string $brickDescriptor = null,
+        ?array $brickDescriptor = null,
         array $descriptorData = [],
-    ): stdClass|array|null {
+    ): mixed {
         $context = ['object' => $object];
 
         $key = \Pimcore\Model\DataObject\Service::getFieldForBrickType($object->getclass(), $brickType);
@@ -1188,7 +1190,8 @@ public static function getValueFromObjectBrick(
                 $def,
                 $context,
                 $brickDescriptor,
-                $descriptorData['args'] ?? []);
+                $descriptorData['args'] ?? []
+            );
         }
 
         return null;