Skip to content

[Messenger][Translation] do not mock final classes #61003

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

Merged
xabbuh merged 1 commit into from
Jul 1, 2025
Merged

[Messenger][Translation] do not mock final classes #61003

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
11 changes: 7 additions & 4 deletions src/Symfony/Component/Messenger/Tests/EventListener/ResetServicesListenerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
use Symfony\Component\Messenger\Event\WorkerStoppedEvent;
use Symfony\Component\Messenger\EventListener\ResetServicesListener;
use Symfony\Component\Messenger\Worker;
use Symfony\Contracts\Service\ResetInterface;

class ResetServicesListenerTest extends TestCase
{
Expand All @@ -31,8 +32,9 @@ public static function provideResetServices(): iterable
*/
public function testResetServices(bool $shouldReset)
{
$servicesResetter = $this->createMock(ServicesResetter::class);
$servicesResetter->expects($shouldReset ? $this->once() : $this->never())->method('reset');
$resettableService = $this->createMock(ResetInterface::class);
$resettableService->expects($shouldReset ? $this->once() : $this->never())->method('reset');
$servicesResetter = new ServicesResetter(new \ArrayIterator(['foo' => $resettableService]), ['foo' => 'reset']);

$event = new WorkerRunningEvent($this->createMock(Worker::class), !$shouldReset);

Expand All @@ -42,8 +44,9 @@ public function testResetServices(bool $shouldReset)

public function testResetServicesAtStop()
{
$servicesResetter = $this->createMock(ServicesResetter::class);
$servicesResetter->expects($this->once())->method('reset');
$resettableService = $this->createMock(ResetInterface::class);
$resettableService->expects($this->once())->method('reset');
$servicesResetter = new ServicesResetter(new \ArrayIterator(['foo' => $resettableService]), ['foo' => 'reset']);

$event = new WorkerStoppedEvent($this->createMock(Worker::class));

Expand Down
96 changes: 23 additions & 73 deletions src/Symfony/Component/Translation/Tests/DataCollector/TranslationDataCollectorTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,14 @@
use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\Translation\DataCollector\TranslationDataCollector;
use Symfony\Component\Translation\DataCollectorTranslator;
use Symfony\Component\Translation\Loader\ArrayLoader;
use Symfony\Component\Translation\Translator;

class TranslationDataCollectorTest extends TestCase
{
public function testCollectEmptyMessages()
{
$translator = $this->getTranslator();
$translator->expects($this->any())->method('getCollectedMessages')->willReturn([]);

$dataCollector = new TranslationDataCollector($translator);
$dataCollector = new TranslationDataCollector(new DataCollectorTranslator($this->createMock(Translator::class)));
$dataCollector->lateCollect();

$this->assertEquals(0, $dataCollector->getCountMissings());
Expand All @@ -35,53 +34,6 @@ public function testCollectEmptyMessages()

public function testCollect()
{
$collectedMessages = [
[
'id' => 'foo',
'translation' => 'foo (en)',
'locale' => 'en',
'domain' => 'messages',
'state' => DataCollectorTranslator::MESSAGE_DEFINED,
'parameters' => [],
'transChoiceNumber' => null,
],
[
'id' => 'bar',
'translation' => 'bar (fr)',
'locale' => 'fr',
'domain' => 'messages',
'state' => DataCollectorTranslator::MESSAGE_EQUALS_FALLBACK,
'parameters' => [],
'transChoiceNumber' => null,
],
[
'id' => 'choice',
'translation' => 'choice',
'locale' => 'en',
'domain' => 'messages',
'state' => DataCollectorTranslator::MESSAGE_MISSING,
'parameters' => ['%count%' => 3],
'transChoiceNumber' => 3,
],
[
'id' => 'choice',
'translation' => 'choice',
'locale' => 'en',
'domain' => 'messages',
'state' => DataCollectorTranslator::MESSAGE_MISSING,
'parameters' => ['%count%' => 3],
'transChoiceNumber' => 3,
],
[
'id' => 'choice',
'translation' => 'choice',
'locale' => 'en',
'domain' => 'messages',
'state' => DataCollectorTranslator::MESSAGE_MISSING,
'parameters' => ['%count%' => 4, '%foo%' => 'bar'],
'transChoiceNumber' => 4,
],
];
$expectedMessages = [
[
'id' => 'foo',
Expand All @@ -92,16 +44,18 @@ public function testCollect()
'count' => 1,
'parameters' => [],
'transChoiceNumber' => null,
'fallbackLocale' => null,
],
[
'id' => 'bar',
'translation' => 'bar (fr)',
'locale' => 'fr',
'locale' => 'en',
'domain' => 'messages',
'state' => DataCollectorTranslator::MESSAGE_EQUALS_FALLBACK,
'count' => 1,
'parameters' => [],
'transChoiceNumber' => null,
'fallbackLocale' => 'fr',
],
[
'id' => 'choice',
Expand All @@ -116,13 +70,22 @@ public function testCollect()
['%count%' => 4, '%foo%' => 'bar'],
],
'transChoiceNumber' => 3,
'fallbackLocale' => null,
],
];

$translator = $this->getTranslator();
$translator->expects($this->any())->method('getCollectedMessages')->willReturn($collectedMessages);

$dataCollector = new TranslationDataCollector($translator);
$translator = new Translator('en');
$translator->setFallbackLocales(['fr']);
$translator->addLoader('memory', new ArrayLoader());
$translator->addResource('memory', ['foo' => 'foo (en)'], 'en');
$translator->addResource('memory', ['bar' => 'bar (fr)'], 'fr');
$dataCollectorTranslator = new DataCollectorTranslator($translator);
$dataCollectorTranslator->trans('foo');
$dataCollectorTranslator->trans('bar');
$dataCollectorTranslator->trans('choice', ['%count%' => 3]);
$dataCollectorTranslator->trans('choice', ['%count%' => 3]);
$dataCollectorTranslator->trans('choice', ['%count%' => 4, '%foo%' => 'bar']);
$dataCollector = new TranslationDataCollector($dataCollectorTranslator);
$dataCollector->lateCollect();

$this->assertEquals(1, $dataCollector->getCountMissings());
Expand All @@ -134,12 +97,10 @@ public function testCollect()

public function testCollectAndReset()
{
$translator = $this->getTranslator();
$translator->method('getLocale')->willReturn('fr');
$translator->method('getFallbackLocales')->willReturn(['en']);
$translator->method('getGlobalParameters')->willReturn(['welcome' => 'Welcome {name}!']);

$dataCollector = new TranslationDataCollector($translator);
$translator = new Translator('fr');
$translator->setFallbackLocales(['en']);
$translator->addGlobalParameter('welcome', 'Welcome {name}!');
$dataCollector = new TranslationDataCollector(new DataCollectorTranslator($translator));
$dataCollector->collect($this->createMock(Request::class), $this->createMock(Response::class));

$this->assertSame('fr', $dataCollector->getLocale());
Expand All @@ -152,15 +113,4 @@ public function testCollectAndReset()
$this->assertSame([], $dataCollector->getFallbackLocales());
$this->assertSame([], $dataCollector->getGlobalParameters());
}

private function getTranslator()
{
$translator = $this
->getMockBuilder(DataCollectorTranslator::class)
->disableOriginalConstructor()
->getMock()
;

return $translator;
}
}