Skip to content

Commit 7acd91f

Browse files
solveratsolverat
committed
#73: fix tests for pimcore 5.6.0
1 parent 3c54c28 commit 7acd91f

File tree

3 files changed

+62
-40
lines changed

3 files changed

+62
-40
lines changed

‎src/MembersBundle/CoreExtension/GroupMultiselect.php

+34-36
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,48 @@
44

55
use Pimcore\Model\Element;
66
use Pimcore\Model\DataObject;
7+
use Pimcore\Model\DataObject\ClassDefinition\Data\Extension;
8+
use Pimcore\Model\DataObject\ClassDefinition\Data\Relations\AbstractRelations;
9+
use MembersBundle\Pimcore\DataObject\ClassDefinition\Data\QueryResourcePersistenceAwareInterface;
710

8-
class GroupMultiselect extends DataObject\ClassDefinition\Data\Relations\AbstractRelations
11+
class GroupMultiselect extends AbstractRelations implements QueryResourcePersistenceAwareInterface
912
{
13+
use Extension\QueryColumnType;
14+
1015
/**
1116
* Static type of this element.
1217
*
1318
* @var string
1419
*/
1520
public $fieldtype = 'membersGroupMultiselect';
1621

22+
/**
23+
* Type for the column to query
24+
*
25+
* @var string
26+
*/
27+
public $queryColumnType = 'text';
28+
29+
/**
30+
* Type for the generated phpdoc
31+
*
32+
* @var string
33+
*/
34+
public $phpdocType = 'array';
35+
1736
/**
1837
* @var bool
1938
*/
2039
public $relationType = true;
2140

41+
/**
42+
* {@inheritdoc}
43+
*/
44+
public function getQueryColumnType()
45+
{
46+
return 'text';
47+
}
48+
2249
/**
2350
* @param string $data
2451
* @param null $object
@@ -49,6 +76,7 @@ public function getDataForEditmode($data, $object = null, $params = [])
4976
* @param array $data
5077
* @param null|DataObject\AbstractObject $object
5178
* @param mixed $params
79+
*
5280
* @return array
5381
*/
5482
public function getDataFromEditmode($data, $object = null, $params = [])
@@ -75,40 +103,7 @@ public function getDataFromEditmode($data, $object = null, $params = [])
75103
* @param $data
76104
* @param null $object
77105
* @param array $params
78-
* @return array|null
79-
*/
80-
public function getDataForResource($data, $object = null, $params = [])
81-
{
82-
$return = [];
83-
84-
if (is_array($data) && count($data) > 0) {
85-
$counter = 1;
86-
foreach ($data as $group) {
87-
$return[] = [
88-
'src_id' => $object->getId(),
89-
'dest_id' => $group->getId(),
90-
'type' => 'object',
91-
'fieldname' => $this->getName(),
92-
'index' => $counter
93-
];
94-
95-
$counter++;
96-
}
97-
98-
return $return;
99-
} elseif (is_array($data) and count($data) === 0) {
100-
//give empty array if data was not null
101-
return [];
102-
} else {
103-
//return null if data was null - this indicates data was not loaded
104-
return null;
105-
}
106-
}
107-
108-
/**
109-
* @param $data
110-
* @param null $object
111-
* @param array $params
106+
*
112107
* @return null|string
113108
* @throws \Exception
114109
*/
@@ -140,6 +135,7 @@ public function getDataForQueryResource($data, $object = null, $params = [])
140135
/**
141136
* @param $object
142137
* @param array $params
138+
*
143139
* @return array|mixed|null
144140
*/
145141
public function preGetData($object, $params = [])
@@ -158,6 +154,7 @@ public function preGetData($object, $params = [])
158154
* @param array $data
159155
* @param null $object
160156
* @param array $params
157+
*
161158
* @return array
162159
*/
163160
public function getDataFromResource($data = [], $object = null, $params = [])
@@ -182,6 +179,7 @@ public function getDataFromResource($data = [], $object = null, $params = [])
182179
* @param array $data
183180
* @param null $object
184181
* @param array $params
182+
*
185183
* @return array
186184
*/
187185
public function loadData($data, $object = null, $params = [])
@@ -193,11 +191,11 @@ public function loadData($data, $object = null, $params = [])
193191
* @param array $data
194192
* @param null $object
195193
* @param array $params
194+
*
196195
* @return array
197196
*/
198197
public function prepareDataForPersistence($data, $object = null, $params = [])
199198
{
200199
return $this->getDataFromResource($data, $object, $params);
201200
}
202-
203201
}

