Merge pull request #214 from collapso/master

Update default template referencing to use the default since Symfony 3.4
stephpy · Aug 9, 2019 · 207adaf · 207adaf
2 parents a33e11e + 24b0563
commit 207adaf
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git 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()

diff --git 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(