Skip to content

IBX-12654: Fixed dynamic calls to static methods #2105

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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wiewiurdp merged 1 commit into from
Sep 23, 2026
Merged

IBX-12654: Fixed dynamic calls to static methods #2105

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
2 changes: 1 addition & 1 deletion tests/bundle/ControllerArgumentResolver/ContentTreeChildrenQueryArgumentResolverTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ public function testResolve(

$generator = $this->resolver->resolve(
$request,
$this->createArgumentMetadata(
self::createArgumentMetadata(
'filter',
Criterion::class
)
Expand Down
48 changes: 24 additions & 24 deletions tests/bundle/DependencyInjection/Configuration/Parser/AdminUiFormsTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,16 +55,16 @@ public function testContentEditFormTemplatesAreMapped(): void

$this->contextualizer
->expects($matcher)
->method('setContextualParameter')->willReturnCallback(function (...$parameters) use ($matcher, $currentScope, $expectedTemplatesList): void {
->method('setContextualParameter')->willReturnCallback(static function (...$parameters) use ($matcher, $currentScope, $expectedTemplatesList): void {
if ($matcher->numberOfInvocations() === 1) {
$this->assertSame(AdminUiForms::FORM_TEMPLATES_PARAM, $parameters[0]);
$this->assertSame($currentScope, $parameters[1]);
$this->assertSame($expectedTemplatesList, $parameters[2]);
self::assertSame(AdminUiForms::FORM_TEMPLATES_PARAM, $parameters[0]);
self::assertSame($currentScope, $parameters[1]);
self::assertSame($expectedTemplatesList, $parameters[2]);
}
if ($matcher->numberOfInvocations() === 2) {
$this->assertSame(AdminUiForms::FIELD_TYPES_PARAM, $parameters[0]);
$this->assertSame($currentScope, $parameters[1]);
$this->assertSame([], $parameters[2]);
self::assertSame(AdminUiForms::FIELD_TYPES_PARAM, $parameters[0]);
self::assertSame($currentScope, $parameters[1]);
self::assertSame([], $parameters[2]);
}
});

Expand Down Expand Up @@ -96,16 +96,16 @@ public function testContentEditFieldTypesAreMapped(): void

$this->contextualizer
->expects($matcher)
->method('setContextualParameter')->willReturnCallback(function (...$parameters) use ($matcher, $currentScope, $expectedFieldTypeSettings): void {
->method('setContextualParameter')->willReturnCallback(static function (...$parameters) use ($matcher, $currentScope, $expectedFieldTypeSettings): void {
if ($matcher->numberOfInvocations() === 1) {
$this->assertSame(AdminUiForms::FORM_TEMPLATES_PARAM, $parameters[0]);
$this->assertSame($currentScope, $parameters[1]);
$this->assertSame([], $parameters[2]);
self::assertSame(AdminUiForms::FORM_TEMPLATES_PARAM, $parameters[0]);
self::assertSame($currentScope, $parameters[1]);
self::assertSame([], $parameters[2]);
}
if ($matcher->numberOfInvocations() === 2) {
$this->assertSame(AdminUiForms::FIELD_TYPES_PARAM, $parameters[0]);
$this->assertSame($currentScope, $parameters[1]);
$this->assertSame($expectedFieldTypeSettings, $parameters[2]);
self::assertSame(AdminUiForms::FIELD_TYPES_PARAM, $parameters[0]);
self::assertSame($currentScope, $parameters[1]);
self::assertSame($expectedFieldTypeSettings, $parameters[2]);
}
});

Expand All @@ -132,21 +132,21 @@ public function testContentEditMetaFieldgroupListIsMapped(): void

$this->contextualizer
->expects($matcher)
->method('setContextualParameter')->willReturnCallback(function (...$parameters) use ($matcher, $currentScope): void {
->method('setContextualParameter')->willReturnCallback(static function (...$parameters) use ($matcher, $currentScope): void {
if ($matcher->numberOfInvocations() === 1) {
$this->assertSame(AdminUiForms::FORM_TEMPLATES_PARAM, $parameters[0]);
$this->assertSame($currentScope, $parameters[1]);
$this->assertSame([], $parameters[2]);
self::assertSame(AdminUiForms::FORM_TEMPLATES_PARAM, $parameters[0]);
self::assertSame($currentScope, $parameters[1]);
self::assertSame([], $parameters[2]);
}
if ($matcher->numberOfInvocations() === 2) {
$this->assertSame(AdminUiForms::FIELD_TYPES_PARAM, $parameters[0]);
$this->assertSame($currentScope, $parameters[1]);
$this->assertSame([], $parameters[2]);
self::assertSame(AdminUiForms::FIELD_TYPES_PARAM, $parameters[0]);
self::assertSame($currentScope, $parameters[1]);
self::assertSame([], $parameters[2]);
}
if ($matcher->numberOfInvocations() === 3) {
$this->assertSame(AdminUiForms::META_FIELD_GROUPS_LIST_PARAM, $parameters[0]);
$this->assertSame($currentScope, $parameters[1]);
$this->assertSame(['metadata', 'seo'], $parameters[2]);
self::assertSame(AdminUiForms::META_FIELD_GROUPS_LIST_PARAM, $parameters[0]);
self::assertSame($currentScope, $parameters[1]);
self::assertSame(['metadata', 'seo'], $parameters[2]);
}
});

Expand Down
14 changes: 7 additions & 7 deletions tests/bundle/DependencyInjection/Configuration/Parser/SubtreeOperationsTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,16 +143,16 @@ public function testBothSubtreeOperationsSet(): void

$this->contextualizer
->expects($matcher)
->method('setContextualParameter')->willReturnCallback(function (...$parameters) use ($matcher, $currentScope): void {
->method('setContextualParameter')->willReturnCallback(static function (...$parameters) use ($matcher, $currentScope): void {
if ($matcher->numberOfInvocations() === 1) {
$this->assertSame('subtree_operations.copy_subtree.limit', $parameters[0]);
$this->assertSame($currentScope, $parameters[1]);
$this->assertSame(200, $parameters[2]);
self::assertSame('subtree_operations.copy_subtree.limit', $parameters[0]);
self::assertSame($currentScope, $parameters[1]);
self::assertSame(200, $parameters[2]);
}
if ($matcher->numberOfInvocations() === 2) {
$this->assertSame('subtree_operations.query_subtree.limit', $parameters[0]);
$this->assertSame($currentScope, $parameters[1]);
$this->assertSame(500, $parameters[2]);
self::assertSame('subtree_operations.query_subtree.limit', $parameters[0]);
self::assertSame($currentScope, $parameters[1]);
self::assertSame(500, $parameters[2]);
}
});

Expand Down
6 changes: 3 additions & 3 deletions tests/lib/EventListener/SetViewParametersListenerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,9 @@ public function setUp(): void
$configResolver = $this->createMock(ConfigResolverInterface::class);
$matcher = self::any();
$configResolver->expects($matcher)
->method('getParameter')->willReturnCallback(function (...$parameters) use ($matcher): array {
->method('getParameter')->willReturnCallback(static function (...$parameters) use ($matcher): array {
if ($matcher->numberOfInvocations() === 1) {
$this->assertSame('admin_ui_forms.content_edit.fieldtypes', $parameters[0]);
self::assertSame('admin_ui_forms.content_edit.fieldtypes', $parameters[0]);

return [
'ibexa_taxonomy_entry_assignment' => [
Expand All @@ -75,7 +75,7 @@ public function setUp(): void
];
}
if ($matcher->numberOfInvocations() === 2) {
$this->assertSame('admin_ui_forms.content_edit.meta_field_groups_list', $parameters[0]);
self::assertSame('admin_ui_forms.content_edit.meta_field_groups_list', $parameters[0]);

return ['metadata'];
}
Expand Down
4 changes: 2 additions & 2 deletions tests/lib/Form/DataTransformer/UDWBasedValueViewTransformerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,8 @@ public function testReverseTransform(?string $given, ?array $expected): void
{
$this->locationService
->method('loadLocation')
->willReturnCallback(function ($id): Location {
return $this->createLocation($id);
->willReturnCallback(static function ($id): Location {
return self::createLocation($id);
});

self::assertEquals($expected, $this->transformer->reverseTransform($given));
Expand Down
2 changes: 1 addition & 1 deletion tests/lib/Form/DataTransformer/UserTransformerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ protected function setUp(): void
->expects(self::any())
->method('loadUser')
->with(123456)
->willReturn($this->generateUser(123456));
->willReturn(self::generateUser(123456));

$this->userTransformer = new UserTransformer($userService);
}
Expand Down
14 changes: 7 additions & 7 deletions tests/lib/Form/Processor/ContentTypeFormProcessorTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,16 +94,16 @@ public function testProcessDefaultAction(): void

$this->contentTypeService
->expects($matcher)
->method('updateFieldDefinition')->willReturnCallback(function (...$parameters) use ($matcher, $contentTypeDraft, $fieldDef1, $fieldDefData1, $fieldDef2, $fieldDefData2): void {
->method('updateFieldDefinition')->willReturnCallback(static function (...$parameters) use ($matcher, $contentTypeDraft, $fieldDef1, $fieldDefData1, $fieldDef2, $fieldDefData2): void {
if ($matcher->numberOfInvocations() === 1) {
$this->assertSame($contentTypeDraft, $parameters[0]);
$this->assertSame($fieldDef1, $parameters[1]);
$this->assertSame($fieldDefData1, $parameters[2]);
self::assertSame($contentTypeDraft, $parameters[0]);
self::assertSame($fieldDef1, $parameters[1]);
self::assertSame($fieldDefData1, $parameters[2]);
}
if ($matcher->numberOfInvocations() === 2) {
$this->assertSame($contentTypeDraft, $parameters[0]);
$this->assertSame($fieldDef2, $parameters[1]);
$this->assertSame($fieldDefData2, $parameters[2]);
self::assertSame($contentTypeDraft, $parameters[0]);
self::assertSame($fieldDef2, $parameters[1]);
self::assertSame($fieldDefData2, $parameters[2]);
}
});
$this->contentTypeService
Expand Down
4 changes: 2 additions & 2 deletions tests/lib/Menu/Action/DraftListActionMenuBuilderTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ public function testBuildDraftListActionMenu(): void
$this->mockUrlGeneratorGenerate();
$this->mockTranslatorTranslate();

$menu = $this->actionMenuBuilder->build(['versionInfo' => $this->createVersionInfo()]);
$menu = $this->actionMenuBuilder->build(['versionInfo' => self::createVersionInfo()]);

$this->assertActionItemSame(
$menu,
Expand All @@ -69,7 +69,7 @@ public function testBuildDraftListActionMenu(): void

public function testAddUserUpdateItemAction(): void
{
$versionInfo = $this->createVersionInfo();
$versionInfo = self::createVersionInfo();
$user = self::createStub(Content::class);

$this->mockUrlGeneratorGenerate();
Expand Down
2 changes: 1 addition & 1 deletion tests/lib/Menu/Action/VersionListActionMenuBuilderTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ public static function provideDataForTestBuildVersionListActionMenu(): iterable

public function testAddUserUpdateItemAction(): void
{
$versionInfo = $this->createVersionInfo();
$versionInfo = self::createVersionInfo();
$user = self::createStub(Content::class);

$this->mockUrlGeneratorGenerate();
Expand Down
20 changes: 10 additions & 10 deletions tests/lib/Pagination/Pagerfanta/URLSearchAdapterTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,11 @@ public function testGetNbResults(): void
$this->urlService
->expects(self::once())
->method('findUrls')
->willReturnCallback(function (URLQuery $q) use ($query, $searchResults): SearchResult {
$this->assertEquals($query->filter, $q->filter);
$this->assertEquals($query->sortClauses, $q->sortClauses);
$this->assertEquals(0, $q->offset);
$this->assertEquals(0, $q->limit);
->willReturnCallback(static function (URLQuery $q) use ($query, $searchResults): SearchResult {
self::assertEquals($query->filter, $q->filter);
self::assertEquals($query->sortClauses, $q->sortClauses);
self::assertEquals(0, $q->offset);
self::assertEquals(0, $q->limit);

return $searchResults;
});
Expand Down Expand Up @@ -70,11 +70,11 @@ public function testGetSlice(): void
$this->urlService
->expects(self::once())
->method('findUrls')
->willReturnCallback(function (URLQuery $q) use ($query, $limit, $offset, $searchResults): SearchResult {
$this->assertEquals($query->filter, $q->filter);
$this->assertEquals($query->sortClauses, $q->sortClauses);
$this->assertEquals($limit, $q->limit);
$this->assertEquals($offset, $q->offset);
->willReturnCallback(static function (URLQuery $q) use ($query, $limit, $offset, $searchResults): SearchResult {
self::assertEquals($query->filter, $q->filter);
self::assertEquals($query->sortClauses, $q->sortClauses);
self::assertEquals($limit, $q->limit);
self::assertEquals($offset, $q->offset);

return $searchResults;
});
Expand Down
20 changes: 10 additions & 10 deletions tests/lib/Pagination/Pagerfanta/URLWildcardAdapterTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,11 @@ public function testGetNbResults(): void
$this->urlWildcardService
->expects(self::once())
->method('findUrlWildcards')
->willReturnCallback(function (URLWildcardQuery $q) use ($query, $searchResults): SearchResult {
$this->assertEquals($query->filter, $q->filter);
$this->assertEquals($query->sortClauses, $q->sortClauses);
$this->assertEquals(0, $q->offset);
$this->assertEquals(0, $q->limit);
->willReturnCallback(static function (URLWildcardQuery $q) use ($query, $searchResults): SearchResult {
self::assertEquals($query->filter, $q->filter);
self::assertEquals($query->sortClauses, $q->sortClauses);
self::assertEquals(0, $q->offset);
self::assertEquals(0, $q->limit);

return $searchResults;
});
Expand All @@ -66,11 +66,11 @@ public function testGetSlice(): void
$this->urlWildcardService
->expects(self::once())
->method('findUrlWildcards')
->willReturnCallback(function (URLWildcardQuery $q) use ($query, $limit, $offset, $searchResults): SearchResult {
$this->assertEquals($query->filter, $q->filter);
$this->assertEquals($query->sortClauses, $q->sortClauses);
$this->assertEquals($limit, $q->limit);
$this->assertEquals($offset, $q->offset);
->willReturnCallback(static function (URLWildcardQuery $q) use ($query, $limit, $offset, $searchResults): SearchResult {
self::assertEquals($query->filter, $q->filter);
self::assertEquals($query->sortClauses, $q->sortClauses);
self::assertEquals($limit, $q->limit);
self::assertEquals($offset, $q->offset);

return $searchResults;
});
Expand Down
Loading