From b17a5c73de74d096c5abf13a85bdcda5b88924f0 Mon Sep 17 00:00:00 2001 From: Hristo Botev Date: Wed, 7 Aug 2019 15:10:47 -0700 Subject: [PATCH 1/2] Update default template referencing to use the default since Symfony 3.4 --- DependencyInjection/Configuration.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php index 90f8681..fcb3879 100644 --- a/DependencyInjection/Configuration.php +++ b/DependencyInjection/Configuration.php @@ -275,19 +275,19 @@ protected function addRenderSection($rootNode) ->addDefaultsIfNotSet() ->fixXmlConfig('resource') ->children() - ->scalarNode('path')->defaultValue('SpyTimelineBundle:Timeline')->end() - ->scalarNode('fallback')->defaultValue('SpyTimelineBundle:Timeline:default.html.twig')->end() + ->scalarNode('path')->defaultValue('@SpyTimeline/Timeline')->end() + ->scalarNode('fallback')->defaultValue('@SpyTimeline/Timeline/default.html.twig')->end() ->arrayNode('i18n') ->children() ->scalarNode('fallback')->isRequired()->end() ->end() ->end() ->arrayNode('resources') - ->defaultValue(array('SpyTimelineBundle:Action:components.html.twig')) + ->defaultValue(array('@SpyTimeline/Action/components.html.twig')) ->validate() - ->ifTrue(function ($v) { return !in_array('SpyTimelineBundle:Action:components.html.twig', $v); }) + ->ifTrue(function ($v) { return !in_array('@SpyTimeline/Action/components.html.twig', $v); }) ->then(function ($v) { - return array_merge(array('SpyTimelineBundle:Action:components.html.twig'), $v); + return array_merge(array('@SpyTimeline/Action/components.html.twig'), $v); }) ->end() ->prototype('scalar')->end() From 24b05638df5cbf4b18d8d2de6d36c15d286ec2cd Mon Sep 17 00:00:00 2001 From: Hristo Botev Date: Wed, 7 Aug 2019 15:34:01 -0700 Subject: [PATCH 2/2] Update unit test --- Tests/Units/DependencyInjection/Configuration.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Tests/Units/DependencyInjection/Configuration.php b/Tests/Units/DependencyInjection/Configuration.php index 1f0eef0..371ae26 100644 --- a/Tests/Units/DependencyInjection/Configuration.php +++ b/Tests/Units/DependencyInjection/Configuration.php @@ -76,10 +76,10 @@ protected function getDefaultOutput() 'delivery' => 'immediate', ), 'render' => array( - 'path' => 'SpyTimelineBundle:Timeline', - 'fallback' => 'SpyTimelineBundle:Timeline:default.html.twig', + 'path' => '@SpyTimeline/Timeline', + 'fallback' => '@SpyTimeline/Timeline/default.html.twig', 'resources' => array( - 'SpyTimelineBundle:Action:components.html.twig', + '@SpyTimeline/Action/components.html.twig', ), ), 'query_builder' => array(