Skip to content

Commit 0816e35

Browse files
authored
[Task] Introducing user parameter to make async work in studio (#102)
* Introducing user parameter to make async work in studio * Apply php-cs-fixer changes * Make explicitly nullable
1 parent fb7727e commit 0816e35

File tree

2 files changed

+31
-11
lines changed

2 files changed

+31
-11
lines changed

src/Models/DataObject/DataObjectServiceResolver.php

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,27 +21,36 @@
2121
use Pimcore\Model\DataObject\ClassDefinition\Data;
2222
use Pimcore\Model\DataObject\Concrete;
2323
use Pimcore\Model\DataObject\Service;
24+
use Pimcore\Model\User;
2425

2526
/**
2627
* @internal
2728
*/
2829
final class DataObjectServiceResolver extends DataObjectServiceResolverContract implements DataObjectServiceResolverInterface
2930
{
30-
public function getCustomLayoutDefinitionForGridColumnConfig(ClassDefinition $class, int $objectId): array
31-
{
32-
return Service::getCustomLayoutDefinitionForGridColumnConfig($class, $objectId);
31+
public function getCustomLayoutDefinitionForGridColumnConfig(
32+
ClassDefinition $class,
33+
int $objectId,
34+
?User $user = null
35+
): array {
36+
return Service::getCustomLayoutDefinitionForGridColumnConfig($class, $objectId, $user);
3337
}
3438

3539
public function enrichLayoutDefinition(
3640
ClassDefinition\Data|ClassDefinition\Layout|null &$layout,
3741
?Concrete $object = null,
38-
array $context = []
42+
array $context = [],
43+
?User $user = null
3944
): void {
40-
Service::enrichLayoutDefinition($layout, $object, $context);
45+
Service::enrichLayoutDefinition($layout, $object, $context, $user);
4146
}
4247

43-
public function enrichLayoutPermissions(Data &$layout, ?array $allowedView, ?array $allowedEdit): void
44-
{
45-
Service::enrichLayoutPermissions($layout, $allowedView, $allowedEdit);
48+
public function enrichLayoutPermissions(
49+
Data &$layout,
50+
?array $allowedView,
51+
?array $allowedEdit,
52+
?User $user = null
53+
): void {
54+
Service::enrichLayoutPermissions($layout, $allowedView, $allowedEdit, $user);
4655
}
4756
}

src/Models/DataObject/DataObjectServiceResolverInterface.php

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,19 +20,30 @@
2020
use Pimcore\Model\DataObject\ClassDefinition;
2121
use Pimcore\Model\DataObject\ClassDefinition\Data;
2222
use Pimcore\Model\DataObject\Concrete;
23+
use Pimcore\Model\User;
2324

2425
/**
2526
* @internal
2627
*/
2728
interface DataObjectServiceResolverInterface extends DataObjectServiceResolverContractInterface
2829
{
29-
public function getCustomLayoutDefinitionForGridColumnConfig(ClassDefinition $class, int $objectId): array;
30+
public function getCustomLayoutDefinitionForGridColumnConfig(
31+
ClassDefinition $class,
32+
int $objectId,
33+
?User $user = null
34+
): array;
3035

3136
public function enrichLayoutDefinition(
3237
ClassDefinition\Data|ClassDefinition\Layout|null &$layout,
3338
?Concrete $object = null,
34-
array $context = []
39+
array $context = [],
40+
?User $user = null
3541
): void;
3642

37-
public function enrichLayoutPermissions(Data &$layout, ?array $allowedView, ?array $allowedEdit): void;
43+
public function enrichLayoutPermissions(
44+
Data &$layout,
45+
?array $allowedView, ?
46+
array $allowedEdit,
47+
?User $user = null
48+
): void;
3849
}

0 commit comments

Comments
 (0)