Skip to content

Fix undefined array key "desc" in element property lexicon translation #16988

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

Open
Ibochkarev wants to merge 4 commits into
base: 3.x
Choose a base branch
from
+4 −2
Open

Fix undefined array key "desc" in element property lexicon translation #16988

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
00d0500
Fix undefined array key "desc" in element property lexicon translation
Ibochkarev Aug 11, 2026
a796f23
Remove test covering missing desc key in element properties.
Ibochkarev Aug 12, 2026
604fc5d
Update core/src/Revolution/modElement.php
Ibochkarev Aug 13, 2026
3e72b03
Update core/src/Revolution/modPropertySet.php
Ibochkarev Aug 13, 2026
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
55 changes: 55 additions & 0 deletions _build/test/Tests/Model/Element/modElementTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,61 @@ public function providerProcess() {
];
}

/**
* Property definitions without a desc key must not trigger PHP warnings on get('properties').
*
* @dataProvider providerGetPropertiesWithoutDescKey
* @param array $propertyDefinition
* @param string $expectedDescTrans
*/
public function testGetPropertiesWithoutDescKey(array $propertyDefinition, string $expectedDescTrans)
{
/** @var modElement $element */
$element = $this->modx->newObject(modElement::class);
$element->set('properties', [$propertyDefinition]);

$warnings = [];
set_error_handler(static function ($severity, $message) use (&$warnings) {
if ($severity === E_WARNING) {
$warnings[] = $message;
}
return true;
}, E_WARNING);

try {
$properties = $element->get('properties');
} finally {
restore_error_handler();
}

$this->assertSame([], $warnings, 'Expected no PHP warnings when desc is missing');
$this->assertArrayHasKey('desc_trans', $properties[0]);
$this->assertSame($expectedDescTrans, $properties[0]['desc_trans']);
}

public function providerGetPropertiesWithoutDescKey()
{
return [
'missing desc' => [
[
'name' => 'foo',
'type' => 'textfield',
'value' => 'bar',
],
'',
],
'description fallback' => [
[
'name' => 'foo',
'type' => 'textfield',
'value' => 'bar',
'description' => 'foo_desc',
],
'foo_desc',
],
];
}

/**
* Test the modElement->getTag() method with xPDOObjects as values.
* E.g the nodes when the event `OnResourceSort` is fired
Expand Down
3 changes: 2 additions & 1 deletion core/src/Revolution/modElement.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,8 @@ public function get($k, $format = null, $formatTemplate = null)
}
$this->xpdo->lexicon->load($property['lexicon']);
}
$property['desc_trans'] = $this->xpdo->lexicon($property['desc']);
$desc = $property['desc'] ?? $property['description'] ?? '';
Comment thread
Ibochkarev marked this conversation as resolved.
Outdated
$property['desc_trans'] = $desc !== '' ? $this->xpdo->lexicon($desc) : '';
$property['area'] = !empty($property['area']) ? $property['area'] : '';
$property['area_trans'] = !empty($property['area']) ? $this->xpdo->lexicon($property['area']) : '';

Expand Down
3 changes: 2 additions & 1 deletion core/src/Revolution/modPropertySet.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,8 @@ public function get($k, $format = null, $formatTemplate = null)
}
$this->xpdo->lexicon->load($property['lexicon']);
}
$property['desc_trans'] = $this->xpdo->lexicon($property['desc']);
$desc = $property['desc'] ?? $property['description'] ?? '';
Comment thread
Ibochkarev marked this conversation as resolved.
Outdated
$property['desc_trans'] = $desc !== '' ? $this->xpdo->lexicon($desc) : '';
$property['area'] = !empty($property['area']) ? $property['area'] : '';

if (!empty($property['options'])) {
Expand Down
Loading