Skip to content
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

Forward port "always decorate Symfonys config_cache_factory service with WfdMetaConfigCacheFactory" to master for 4.0.x (Case 171239) #46

Merged
merged 5 commits into from
May 15, 2024
Merged

Forward port "always decorate Symfonys config_cache_factory service with WfdMetaConfigCacheFactory" to master for 4.0.x (Case 171239) #46

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ecf1c07
Move WfdMetaConfigCacheFactory service definition so it will be loade…
MalteWunsch May 15, 2024
f9b059c
Move service deprecation notice to legacy_aliases.yml
MalteWunsch May 15, 2024
8a333ea
Remove emptied config_cache_factory.xml
MalteWunsch May 15, 2024
a1912d4
Merge pull request #45 from webfactory/171239-always-use-wfdmetaconfi…
MalteWunsch May 15, 2024
715a569
Forward-port #45 into master for 4.0.x
MalteWunsch May 15, 2024
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: 0 additions & 2 deletions src/DependencyInjection/WebfactoryWfdMetaExtension.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,6 @@ public function load(array $configs, ContainerBuilder $container): void

if ($config['always_expire_wfd_meta_resources']) {
$yamlLoader->load('cache_busting.yml');
} else {
$xmlLoader->load('config_cache_factory.xml');
}
}
}
32 changes: 0 additions & 32 deletions src/Resources/config/config_cache_factory.xml
View file
Open in desktop

This file was deleted.

6 changes: 6 additions & 0 deletions src/Resources/config/legacy_aliases.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,3 +38,9 @@ services:
deprecated:
package: 'webfactory/wfdmeta-bundle'
version: '3.9.0'

webfactory_wfd_meta.config_cache_factory:
alias: 'Webfactory\Bundle\WfdMetaBundle\Config\WfdMetaConfigCacheFactory'
deprecated:
package: 'webfactory/wfdmeta-bundle'
version: '3.9.0'
15 changes: 15 additions & 0 deletions src/Resources/config/services.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,5 +36,20 @@
<tag name="controller.service_arguments"/>
</service>

<service id="Webfactory\Bundle\WfdMetaBundle\Config\WfdMetaConfigCacheFactory" decorates="config_cache_factory">
<argument type="service" id="Webfactory\Bundle\WfdMetaBundle\Config\WfdMetaConfigCacheFactory.inner" />
<argument type="service" id="Webfactory\Bundle\WfdMetaBundle\MetaQueryFactory" />
<argument type="service">
<service class="Symfony\Component\Lock\LockFactory">
<argument type="service">
<service class="Symfony\Component\Lock\Store\FlockStore" />
</argument>
<call method="setLogger">
<argument type="service" id="logger" on-invalid="ignore" />
</call>
<tag name="monolog.logger" channel="webfactory_wfd_meta" />
</service>
</argument>
</service>
</services>
</container>
Loading