Skip to content

[Config] Delegate creation of ConfigCache instances to a factory. #14178

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

Closed
wants to merge 24 commits into from
Closed

[Config] Delegate creation of ConfigCache instances to a factory. #14178

Changes from 1 commit
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
02159ae
Delegate creation of ConfigCache instances to a factory.
mpdude Apr 2, 2015
98aa48b
Fix wrong method name
mpdude Apr 2, 2015
3744edf
Add E_USER_DEPRECATED warning
mpdude Apr 2, 2015
282a75a
CS fix
mpdude Apr 2, 2015
ae29b82
CS fixes
mpdude Apr 2, 2015
1730fc3
Remove "constructor" docblocks
mpdude Apr 2, 2015
770ee09
DocBlock fixes
mpdude Apr 2, 2015
2a058fd
Fix DocBlock
mpdude Apr 2, 2015
8491dfd
Fix deprecation warnings
mpdude Apr 2, 2015
beb307c
Fix unnecessary re-initialization from cache
mpdude Apr 2, 2015
dbec920
Add deprecation notice in UPGRADE-2.7
mpdude Apr 4, 2015
5a91716
Tests need a recent version of the Config component
mpdude Apr 4, 2015
f2c3a24
Explicitly add symfony/config dependency in an desperate attempt to m…
mpdude Apr 4, 2015
35488bd
Suggestions from GH
mpdude Apr 5, 2015
17a55ec
FabBot compliance
mpdude Apr 6, 2015
07ecf57
Bump composer dep
mpdude Apr 6, 2015
a89db7a
As in aa82fb065d970c1fd02bf35790e4da8970f45e7b
mpdude Apr 6, 2015
7938349
Update composer.json
mpdude Apr 6, 2015
cb9917f
Don't mess with composer.json where it is not necessary
mpdude Apr 7, 2015
2016537
The HttpKernel for sure depends on the Config component
mpdude Apr 7, 2015
beb0a92
Cleanup composer.json
mpdude Apr 7, 2015
afee2bb
Make sure at least symfony/config 2.7 is installed when loaded as a t…
mpdude Apr 7, 2015
4832e1a
symfony/config dev-master cannot be used unless changes from this PR …
mpdude Apr 7, 2015
7f90bae
Grammar fix in comment
mpdude Apr 7, 2015
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
Prev Previous commit
Next Next commit
Fix unnecessary re-initialization from cache
  • Loading branch information
@mpdude
mpdude committed Apr 6, 2015
commit beb307cbb1da9929bb7df3d29308f8188b79ca5a
10 changes: 8 additions & 2 deletions src/Symfony/Component/Translation/Translator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -367,6 +367,7 @@ protected function initializeCatalogue($locale)
private function initializeCacheCatalogue($locale)
{
if (isset($this->catalogues[$locale])) {
/* Catalogue already initialized. */
return;
}

Expand All @@ -376,11 +377,15 @@ private function initializeCacheCatalogue($locale)
$cache = $this->getConfigCacheFactory()->cache($cacheFile,
function (ConfigCacheInterface $cache) use ($self, $locale) {
$self->dumpCatalogue($locale, $cache);

return; // $this->catalogues[$locale] is now initialized
}
);

if (isset($this->catalogues[$locale])) {
/* Catalogue has been initialized as it was written out to cache. */
return;
}

/* Read catalogue from cache. */
$catalogue = include $cache->getPath();

/*
Expand Down Expand Up @@ -408,6 +413,7 @@ function (ConfigCacheInterface $cache) use ($self, $locale) {
unlink($cacheFile);
$this->initializeCacheCatalogue($locale);
} else {
/* Initialize with catalogue from cache. */
$this->catalogues[$locale] = $catalogue;
}
}
Expand Down