‎src/MembersBundle/Pimcore/DataObject/ClassDefinition/Data/QueryResourcePersistenceAwareInterface.php

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<?php
2+
3+
namespace MembersBundle\Pimcore\DataObject\ClassDefinition\Data;
4+
5+
if (interface_exists(\Pimcore\Model\DataObject\ClassDefinition\Data\QueryResourcePersistenceAwareInterface::class)) {
6+
interface QueryResourcePersistenceAwareInterface extends \Pimcore\Model\DataObject\ClassDefinition\Data\QueryResourcePersistenceAwareInterface
7+
{
8+
}
9+
} else {
10+
interface QueryResourcePersistenceAwareInterface
11+
{
12+
}
13+
}

‎src/MembersBundle/Resources/install/classes/class_MembersUser_export.json

+15-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
{
22
"description": null,
33
"parentClass": "\\MembersBundle\\Adapter\\User\\AbstractUser",
4+
"listingParentClass": null,
45
"useTraits": null,
6+
"listingUseTraits": null,
57
"allowInherit": false,
68
"allowVariants": false,
79
"showVariants": false,
@@ -16,7 +18,7 @@
1618
"width": null,
1719
"height": null,
1820
"collapsible": false,
19-
"collapsed": null,
21+
"collapsed": false,
2022
"bodyStyle": null,
2123
"datatype": "layout",
2224
"permissions": null,
@@ -45,6 +47,8 @@
4547
"columnLength": 190,
4648
"phpdocType": "string",
4749
"regex": "",
50+
"unique": null,
51+
"showCharCount": null,
4852
"name": "userName",
4953
"title": "User Name",
5054
"tooltip": "",
@@ -68,6 +72,8 @@
6872
"columnLength": 190,
6973
"phpdocType": "string",
7074
"regex": "",
75+
"unique": null,
76+
"showCharCount": null,
7177
"name": "email",
7278
"title": "email",
7379
"tooltip": "",
@@ -91,6 +97,8 @@
9197
"columnLength": 190,
9298
"phpdocType": "string",
9399
"regex": "",
100+
"unique": null,
101+
"showCharCount": null,
94102
"name": "confirmationToken",
95103
"title": "Confirmation Token",
96104
"tooltip": "",
@@ -190,11 +198,11 @@
190198
"style": "",
191199
"permissions": null,
192200
"datatype": "data",
193-
"columnType": "text",
194-
"queryColumnType": "text",
195201
"invisible": false,
196202
"visibleGridView": false,
197-
"visibleSearch": false
203+
"visibleSearch": false,
204+
"queryColumnType": "text",
205+
"phpdocType": "array"
198206
}
199207
],
200208
"locked": false
@@ -205,16 +213,19 @@
205213
"icon": "\/bundles\/members\/img\/objectUser.svg",
206214
"previewUrl": null,
207215
"group": null,
216+
"linkGeneratorReference": null,
208217
"propertyVisibility": {
209218
"grid": {
210219
"id": true,
220+
"key": false,
211221
"path": true,
212222
"published": true,
213223
"modificationDate": true,
214224
"creationDate": true
215225
},
216226
"search": {
217227
"id": true,
228+
"key": false,
218229
"path": true,
219230
"published": true,
220231
"modificationDate": true,

0 commit comments

Comments
 (0)