Skip to content

Commit f6d16a3

Browse files
committed
Fix ci 2
1 parent e9033f6 commit f6d16a3

2 files changed

Lines changed: 31 additions & 6 deletions

File tree

src/Utils/DotCmsHelper.php

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,13 @@ public static function getContainerData(array $containers, array $container): ?a
3535
$structures = $containerData['containerStructures'] ?? [];
3636
$container = $containerData['container'] ?? [];
3737

38-
$contentlets = $containerData['contentlets']["uuid-$uuid"]
39-
?? $containerData['contentlets']["uuid-dotParser_$uuid"]
40-
?? [];
38+
$contentlets = [];
39+
if ($uuid !== null && (is_string($uuid) || is_numeric($uuid))) {
40+
$uuidStr = (string) $uuid;
41+
$contentlets = $containerData['contentlets']["uuid-$uuidStr"]
42+
?? $containerData['contentlets']["uuid-dotParser_$uuidStr"]
43+
?? [];
44+
}
4145

4246
return [
4347
...$container,

tests/Utils/DotCmsHelperTest.php

Lines changed: 24 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,34 @@ class DotCmsHelperTest extends TestCase
1010
public function testGetContainerData(): void
1111
{
1212
$containers = [
13-
'abc123' => ['title' => 'Test Container'],
13+
'abc123' => [
14+
'container' => ['title' => 'Test Container'],
15+
'containerStructures' => [
16+
['contentTypeVar' => 'Banner'],
17+
['contentTypeVar' => 'Widget'],
18+
],
19+
'contentlets' => [
20+
'uuid-123' => [
21+
['title' => 'Test Content'],
22+
],
23+
],
24+
],
1425
'def456' => ['title' => 'Another Container'],
1526
];
1627

17-
$container = ['identifier' => 'abc123'];
28+
// Test with valid container
29+
$container = [
30+
'identifier' => 'abc123',
31+
'uuid' => '123',
32+
];
1833
$result = DotCmsHelper::getContainerData($containers, $container);
19-
$this->assertEquals(['title' => 'Test Container'], $result);
34+
$this->assertEquals([
35+
'title' => 'Test Container',
36+
'acceptTypes' => 'Banner,Widget',
37+
'contentlets' => [['title' => 'Test Content']],
38+
'maxContentlets' => 0,
39+
'variantId' => null,
40+
], $result);
2041

2142
// Test with non-existent identifier
2243
$container = ['identifier' => 'nonexistent'];

0 commit comments

Comments
 (0)