Skip to content

Commit

Permalink
Fix regression from #875 (#910)
Browse files Browse the repository at this point in the history
* Fix regression from #875

* getValueForObject/getValueFromObjectBrick returns mixed

* setValue return mixed
  • Loading branch information
blankse authored Nov 7, 2024
1 parent 6a39a58 commit f627051
Showing 1 changed file with 9 additions and 6 deletions.
15 changes: 9 additions & 6 deletions src/GraphQL/Service.php
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@
use Pimcore\Model\Factory;
use Pimcore\Translation\Translator;
use Psr\Container\ContainerInterface;
use stdClass;

class Service
{
Expand Down Expand Up @@ -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 = [])
{
Expand Down Expand Up @@ -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
*/
Expand Down Expand Up @@ -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);
Expand All @@ -1188,7 +1190,8 @@ public static function getValueFromObjectBrick(
$def,
$context,
$brickDescriptor,
$descriptorData['args'] ?? []);
$descriptorData['args'] ?? []
);
}

return null;
Expand Down

0 comments on commit f627051

Please sign in to comment.