Merge branch '1.2'

ezsystems · Jan 7, 2021 · f91a72c · f91a72c
2 parents 31befe0 + 207e48a
commit f91a72c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/eZ/Bundle/EzPublishCoreBundle/DependencyInjection/Configuration/Parser/Common.php b/eZ/Bundle/EzPublishCoreBundle/DependencyInjection/Configuration/Parser/Common.php
@@ -88,7 +88,7 @@ public function addSemanticConfig(NodeBuilder $nodeBuilder)
                 ->children()
                     ->scalarNode('name')
                         ->info('The session name. If you want a session name per siteaccess, use "{siteaccess_hash}" token. Will override default session name from framework.session.name')
-                        ->example(['session' => ['name' => 'eZSESSID{siteaccess_hash}']])
+                        ->example('eZSESSID{siteaccess_hash}')
                     ->end()
                     ->scalarNode('cookie_lifetime')->end()
                     ->scalarNode('cookie_path')->end()
@@ -134,11 +134,11 @@ public function addSemanticConfig(NodeBuilder $nodeBuilder)
                 ->children()
                     ->scalarNode('layout')
                         ->info('Layout template to use for user related actions. This is most likely the base pagelayout template of your site.')
-                        ->example(['layout' => 'eZDemoBundle::pagelayout.html.twig'])
+                        ->example('pagelayout.html.twig')
                     ->end()
                     ->scalarNode('login_template')
                         ->info('Template to use for login form. Defaults to EzPublishCoreBundle:security:login.html.twig')
-                        ->example(['login_template' => 'AcmeTestBundle:User:login.html.twig'])
+                        ->example('login.html.twig')
                     ->end()
                 ->end()
             ->end();

diff --git a/eZ/Bundle/EzPublishCoreBundle/DependencyInjection/Configuration/Parser/Image.php b/eZ/Bundle/EzPublishCoreBundle/DependencyInjection/Configuration/Parser/Image.php
@@ -75,7 +75,7 @@ public function addSemanticConfig(NodeBuilder $nodeBuilder)
                     ->children()
                         ->scalarNode('reference')
                             ->info('Tells the system which original variation to use as reference image. Defaults to original')
-                            ->example(['reference' => 'large'])
+                            ->example('large')
                         ->end()
                         ->arrayNode('filters')
                             ->info('A list of filters to run, each filter must be supported by the active image converters')