Skip to content

[Translator] Further postpone adding resource files #27063

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
merged 1 commit into from
Apr 29, 2018
Merged

[Translator] Further postpone adding resource files #27063

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
15 changes: 13 additions & 2 deletions src/Symfony/Bundle/FrameworkBundle/Translation/Translator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@ class Translator extends BaseTranslator implements WarmableInterface
*/
private $resources = array();

private $resourceFiles;
Copy link

Choose a reason for hiding this comment

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

I think this could be a "private $resourceFilesLoaded" boolean (see next comment).


/**
* Constructor.
*
Expand Down Expand Up @@ -75,7 +77,7 @@ public function __construct(ContainerInterface $container, MessageFormatterInter

$this->options = array_merge($this->options, $options);
$this->resourceLocales = array_keys($this->options['resource_files']);
$this->addResourceFiles($this->options['resource_files']);
$this->resourceFiles = $this->options['resource_files'];
Copy link

Choose a reason for hiding this comment

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

This will create a copy of $this->options['resource_files'] array, right? Wouldn't it be better for memory to have a $resourceFilesLoaded boolean attribute instead, and use $this->options['resource_files'] later to iterate at addResourceFiles?

Copy link
Contributor

Choose a reason for hiding this comment

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

This will only copy the array of there is a modification to the array, if we don't touch to the array the copy-on-write mechanism will just keep a second reference to the same array.

Copy link
Member Author

Choose a reason for hiding this comment

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

actually, thanks to copy-on-write, no duplication will ever happen

Copy link

Choose a reason for hiding this comment

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

Then, is ok for me also 😀


parent::__construct($defaultLocale, $formatter, $this->options['cache_dir'], $this->options['debug']);
}
Expand Down Expand Up @@ -103,6 +105,9 @@ public function warmUp($cacheDir)

public function addResource($format, $resource, $locale, $domain = null)
{
if ($this->resourceFiles) {
Copy link

Choose a reason for hiding this comment

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

This could be "if (!$this->resourceFilesLoaded) {"

$this->addResourceFiles();
Copy link
Member

Choose a reason for hiding this comment

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

do we need to do it here ?

We could ensure we do it only on initialize by calling parent::addResource for the resource files instead of $this->addResource (avoiding to copy them first from resourceFiles to resources, to add them in the parent later.

As initialize will process resourceFiles before resources, the other will be preserved.

Copy link
Member Author

Choose a reason for hiding this comment

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

one could call the constructor, then addResource on the object, isn't it?

Copy link
Member Author

Choose a reason for hiding this comment

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

(I confirm, and this is already covered by tests :) )

}
$this->resources[] = array($format, $resource, $locale, $domain);
}

Expand All @@ -117,6 +122,9 @@ protected function initializeCatalogue($locale)

protected function initialize()
{
if ($this->resourceFiles) {
Copy link

Choose a reason for hiding this comment

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

This could also be "if (!$this->resourceFilesLoaded) { "

$this->addResourceFiles();
}
foreach ($this->resources as $key => $params) {
list($format, $resource, $locale, $domain) = $params;
parent::addResource($format, $resource, $locale, $domain);
Expand All @@ -130,8 +138,11 @@ protected function initialize()
}
}

private function addResourceFiles($filesByLocale)
private function addResourceFiles()
{
$filesByLocale = $this->resourceFiles;
Copy link

@grisendo grisendo Apr 26, 2018 •
edited
Loading

Choose a reason for hiding this comment

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

With this assignment, the resources are cloned again, and now we have 3 times the same content for a moment. We already have $this->options['resource_files'] to iterate in the next line

$this->resourceFiles = array();

foreach ($filesByLocale as $locale => $files) {
foreach ($files as $key => $file) {
// filename is domain.locale.format
Expand Down