Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix regression from #875 #910

Merged
merged 3 commits into from
Nov 7, 2024
Merged

Fix regression from #875 #910

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c6abe16
Fix regression from #875
blankse Nov 6, 2024
301b02a
getValueForObject/getValueFromObjectBrick returns mixed
blankse Nov 6, 2024
53db706
setValue return mixed
blankse Nov 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 9 additions & 6 deletions src/GraphQL/Service.php
View file
Open in desktop
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
Loading