fix: #3558621 Use canonical type names

solideogloriarequested to merge
issue/webform-3558621:3558621-php-8.5-compatibility into 6.3.x

Closes #3558621

Merge request reports