Skip to content

Commit 3bac38f

Browse files
committed
minor #7237 use the IdentityTranslator instead of a custom TranslatorInterface mock (xabbuh)
This PR was merged into the 4.x branch. Discussion ---------- use the IdentityTranslator instead of a custom TranslatorInterface mock Commits ------- aa897df use the IdentityTranslator instead of a custom TranslatorInterface mock
2 parents 79422ec + aa897df commit 3bac38f

3 files changed

Lines changed: 7 additions & 19 deletions

File tree

tests/Factory/FieldFactoryTest.php

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
use EasyCorp\Bundle\EasyAdminBundle\Tests\TestApplication\Entity\ProjectDomain\Project;
1616
use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
1717
use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
18-
use Symfony\Contracts\Translation\TranslatorInterface;
18+
use Symfony\Component\Translation\IdentityTranslator;
1919

2020
class FieldFactoryTest extends KernelTestCase
2121
{
@@ -31,14 +31,11 @@ protected function setUp(): void
3131
$authorizationCheckerInterface = $this->getMockBuilder(AuthorizationCheckerInterface::class)->disableOriginalConstructor()->getMock();
3232
$authorizationCheckerInterface->method('isGranted')->willReturn(true);
3333

34-
$translatorMock = $this->createMock(TranslatorInterface::class);
35-
$translatorMock->method('trans')->willReturnArgument(0);
36-
3734
$this->fieldFactory = new FieldFactory(
3835
$this->getMockBuilder(AdminContextProviderInterface::class)->disableOriginalConstructor()->getMock(),
3936
$authorizationCheckerInterface,
4037
[],
41-
new FormLayoutFactory($translatorMock),
38+
new FormLayoutFactory(new IdentityTranslator()),
4239
);
4340
}
4441

tests/Factory/FormLayoutFactoryTest.php

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
use EasyCorp\Bundle\EasyAdminBundle\Form\Type\Layout\EaFormTabPaneGroupCloseType;
1919
use EasyCorp\Bundle\EasyAdminBundle\Form\Type\Layout\EaFormTabPaneGroupOpenType;
2020
use PHPUnit\Framework\TestCase;
21-
use Symfony\Contracts\Translation\TranslatorInterface;
21+
use Symfony\Component\Translation\IdentityTranslator;
2222

2323
class FormLayoutFactoryTest extends TestCase
2424
{
@@ -30,10 +30,7 @@ public function testFixFormColumns(array $fieldConfig, string $expectedLayout)
3030
$originalFields = $this->createFormFieldsFromConfig($fieldConfig);
3131
$expectedFields = $this->createFormFieldsFromLayout($expectedLayout);
3232

33-
$translatorMock = $this->createMock(TranslatorInterface::class);
34-
$translatorMock->method('trans')->willReturnArgument(0);
35-
36-
$formLayoutFactory = new FormLayoutFactory($translatorMock);
33+
$formLayoutFactory = new FormLayoutFactory(new IdentityTranslator());
3734
$formLayoutFactory->createLayout($originalFields, Crud::PAGE_EDIT);
3835

3936
$this->assertTrue($this->isFormLayoutTheSame($expectedFields, $originalFields));
@@ -49,10 +46,7 @@ public function testFixFormColumnsErrors(array $originalFields, string $expected
4946

5047
$originalFields = $this->createFormFieldsFromConfig($originalFields);
5148

52-
$translatorMock = $this->createMock(TranslatorInterface::class);
53-
$translatorMock->method('trans')->willReturnArgument(0);
54-
55-
$fieldFactory = new FormLayoutFactory($translatorMock);
49+
$fieldFactory = new FormLayoutFactory(new IdentityTranslator());
5650
$fieldFactory->createLayout($originalFields, Crud::PAGE_EDIT);
5751
}
5852

tests/Form/Type/CrudFormTypeFormFormFieldTest.php

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
use Symfony\Bridge\Doctrine\Form\DoctrineOrmTypeGuesser;
1212
use Symfony\Component\Form\PreloadedExtension;
1313
use Symfony\Component\Form\Test\TypeTestCase;
14-
use Symfony\Contracts\Translation\TranslatorInterface;
14+
use Symfony\Component\Translation\IdentityTranslator;
1515

1616
class CrudFormTypeFormFormFieldTest extends TypeTestCase
1717
{
@@ -81,12 +81,9 @@ private function getEntityDto(array $fields): EntityDto
8181
->method('getFqcn')
8282
->willReturn(_TestEntity::class);
8383

84-
$translatorMock = $this->createMock(TranslatorInterface::class);
85-
$translatorMock->method('trans')->willReturnArgument(0);
86-
8784
$mock
8885
->method('getFields')
89-
->willReturn((new FormLayoutFactory($translatorMock))
86+
->willReturn((new FormLayoutFactory(new IdentityTranslator()))
9087
->createLayout(FieldCollection::new($fields), Crud::PAGE_NEW)
9188
);
9289

0 commit comments

Comments
 (0)