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

Jump to bottom

IBX-1696: Rebranded Container parameters and Config Resolver namespaces #15

Merged
merged 1 commit into from
Feb 1, 2022
Merged

IBX-1696: Rebranded Container parameters and Config Resolver namespaces #15

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
6 changes: 3 additions & 3 deletions src/bundle/DependencyInjection/Compiler/KernelOverridePass.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,13 +59,13 @@ private function setStandardThemeDirectories(ContainerBuilder $container)
return;
}

$templatesPathMap = $container->hasParameter('ezdesign.templates_path_map')
? $container->getParameter('ezdesign.templates_path_map')
$templatesPathMap = $container->hasParameter('ibexa.design.templates.path_map')
? $container->getParameter('ibexa.design.templates.path_map')
: [];

$templatesPathMap['standard'][] = $path . '/Resources/views';

$container->setParameter('ezdesign.templates_path_map', $templatesPathMap);
$container->setParameter('ibexa.design.templates.path_map', $templatesPathMap);
}
}

Expand Down
6 changes: 3 additions & 3 deletions src/bundle/DependencyInjection/Compiler/StandardThemePass.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,17 +26,17 @@ class StandardThemePass implements CompilerPassInterface
*/
public function process(ContainerBuilder $container)
{
if (!$container->hasParameter('ezdesign.design_list')) {
if (!$container->hasParameter('ibexa.design.list')) {
return;
}

$designList = $container->getParameter('ezdesign.design_list');
$designList = $container->getParameter('ibexa.design.list');
foreach ($designList as $designName => $themes) {
if (!in_array('standard', $themes)) {
$designList[$designName][] = 'standard';
}
}
$container->setParameter('ezdesign.design_list', $designList);
$container->setParameter('ibexa.design.list', $designList);
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/bundle/DependencyInjection/IbexaStandardDesignExtension.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ class IbexaStandardDesignExtension extends Extension implements PrependExtension
{
public const EXTENSION_NAME = 'ibexa_standard_design';

public const OVERRIDE_KERNEL_TEMPLATES_PARAM_NAME = 'ez_platform_standard_design.override_kernel_templates';
public const OVERRIDE_KERNEL_TEMPLATES_PARAM_NAME = 'ibexa.design.standard.override_kernel_templates';

public function getAlias(): string
{
Expand Down
20 changes: 10 additions & 10 deletions src/bundle/Resources/config/override/ezpublish.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
parameters:
ezpublish.content_view.viewbase_layout: '@@ibexadesign/viewbase_layout.html.twig'
ibexa.content_view.viewbase_layout: '@@ibexadesign/viewbase_layout.html.twig'

ezplatform.default_view_templates.content.full: '@@ibexadesign/default/content/full.html.twig'
ezplatform.default_view_templates.content.line: '@@ibexadesign/default/content/line.html.twig'
ezplatform.default_view_templates.content.text_linked: '@@ibexadesign/default/content/text_linked.html.twig'
ezplatform.default_view_templates.content.embed: '@@ibexadesign/default/content/embed.html.twig'
ezplatform.default_view_templates.content.embed_image: '@@ibexadesign/default/content/embed_image.html.twig'
ezplatform.default_view_templates.block: '@@ibexadesign/default/block/block.html.twig'
ibexa.default_view_templates.content.full: '@@ibexadesign/default/content/full.html.twig'
ibexa.default_view_templates.content.line: '@@ibexadesign/default/content/line.html.twig'
ibexa.default_view_templates.content.text_linked: '@@ibexadesign/default/content/text_linked.html.twig'
ibexa.default_view_templates.content.embed: '@@ibexadesign/default/content/embed.html.twig'
ibexa.default_view_templates.content.embed_image: '@@ibexadesign/default/content/embed_image.html.twig'
ibexa.default_view_templates.block: '@@ibexadesign/default/block/block.html.twig'

ezplatform.default_templates.pagelayout: '@@ibexadesign/pagelayout.html.twig'
ezplatform.default_templates.field_templates: '@@ibexadesign/content_fields.html.twig'
ezplatform.default_templates.fielddefinition_settings_templates: '@@ibexadesign/fielddefinition_settings.html.twig'
ibexa.default_templates.pagelayout: '@@ibexadesign/pagelayout.html.twig'
ibexa.default_templates.field_templates: '@@ibexadesign/content_fields.html.twig'
ibexa.default_templates.fielddefinition_settings_templates: '@@ibexadesign/fielddefinition_settings.html.twig'
6 changes: 3 additions & 3 deletions tests/bundle/DependencyInjection/Compiler/KernelOverridePassTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ public function getTemplatesPathMap()
*/
protected function registerCompilerPass(ContainerBuilder $container): void
{
$container->setParameter('ez_platform_standard_design.override_kernel_templates', true);
$container->setParameter('ibexa.design.standard.override_kernel_templates', true);

$container->addCompilerPass(new KernelOverridePass());
}
Expand All @@ -47,7 +47,7 @@ protected function registerCompilerPass(ContainerBuilder $container): void
*/
public function testKernelViewsDirectoryIsMappedToStandardTheme(array $templatesPathMap)
{
$this->setParameter('ezdesign.templates_path_map', $templatesPathMap);
$this->setParameter('ibexa.design.templates.path_map', $templatesPathMap);
$this->setParameter(
'kernel.bundles_metadata',
[
Expand All @@ -62,7 +62,7 @@ public function testKernelViewsDirectoryIsMappedToStandardTheme(array $templates
$templatesPathMap['standard'][] = '/some/path/Resources/views';

self::assertContainerBuilderHasParameter(
'ezdesign.templates_path_map',
'ibexa.design.templates.path_map',
$templatesPathMap
);
}
Expand Down
4 changes: 2 additions & 2 deletions tests/bundle/DependencyInjection/Compiler/StandardThemePassTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,11 +64,11 @@ public function testStandardThemeIsAppendedToEveryDesign(
array $designList,
array $expectedDesignList
) {
$this->setParameter('ezdesign.design_list', $designList);
$this->setParameter('ibexa.design.list', $designList);

$this->compile();

self::assertContainerBuilderHasParameter('ezdesign.design_list', $expectedDesignList);
self::assertContainerBuilderHasParameter('ibexa.design.list', $expectedDesignList);
}

/**
Expand Down