Parcourir la source

Fix default configuration

Thomas Rabaix il y a 13 ans
Parent
commit
92a253c365

+ 1 - 1
DependencyInjection/Compiler/AddDependencyCallsCompilerPass.php

@@ -20,7 +20,7 @@ use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\Config\Definition\Exception\InvalidConfigurationException;
 
 /**
- * Add all dependencies to the Admin class, this avoid to write to many lines
+ * Add all dependencies to the Admin class, this avoid to write too many lines
  * in the configuration files.
  *
  * @author Thomas Rabaix <thomas.rabaix@sonata-project.org>

+ 6 - 5
DependencyInjection/Configuration.php

@@ -82,12 +82,13 @@ class Configuration implements ConfigurationInterface
                 ->end()
 
                 ->arrayNode('templates')
+                    ->addDefaultsIfNotSet()
                     ->children()
-                        ->scalarNode('layout')->defaultValue('SonataAdminBundle::standard_layout.html.twig')->end()
-                        ->scalarNode('ajax')->defaultValue('SonataAdminBundle::ajax_layout.html.twig')->end()
-                        ->scalarNode('list')->defaultValue('SonataAdminBundle:CRUD:list.html.twig')->end()
-                        ->scalarNode('show')->defaultValue('SonataAdminBundle:CRUD:show.html.twig')->end()
-                        ->scalarNode('edit')->defaultValue('SonataAdminBundle:CRUD:edit.html.twig')->end()
+                        ->scalarNode('layout')->defaultValue('SonataAdminBundle::standard_layout.html.twig')->isRequired()->cannotBeEmpty()->end()
+                        ->scalarNode('ajax')->defaultValue('SonataAdminBundle::ajax_layout.html.twig')->isRequired()->cannotBeEmpty()->end()
+                        ->scalarNode('list')->defaultValue('SonataAdminBundle:CRUD:list.html.twig')->isRequired()->cannotBeEmpty()->end()
+                        ->scalarNode('show')->defaultValue('SonataAdminBundle:CRUD:show.html.twig')->isRequired()->cannotBeEmpty()->end()
+                        ->scalarNode('edit')->defaultValue('SonataAdminBundle:CRUD:edit.html.twig')->isRequired()->cannotBeEmpty()->end()
                     ->end()
                 ->end()
             ->end()