Skip to content
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

IBX-8897: Fixed incorrect extrapolation of parentheses in the name schema pattern #449

Open
wants to merge 1 commit into
base: 4.6
Choose a base branch
from
+13 −8
Open

IBX-8897: Fixed incorrect extrapolation of parentheses in the name schema pattern #449

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 5 additions & 0 deletions src/lib/Repository/NameSchema/NameSchemaService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,6 +251,11 @@ protected function filterNameSchema(string $nameSchema): array
if ($foundGroups) {
$i = 0;
foreach ($groupArray[1] as $group) {
// Skip the group if it has no fields to parse
if (!preg_match('/<.*>/', $group)) {
continue;
}
Comment on lines +254 to +257
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

After looking into this we could probably do more complex regex in L248:

// match groups "( )" containing fields "< >" - curly brackets without any fields are not a group, but a literal string
$foundGroups = preg_match_all('/\((.*<.+>.*)\)/U', $nameSchema, $groupArray);

But as we discussed internally, I'm not sure which solution would be better for @ibexa/php-dev. The current one is maybe more readable.

POV ping @ibexa/php-dev

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If we want to proceed with the above, then tests related to this functionality should be expanded (which would be welcome by itself anyway, by the way).

This would ensure that any changes to the name schema processing, including regexp changes to improve performance, are not breaking anything - especially not any nested patterns.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've already modified a test to cover the "new" part of this functionality, is it sufficient of should i cover more cases like so?


// Create meta-token for group
$metaToken = self::META_STRING . $i;

Expand Down
16 changes: 8 additions & 8 deletions tests/lib/Repository/NameSchema/NameSchemaServiceTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,13 +76,13 @@ public static function getDataForTestResolveNameSchema(): iterable
yield 'Default: Field Map and Languages taken from Content Version' => [
[],
[
'eng-GB' => ['text2' => 'two'],
'cro-HR' => ['text2' => 'dva'],
'eng-GB' => ['text1' => 'one', 'text2' => 'two'],
'cro-HR' => ['text1' => 'jedan', 'text2' => 'dva'],
],
[],
[
'eng-GB' => 'two',
'cro-HR' => 'dva',
'eng-GB' => 'one - two (testString)',
'cro-HR' => 'jedan - dva (testString)',
],
];

Expand All @@ -98,8 +98,8 @@ public static function getDataForTestResolveNameSchema(): iterable
],
['eng-GB', 'cro-HR'],
[
'eng-GB' => 'three',
'cro-HR' => 'Dva',
'eng-GB' => 'three (testString)',
'cro-HR' => ' - Dva (testString)',
],
];
}
Expand All @@ -119,11 +119,11 @@ public function testResolveNameSchema(
array $expectedNames
): void {
$content = $this->buildTestContentObject();
$nameSchema = '<text3|text2>';
$nameSchema = '<text3|(<text1> - <text2>)> (testString)';
$contentType = $this->buildTestContentTypeStub($nameSchema, $nameSchema);
$event = new ResolveContentNameSchemaEvent(
$content,
['field' => ['text3', 'text2']],
['field' => ['text3', 'text2', 'text1']],
$contentType,
$fieldMap,
$languageCodes
Expand Down
Loading