From bb2a957a6e4d70dc8110013b8ea6056196b9ced3 Mon Sep 17 00:00:00 2001 From: Javier Eguiluz Date: Mon, 30 Mar 2015 21:47:20 +0200 Subject: [PATCH] Introduced a new "design" global option --- DependencyInjection/Configuration.php | 214 ++++++++++++++---- Resources/doc/10-customizing-design.md | 72 +++--- Resources/views/layout.html.twig | 4 +- .../configurations/output/config_001.yml | 15 +- .../configurations/output/config_002.yml | 15 +- .../configurations/output/config_003.yml | 15 +- .../configurations/output/config_004.yml | 15 +- .../configurations/output/config_005.yml | 15 +- .../configurations/output/config_006.yml | 15 +- .../configurations/output/config_007.yml | 15 +- .../configurations/output/config_008.yml | 15 +- .../configurations/output/config_009.yml | 15 +- .../configurations/output/config_010.yml | 15 +- .../configurations/output/config_011.yml | 15 +- .../configurations/output/config_012.yml | 15 +- .../configurations/output/config_013.yml | 15 +- .../configurations/output/config_014.yml | 15 +- .../configurations/output/config_015.yml | 15 +- .../configurations/output/config_016.yml | 15 +- .../configurations/output/config_017.yml | 15 +- .../configurations/output/config_018.yml | 15 +- .../configurations/output/config_019.yml | 15 +- .../configurations/output/config_020.yml | 15 +- .../configurations/output/config_021.yml | 15 +- .../configurations/output/config_022.yml | 15 +- .../configurations/output/config_023.yml | 15 +- .../configurations/output/config_024.yml | 15 +- .../configurations/output/config_025.yml | 15 +- .../configurations/output/config_026.yml | 15 +- .../configurations/output/config_027.yml | 15 +- .../configurations/output/config_028.yml | 15 +- .../configurations/output/config_029.yml | 15 +- .../configurations/output/config_030.yml | 15 +- .../configurations/output/config_031.yml | 15 +- .../configurations/output/config_032.yml | 15 +- .../configurations/output/config_033.yml | 15 +- .../configurations/output/config_034.yml | 15 +- .../configurations/output/config_035.yml | 15 +- .../configurations/output/config_036.yml | 15 +- .../configurations/output/config_037.yml | 15 +- .../configurations/output/config_038.yml | 15 +- .../configurations/output/config_039.yml | 15 +- .../configurations/output/config_040.yml | 15 +- .../configurations/output/config_041.yml | 15 +- .../configurations/output/config_042.yml | 15 +- .../configurations/output/config_043.yml | 15 +- .../configurations/output/config_044.yml | 15 +- .../configurations/output/config_045.yml | 15 +- .../configurations/output/config_046.yml | 15 +- .../configurations/output/config_047.yml | 15 +- .../configurations/output/config_048.yml | 15 +- .../configurations/output/config_049.yml | 15 +- .../configurations/output/config_050.yml | 15 +- .../configurations/output/config_051.yml | 15 +- .../configurations/output/config_052.yml | 15 +- .../configurations/output/config_053.yml | 15 +- .../configurations/output/config_054.yml | 15 +- .../configurations/output/config_055.yml | 15 +- .../configurations/output/config_056.yml | 15 +- .../configurations/output/config_057.yml | 7 +- .../configurations/output/config_058.yml | 7 +- .../configurations/output/config_059.yml | 7 +- .../configurations/output/config_060.yml | 7 +- .../configurations/output/config_061.yml | 7 +- .../configurations/output/config_062.yml | 7 +- .../configurations/output/config_063.yml | 7 +- .../configurations/output/config_064.yml | 7 +- .../configurations/output/config_065.yml | 7 +- .../configurations/output/config_066.yml | 15 +- .../configurations/output/config_067.yml | 7 +- .../configurations/output/config_068.yml | 15 +- .../configurations/output/config_069.yml | 15 +- .../configurations/output/config_070.yml | 15 +- .../configurations/output/config_071.yml | 15 +- .../configurations/output/config_072.yml | 7 +- .../configurations/output/config_073.yml | 7 +- .../configurations/output/config_074.yml | 7 +- .../configurations/output/config_075.yml | 7 +- .../configurations/output/config_076.yml | 7 +- .../configurations/output/config_077.yml | 7 +- .../configurations/output/config_078.yml | 7 +- .../configurations/output/config_079.yml | 7 +- .../configurations/output/config_080.yml | 7 +- .../configurations/output/config_081.yml | 7 +- .../configurations/output/config_082.yml | 15 +- .../fixtures/deprecations/input/admin_008.yml | 12 + .../fixtures/deprecations/input/admin_009.yml | 12 + .../fixtures/deprecations/input/admin_010.yml | 17 ++ .../fixtures/deprecations/input/admin_011.yml | 19 ++ .../fixtures/deprecations/input/admin_012.yml | 19 ++ .../deprecations/output/config_001.yml | 15 +- .../deprecations/output/config_002.yml | 15 +- .../deprecations/output/config_003.yml | 15 +- .../deprecations/output/config_004.yml | 15 +- .../deprecations/output/config_005.yml | 15 +- .../deprecations/output/config_006.yml | 15 +- .../deprecations/output/config_007.yml | 15 +- .../deprecations/output/config_008.yml | 24 ++ .../deprecations/output/config_009.yml | 24 ++ .../deprecations/output/config_010.yml | 28 +++ .../deprecations/output/config_011.yml | 24 ++ .../deprecations/output/config_012.yml | 24 ++ 102 files changed, 1045 insertions(+), 623 deletions(-) create mode 100644 Tests/DependencyInjection/fixtures/deprecations/input/admin_008.yml create mode 100644 Tests/DependencyInjection/fixtures/deprecations/input/admin_009.yml create mode 100644 Tests/DependencyInjection/fixtures/deprecations/input/admin_010.yml create mode 100644 Tests/DependencyInjection/fixtures/deprecations/input/admin_011.yml create mode 100644 Tests/DependencyInjection/fixtures/deprecations/input/admin_012.yml create mode 100644 Tests/DependencyInjection/fixtures/deprecations/output/config_008.yml create mode 100644 Tests/DependencyInjection/fixtures/deprecations/output/config_009.yml create mode 100644 Tests/DependencyInjection/fixtures/deprecations/output/config_010.yml create mode 100644 Tests/DependencyInjection/fixtures/deprecations/output/config_011.yml create mode 100644 Tests/DependencyInjection/fixtures/deprecations/output/config_012.yml diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php index 098c4365aa..a65909565f 100644 --- a/DependencyInjection/Configuration.php +++ b/DependencyInjection/Configuration.php @@ -11,6 +11,7 @@ namespace JavierEguiluz\Bundle\EasyAdminBundle\DependencyInjection; +use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition; use Symfony\Component\Config\Definition\Builder\TreeBuilder; use Symfony\Component\Config\Definition\ConfigurationInterface; @@ -21,9 +22,20 @@ public function getConfigTreeBuilder() $treeBuilder = new TreeBuilder(); $rootNode = $treeBuilder->root('easy_admin'); + $this->addDeprecationsSection($rootNode); + $this->addGlobalOptionsSection($rootNode); + $this->addDesignSection($rootNode); + $this->addViewsSection($rootNode); + $this->addEntitiesSection($rootNode); + + return $treeBuilder; + } + + private function addDeprecationsSection(ArrayNodeDefinition $rootNode) + { $rootNode - // 'list_actions' and 'max_results' global options are deprecated since 1.0.8 - // and they are replaced by 'list -> 'actions' and 'list -> max_results' options + // 'list_max_results' global option was deprecated in 1.0.8 + // and replaced by 'list -> max_results' ->beforeNormalization() ->ifTrue(function ($v) { return isset($v['list_max_results']); }) ->then(function ($v) { @@ -42,6 +54,8 @@ public function getConfigTreeBuilder() }) ->end() + // 'list_actions' global option was deprecated in 1.0.8 + // and replaced by 'list -> actions' ->beforeNormalization() ->ifTrue(function ($v) { return isset($v['list_actions']); }) ->then(function ($v) { @@ -56,20 +70,158 @@ public function getConfigTreeBuilder() }) ->end() + // make sure the new 'design' global option exists to simplify + // updating the deprecated 'assets -> css' and 'assets -> js' options + ->beforeNormalization() + ->always() + ->then(function ($v) { + if (!isset($v['design'])) { + $v['design'] = array('assets' => array()); + } + + return $v; + }) + ->end() + + // 'assets -> css' global option was deprecated in 1.1.0 + // and replaced by 'design -> assets -> css' + ->beforeNormalization() + ->ifTrue(function ($v) { return isset($v['assets']['css']); }) + ->then(function ($v) { + // if the new option is defined, don't override it with the legacy option + if (!isset($v['design']['assets']['css'])) { + $v['design']['assets']['css'] = $v['assets']['css']; + } + + unset($v['assets']['css']); + + return $v; + }) + ->end() + + // 'assets -> js' global option was deprecated in 1.1.0 + // and replaced by 'design -> assets -> js' + ->beforeNormalization() + ->ifTrue(function ($v) { return isset($v['assets']['js']); }) + ->then(function ($v) { + // if the new option is defined, don't override it with the legacy option + if (!isset($v['design']['assets']['js'])) { + $v['design']['assets']['js'] = $v['assets']['js']; + } + + unset($v['assets']['js']); + + return $v; + }) + ->end() + + // after updating 'assets -> css' and 'assets -> js' deprecated options, + // remove the parent 'assets' deprecated option if it's defined + ->beforeNormalization() + ->always() + ->then(function ($v) { + if (isset($v['assets'])) { + unset($v['assets']); + } + + return $v; + }) + ->end() + + ->children() + ->variableNode('list_actions') + ->info('DEPRECATED: use the "actions" option of the "list" view.') + ->end() + + ->integerNode('list_max_results') + ->info('DEPRECATED: use "max_results" option under the "list" global key.') + ->end() + + ->arrayNode('assets') + ->performNoDeepMerging() + ->children() + ->arrayNode('css') + ->info('DEPRECATED: use the "design -> assets -> css" option.') + ->end() + ->arrayNode('js') + ->info('DEPRECATED: use the "design -> assets -> js" option.') + ->end() + ->end() + ->end() + ->end() + ; + } + + private function addGlobalOptionsSection(ArrayNodeDefinition $rootNode) + { + $rootNode ->children() ->scalarNode('site_name') ->defaultValue('Easy Admin') ->info('The name displayed as the title of the administration zone (e.g. company name, project name).') ->end() - ->variableNode('list_actions') - ->info('DEPRECATED: use the "actions" option of the "list" view.') + ->arrayNode('formats') + ->performNoDeepMerging() + ->addDefaultsIfNotSet() + ->children() + ->scalarNode('date') + ->defaultValue('Y-m-d') + ->info('The PHP date format applied to "date" field types.') + ->example('d/m/Y (see http://php.net/manual/en/function.date.php)') + ->end() + ->scalarNode('time') + ->defaultValue('H:i:s') + ->info('The PHP time format applied to "time" field types.') + ->example('h:i a (see http://php.net/date)') + ->end() + ->scalarNode('datetime') + ->defaultValue('F j, Y H:i') + ->info('The PHP date/time format applied to "datetime" field types.') + ->example('l, F jS Y / h:i (see http://php.net/date)') + ->end() + ->scalarNode('number') + ->info('The sprintf-compatible format applied to numeric values.') + ->example('%.2d (see http://php.net/sprintf)') + ->end() + ->end() ->end() + ->end() + ; + } - ->integerNode('list_max_results') - ->info('DEPRECATED: use "max_results" option under the "list" global key.') + private function addDesignSection(ArrayNodeDefinition $rootNode) + { + $rootNode + ->children() + ->arrayNode('design') + ->performNoDeepMerging() + ->addDefaultsIfNotSet() + ->children() + ->arrayNode('assets') + ->performNoDeepMerging() + ->addDefaultsIfNotSet() + ->children() + ->arrayNode('css') + ->prototype('scalar')->end() + ->info('The array of CSS assets to load in all backend pages.') + ->end() + ->arrayNode('js') + ->prototype('scalar')->end() + ->info('The array of JavaScript assets to load in all backend pages.') + ->end() + ->end() + ->end() + ->end() ->end() + ->end() + ; + } + private function addViewsSection(ArrayNodeDefinition $rootNode) + { + $rootNode + ->children() ->arrayNode('list') ->addDefaultsIfNotSet() ->children() @@ -113,55 +265,19 @@ public function getConfigTreeBuilder() ->end() ->end() ->end() + ->end() + ; + } - ->arrayNode('assets') - ->performNoDeepMerging() - ->addDefaultsIfNotSet() - ->children() - ->arrayNode('css') - ->prototype('scalar')->end() - ->info('The array of CSS assets to load in all backend pages.') - ->end() - ->arrayNode('js') - ->prototype('scalar')->end() - ->info('The array of JavaScript assets to load in all backend pages.') - ->end() - ->end() - ->end() - - ->arrayNode('formats') - ->performNoDeepMerging() - ->addDefaultsIfNotSet() - ->children() - ->scalarNode('date') - ->defaultValue('Y-m-d') - ->info('The PHP date format applied to "date" field types.') - ->example('d/m/Y (see http://php.net/manual/en/function.date.php)') - ->end() - ->scalarNode('time') - ->defaultValue('H:i:s') - ->info('The PHP time format applied to "time" field types.') - ->example('h:i a (see http://php.net/date)') - ->end() - ->scalarNode('datetime') - ->defaultValue('F j, Y H:i') - ->info('The PHP date/time format applied to "datetime" field types.') - ->example('l, F jS Y / h:i (see http://php.net/date)') - ->end() - ->scalarNode('number') - ->info('The sprintf-compatible format applied to numeric values.') - ->example('%.2d (see http://php.net/sprintf)') - ->end() - ->end() - ->end() - + private function addEntitiesSection(ArrayNodeDefinition $rootNode) + { + $rootNode + ->children() ->variableNode('entities') ->defaultValue(array()) ->info('The list of entities to manage in the administration zone.') ->end() ->end() ; - - return $treeBuilder; } } diff --git a/Resources/doc/10-customizing-design.md b/Resources/doc/10-customizing-design.md index 2c5890dd1e..805e5fa4cb 100644 --- a/Resources/doc/10-customizing-design.md +++ b/Resources/doc/10-customizing-design.md @@ -1,19 +1,32 @@ Chapter 10. Customizing the Visual Design of the Backend ======================================================== -The current version of EasyAdmin doesn't support the concept of themes, but you -can fully customize its design using CSS and JavaScript files. Define the -`assets` option to load your own web assets: +The current version of EasyAdmin doesn't support the concept of themes. +However, you can customize lots of options related to the visual design of your +backend. All these options are defined under the global `design` option: ```yaml easy_admin: - assets: - css: - - 'bundles/app/css/admin1.css' - - 'bundles/acmedemo/css/admin2.css' - js: - - 'bundles/app/js/admin1.js' - - 'bundles/acmedemo/js/admin2.js' + design: + # ... +``` + +Adding Custom Web Assets +------------------------ + +Use the `assets` option to define the web assets (CSS and JavaScript files) +that should be loaded in the backend layout: + +```yaml +easy_admin: + design: + assets: + css: + - 'bundles/app/css/admin1.css' + - 'bundles/acmedemo/css/admin2.css' + js: + - 'bundles/app/js/admin1.js' + - 'bundles/acmedemo/js/admin2.js' # ... ``` @@ -22,25 +35,26 @@ absolute) and links to them accordingly: ```yaml easy_admin: - assets: - css: - # HTTP protocol-relative URL - - '//example.org/css/admin1.css' - # absolute non-secure URL - - 'http://example.org/css/admin2.css' - # absolute secure URL - - 'https://example.org/css/admin3.css' - # absolute internal bundle URL - - '/bundles/acmedemo/css/admin4.css' - # relative internal bundle URL - - 'bundles/app/css/admin5.css' - js: - # this option works exactly the same as the 'css' option - - '//example.org/js/admin1.js' - - 'http://example.org/js/admin2.js' - - 'https://example.org/js/admin3.js' - - '/bundles/acmedemo/js/admin4.js' - - 'bundles/app/js/admin5.js' + design: + assets: + css: + # HTTP protocol-relative URL + - '//example.org/css/admin1.css' + # absolute non-secure URL + - 'http://example.org/css/admin2.css' + # absolute secure URL + - 'https://example.org/css/admin3.css' + # absolute internal bundle URL + - '/bundles/acmedemo/css/admin4.css' + # relative internal bundle URL + - 'bundles/app/css/admin5.css' + js: + # this option works exactly the same as the 'css' option + - '//example.org/js/admin1.js' + - 'http://example.org/js/admin2.js' + - 'https://example.org/js/admin3.js' + - '/bundles/acmedemo/js/admin4.js' + - 'bundles/app/js/admin5.js' # ... ``` diff --git a/Resources/views/layout.html.twig b/Resources/views/layout.html.twig index a92cd3dccb..9095835377 100644 --- a/Resources/views/layout.html.twig +++ b/Resources/views/layout.html.twig @@ -16,7 +16,7 @@ {% endblock %} - {% for css_asset in easyadmin_config('assets.css') %} + {% for css_asset in easyadmin_config('design.assets.css') %} {% endfor %} @@ -103,7 +103,7 @@ {% endblock %} - {% for js_asset in easyadmin_config('assets.js') %} + {% for js_asset in easyadmin_config('design.assets.js') %} {% endfor %} diff --git a/Tests/DependencyInjection/fixtures/configurations/output/config_001.yml b/Tests/DependencyInjection/fixtures/configurations/output/config_001.yml index 3749c6577b..4ab3516994 100644 --- a/Tests/DependencyInjection/fixtures/configurations/output/config_001.yml +++ b/Tests/DependencyInjection/fixtures/configurations/output/config_001.yml @@ -82,7 +82,15 @@ easy_admin: label: action.edit class: '' icon: edit + design: + assets: + css: { } + js: { } site_name: 'Easy Admin' + formats: + date: Y-m-d + time: 'H:i:s' + datetime: 'F j, Y H:i' list: actions: { } max_results: 15 @@ -92,10 +100,3 @@ easy_admin: actions: { } show: actions: { } - assets: - css: { } - js: { } - formats: - date: Y-m-d - time: 'H:i:s' - datetime: 'F j, Y H:i' diff --git a/Tests/DependencyInjection/fixtures/configurations/output/config_002.yml b/Tests/DependencyInjection/fixtures/configurations/output/config_002.yml index 2d13bfb990..a5fc8995cd 100644 --- a/Tests/DependencyInjection/fixtures/configurations/output/config_002.yml +++ b/Tests/DependencyInjection/fixtures/configurations/output/config_002.yml @@ -164,7 +164,15 @@ easy_admin: label: action.edit class: '' icon: edit + design: + assets: + css: { } + js: { } site_name: 'Easy Admin' + formats: + date: Y-m-d + time: 'H:i:s' + datetime: 'F j, Y H:i' list: actions: { } max_results: 15 @@ -174,10 +182,3 @@ easy_admin: actions: { } show: actions: { } - assets: - css: { } - js: { } - formats: - date: Y-m-d - time: 'H:i:s' - datetime: 'F j, Y H:i' diff --git a/Tests/DependencyInjection/fixtures/configurations/output/config_003.yml b/Tests/DependencyInjection/fixtures/configurations/output/config_003.yml index cb6c764a04..58183bf954 100644 --- a/Tests/DependencyInjection/fixtures/configurations/output/config_003.yml +++ b/Tests/DependencyInjection/fixtures/configurations/output/config_003.yml @@ -164,7 +164,15 @@ easy_admin: label: action.edit class: '' icon: edit + design: + assets: + css: { } + js: { } site_name: 'Easy Admin' + formats: + date: Y-m-d + time: 'H:i:s' + datetime: 'F j, Y H:i' list: actions: { } max_results: 15 @@ -174,10 +182,3 @@ easy_admin: actions: { } show: actions: { } - assets: - css: { } - js: { } - formats: - date: Y-m-d - time: 'H:i:s' - datetime: 'F j, Y H:i' diff --git a/Tests/DependencyInjection/fixtures/configurations/output/config_004.yml b/Tests/DependencyInjection/fixtures/configurations/output/config_004.yml index 3749c6577b..4ab3516994 100644 --- a/Tests/DependencyInjection/fixtures/configurations/output/config_004.yml +++ b/Tests/DependencyInjection/fixtures/configurations/output/config_004.yml @@ -82,7 +82,15 @@ easy_admin: label: action.edit class: '' icon: edit + design: + assets: + css: { } + js: { } site_name: 'Easy Admin' + formats: + date: Y-m-d + time: 'H:i:s' + datetime: 'F j, Y H:i' list: actions: { } max_results: 15 @@ -92,10 +100,3 @@ easy_admin: actions: { } show: actions: { } - assets: - css: { } - js: { } - formats: - date: Y-m-d - time: 'H:i:s' - datetime: 'F j, Y H:i' diff --git a/Tests/DependencyInjection/fixtures/configurations/output/config_005.yml b/Tests/DependencyInjection/fixtures/configurations/output/config_005.yml index 1d92553a1f..6652c57140 100644 --- a/Tests/DependencyInjection/fixtures/configurations/output/config_005.yml +++ b/Tests/DependencyInjection/fixtures/configurations/output/config_005.yml @@ -82,7 +82,15 @@ easy_admin: label: action.edit class: '' icon: edit + design: + assets: + css: { } + js: { } site_name: 'Easy Admin' + formats: + date: Y-m-d + time: 'H:i:s' + datetime: 'F j, Y H:i' list: actions: { } max_results: 15 @@ -92,10 +100,3 @@ easy_admin: actions: { } show: actions: { } - assets: - css: { } - js: { } - formats: - date: Y-m-d - time: 'H:i:s' - datetime: 'F j, Y H:i' diff --git a/Tests/DependencyInjection/fixtures/configurations/output/config_006.yml b/Tests/DependencyInjection/fixtures/configurations/output/config_006.yml index 8ed5e62b4b..96115d610e 100644 --- a/Tests/DependencyInjection/fixtures/configurations/output/config_006.yml +++ b/Tests/DependencyInjection/fixtures/configurations/output/config_006.yml @@ -82,7 +82,15 @@ easy_admin: label: action.edit class: '' icon: edit + design: + assets: + css: { } + js: { } site_name: 'Easy Admin' + formats: + date: Y-m-d + time: 'H:i:s' + datetime: 'F j, Y H:i' list: actions: { } max_results: 15 @@ -92,10 +100,3 @@ easy_admin: actions: { } show: actions: { } - assets: - css: { } - js: { } - formats: - date: Y-m-d - time: 'H:i:s' - datetime: 'F j, Y H:i' diff --git a/Tests/DependencyInjection/fixtures/configurations/output/config_007.yml b/Tests/DependencyInjection/fixtures/configurations/output/config_007.yml index 3749c6577b..4ab3516994 100644 --- a/Tests/DependencyInjection/fixtures/configurations/output/config_007.yml +++ b/Tests/DependencyInjection/fixtures/configurations/output/config_007.yml @@ -82,7 +82,15 @@ easy_admin: label: action.edit class: '' icon: edit + design: + assets: + css: { } + js: { } site_name: 'Easy Admin' + formats: + date: Y-m-d + time: 'H:i:s' + datetime: 'F j, Y H:i' list: actions: { } max_results: 15 @@ -92,10 +100,3 @@ easy_admin: actions: { } show: actions: { } - assets: - css: { } - js: { } - formats: - date: Y-m-d - time: 'H:i:s' - datetime: 'F j, Y H:i' diff --git a/Tests/DependencyInjection/fixtures/configurations/output/config_008.yml b/Tests/DependencyInjection/fixtures/configurations/output/config_008.yml index 1d92553a1f..6652c57140 100644 --- a/Tests/DependencyInjection/fixtures/configurations/output/config_008.yml +++ b/Tests/DependencyInjection/fixtures/configurations/output/config_008.yml @@ -82,7 +82,15 @@ easy_admin: label: action.edit class: '' icon: edit + design: + assets: + css: { } + js: { } site_name: 'Easy Admin' + formats: + date: Y-m-d + time: 'H:i:s' + datetime: 'F j, Y H:i' list: actions: { } max_results: 15 @@ -92,10 +100,3 @@ easy_admin: actions: { } show: actions: { } - assets: - css: { } - js: { } - formats: - date: Y-m-d - time: 'H:i:s' - datetime: 'F j, Y H:i' diff --git a/Tests/DependencyInjection/fixtures/configurations/output/config_009.yml b/Tests/DependencyInjection/fixtures/configurations/output/config_009.yml index 3749c6577b..4ab3516994 100644 --- a/Tests/DependencyInjection/fixtures/configurations/output/config_009.yml +++ b/Tests/DependencyInjection/fixtures/configurations/output/config_009.yml @@ -82,7 +82,15 @@ easy_admin: label: action.edit class: '' icon: edit + design: + assets: + css: { } + js: { } site_name: 'Easy Admin' + formats: + date: Y-m-d + time: 'H:i:s' + datetime: 'F j, Y H:i' list: actions: { } max_results: 15 @@ -92,10 +100,3 @@ easy_admin: actions: { } show: actions: { } - assets: - css: { } - js: { } - formats: - date: Y-m-d - time: 'H:i:s' - datetime: 'F j, Y H:i' diff --git a/Tests/DependencyInjection/fixtures/configurations/output/config_010.yml b/Tests/DependencyInjection/fixtures/configurations/output/config_010.yml index 1d92553a1f..6652c57140 100644 --- a/Tests/DependencyInjection/fixtures/configurations/output/config_010.yml +++ b/Tests/DependencyInjection/fixtures/configurations/output/config_010.yml @@ -82,7 +82,15 @@ easy_admin: label: action.edit class: '' icon: edit + design: + assets: + css: { } + js: { } site_name: 'Easy Admin' + formats: + date: Y-m-d + time: 'H:i:s' + datetime: 'F j, Y H:i' list: actions: { } max_results: 15 @@ -92,10 +100,3 @@ easy_admin: actions: { } show: actions: { } - assets: - css: { } - js: { } - formats: - date: Y-m-d - time: 'H:i:s' - datetime: 'F j, Y H:i' diff --git a/Tests/DependencyInjection/fixtures/configurations/output/config_011.yml b/Tests/DependencyInjection/fixtures/configurations/output/config_011.yml index 8ed5e62b4b..96115d610e 100644 --- a/Tests/DependencyInjection/fixtures/configurations/output/config_011.yml +++ b/Tests/DependencyInjection/fixtures/configurations/output/config_011.yml @@ -82,7 +82,15 @@ easy_admin: label: action.edit class: '' icon: edit + design: + assets: + css: { } + js: { } site_name: 'Easy Admin' + formats: + date: Y-m-d + time: 'H:i:s' + datetime: 'F j, Y H:i' list: actions: { } max_results: 15 @@ -92,10 +100,3 @@ easy_admin: actions: { } show: actions: { } - assets: - css: { } - js: { } - formats: - date: Y-m-d - time: 'H:i:s' - datetime: 'F j, Y H:i' diff --git a/Tests/DependencyInjection/fixtures/configurations/output/config_012.yml b/Tests/DependencyInjection/fixtures/configurations/output/config_012.yml index 4d0c343c0d..170c0db0af 100644 --- a/Tests/DependencyInjection/fixtures/configurations/output/config_012.yml +++ b/Tests/DependencyInjection/fixtures/configurations/output/config_012.yml @@ -164,7 +164,15 @@ easy_admin: label: action.edit class: '' icon: edit + design: + assets: + css: { } + js: { } site_name: 'Easy Admin' + formats: + date: Y-m-d + time: 'H:i:s' + datetime: 'F j, Y H:i' list: actions: { } max_results: 15 @@ -174,10 +182,3 @@ easy_admin: actions: { } show: actions: { } - assets: - css: { } - js: { } - formats: - date: Y-m-d - time: 'H:i:s' - datetime: 'F j, Y H:i' diff --git a/Tests/DependencyInjection/fixtures/configurations/output/config_013.yml b/Tests/DependencyInjection/fixtures/configurations/output/config_013.yml index 3749c6577b..4ab3516994 100644 --- a/Tests/DependencyInjection/fixtures/configurations/output/config_013.yml +++ b/Tests/DependencyInjection/fixtures/configurations/output/config_013.yml @@ -82,7 +82,15 @@ easy_admin: label: action.edit class: '' icon: edit + design: + assets: + css: { } + js: { } site_name: 'Easy Admin' + formats: + date: Y-m-d + time: 'H:i:s' + datetime: 'F j, Y H:i' list: actions: { } max_results: 15 @@ -92,10 +100,3 @@ easy_admin: actions: { } show: actions: { } - assets: - css: { } - js: { } - formats: - date: Y-m-d - time: 'H:i:s' - datetime: 'F j, Y H:i' diff --git a/Tests/DependencyInjection/fixtures/configurations/output/config_014.yml b/Tests/DependencyInjection/fixtures/configurations/output/config_014.yml index 1d92553a1f..6652c57140 100644 --- a/Tests/DependencyInjection/fixtures/configurations/output/config_014.yml +++ b/Tests/DependencyInjection/fixtures/configurations/output/config_014.yml @@ -82,7 +82,15 @@ easy_admin: label: action.edit class: '' icon: edit + design: + assets: + css: { } + js: { } site_name: 'Easy Admin' + formats: + date: Y-m-d + time: 'H:i:s' + datetime: 'F j, Y H:i' list: actions: { } max_results: 15 @@ -92,10 +100,3 @@ easy_admin: actions: { } show: actions: { } - assets: - css: { } - js: { } - formats: - date: Y-m-d - time: 'H:i:s' - datetime: 'F j, Y H:i' diff --git a/Tests/DependencyInjection/fixtures/configurations/output/config_015.yml b/Tests/DependencyInjection/fixtures/configurations/output/config_015.yml index 8ed5e62b4b..96115d610e 100644 --- a/Tests/DependencyInjection/fixtures/configurations/output/config_015.yml +++ b/Tests/DependencyInjection/fixtures/configurations/output/config_015.yml @@ -82,7 +82,15 @@ easy_admin: label: action.edit class: '' icon: edit + design: + assets: + css: { } + js: { } site_name: 'Easy Admin' + formats: + date: Y-m-d + time: 'H:i:s' + datetime: 'F j, Y H:i' list: actions: { } max_results: 15 @@ -92,10 +100,3 @@ easy_admin: actions: { } show: actions: { } - assets: - css: { } - js: { } - formats: - date: Y-m-d - time: 'H:i:s' - datetime: 'F j, Y H:i' diff --git a/Tests/DependencyInjection/fixtures/configurations/output/config_016.yml b/Tests/DependencyInjection/fixtures/configurations/output/config_016.yml index 91f7c77262..c3442216f3 100644 --- a/Tests/DependencyInjection/fixtures/configurations/output/config_016.yml +++ b/Tests/DependencyInjection/fixtures/configurations/output/config_016.yml @@ -164,7 +164,15 @@ easy_admin: label: action.edit class: '' icon: edit + design: + assets: + css: { } + js: { } site_name: 'Easy Admin' + formats: + date: Y-m-d + time: 'H:i:s' + datetime: 'F j, Y H:i' list: actions: { } max_results: 15 @@ -174,10 +182,3 @@ easy_admin: actions: { } show: actions: { } - assets: - css: { } - js: { } - formats: - date: Y-m-d - time: 'H:i:s' - datetime: 'F j, Y H:i' diff --git a/Tests/DependencyInjection/fixtures/configurations/output/config_017.yml b/Tests/DependencyInjection/fixtures/configurations/output/config_017.yml index 3749c6577b..4ab3516994 100644 --- a/Tests/DependencyInjection/fixtures/configurations/output/config_017.yml +++ b/Tests/DependencyInjection/fixtures/configurations/output/config_017.yml @@ -82,7 +82,15 @@ easy_admin: label: action.edit class: '' icon: edit + design: + assets: + css: { } + js: { } site_name: 'Easy Admin' + formats: + date: Y-m-d + time: 'H:i:s' + datetime: 'F j, Y H:i' list: actions: { } max_results: 15 @@ -92,10 +100,3 @@ easy_admin: actions: { } show: actions: { } - assets: - css: { } - js: { } - formats: - date: Y-m-d - time: 'H:i:s' - datetime: 'F j, Y H:i' diff --git a/Tests/DependencyInjection/fixtures/configurations/output/config_018.yml b/Tests/DependencyInjection/fixtures/configurations/output/config_018.yml index 1d92553a1f..6652c57140 100644 --- a/Tests/DependencyInjection/fixtures/configurations/output/config_018.yml +++ b/Tests/DependencyInjection/fixtures/configurations/output/config_018.yml @@ -82,7 +82,15 @@ easy_admin: label: action.edit class: '' icon: edit + design: + assets: + css: { } + js: { } site_name: 'Easy Admin' + formats: + date: Y-m-d + time: 'H:i:s' + datetime: 'F j, Y H:i' list: actions: { } max_results: 15 @@ -92,10 +100,3 @@ easy_admin: actions: { } show: actions: { } - assets: - css: { } - js: { } - formats: - date: Y-m-d - time: 'H:i:s' - datetime: 'F j, Y H:i' diff --git a/Tests/DependencyInjection/fixtures/configurations/output/config_019.yml b/Tests/DependencyInjection/fixtures/configurations/output/config_019.yml index 8ed5e62b4b..96115d610e 100644 --- a/Tests/DependencyInjection/fixtures/configurations/output/config_019.yml +++ b/Tests/DependencyInjection/fixtures/configurations/output/config_019.yml @@ -82,7 +82,15 @@ easy_admin: label: action.edit class: '' icon: edit + design: + assets: + css: { } + js: { } site_name: 'Easy Admin' + formats: + date: Y-m-d + time: 'H:i:s' + datetime: 'F j, Y H:i' list: actions: { } max_results: 15 @@ -92,10 +100,3 @@ easy_admin: actions: { } show: actions: { } - assets: - css: { } - js: { } - formats: - date: Y-m-d - time: 'H:i:s' - datetime: 'F j, Y H:i' diff --git a/Tests/DependencyInjection/fixtures/configurations/output/config_020.yml b/Tests/DependencyInjection/fixtures/configurations/output/config_020.yml index 3749c6577b..4ab3516994 100644 --- a/Tests/DependencyInjection/fixtures/configurations/output/config_020.yml +++ b/Tests/DependencyInjection/fixtures/configurations/output/config_020.yml @@ -82,7 +82,15 @@ easy_admin: label: action.edit class: '' icon: edit + design: + assets: + css: { } + js: { } site_name: 'Easy Admin' + formats: + date: Y-m-d + time: 'H:i:s' + datetime: 'F j, Y H:i' list: actions: { } max_results: 15 @@ -92,10 +100,3 @@ easy_admin: actions: { } show: actions: { } - assets: - css: { } - js: { } - formats: - date: Y-m-d - time: 'H:i:s' - datetime: 'F j, Y H:i' diff --git a/Tests/DependencyInjection/fixtures/configurations/output/config_021.yml b/Tests/DependencyInjection/fixtures/configurations/output/config_021.yml index 3749c6577b..4ab3516994 100644 --- a/Tests/DependencyInjection/fixtures/configurations/output/config_021.yml +++ b/Tests/DependencyInjection/fixtures/configurations/output/config_021.yml @@ -82,7 +82,15 @@ easy_admin: label: action.edit class: '' icon: edit + design: + assets: + css: { } + js: { } site_name: 'Easy Admin' + formats: + date: Y-m-d + time: 'H:i:s' + datetime: 'F j, Y H:i' list: actions: { } max_results: 15 @@ -92,10 +100,3 @@ easy_admin: actions: { } show: actions: { } - assets: - css: { } - js: { } - formats: - date: Y-m-d - time: 'H:i:s' - datetime: 'F j, Y H:i' diff --git a/Tests/DependencyInjection/fixtures/configurations/output/config_022.yml b/Tests/DependencyInjection/fixtures/configurations/output/config_022.yml index 91f7c77262..c3442216f3 100644 --- a/Tests/DependencyInjection/fixtures/configurations/output/config_022.yml +++ b/Tests/DependencyInjection/fixtures/configurations/output/config_022.yml @@ -164,7 +164,15 @@ easy_admin: label: action.edit class: '' icon: edit + design: + assets: + css: { } + js: { } site_name: 'Easy Admin' + formats: + date: Y-m-d + time: 'H:i:s' + datetime: 'F j, Y H:i' list: actions: { } max_results: 15 @@ -174,10 +182,3 @@ easy_admin: actions: { } show: actions: { } - assets: - css: { } - js: { } - formats: - date: Y-m-d - time: 'H:i:s' - datetime: 'F j, Y H:i' diff --git a/Tests/DependencyInjection/fixtures/configurations/output/config_023.yml b/Tests/DependencyInjection/fixtures/configurations/output/config_023.yml index 9edb5d78ac..d31ce11eba 100644 --- a/Tests/DependencyInjection/fixtures/configurations/output/config_023.yml +++ b/Tests/DependencyInjection/fixtures/configurations/output/config_023.yml @@ -164,7 +164,15 @@ easy_admin: label: action.edit class: '' icon: edit + design: + assets: + css: { } + js: { } site_name: 'Easy Admin' + formats: + date: Y-m-d + time: 'H:i:s' + datetime: 'F j, Y H:i' list: actions: { } max_results: 15 @@ -174,10 +182,3 @@ easy_admin: actions: { } show: actions: { } - assets: - css: { } - js: { } - formats: - date: Y-m-d - time: 'H:i:s' - datetime: 'F j, Y H:i' diff --git a/Tests/DependencyInjection/fixtures/configurations/output/config_024.yml b/Tests/DependencyInjection/fixtures/configurations/output/config_024.yml index e8ef7446c7..d7c157ca40 100644 --- a/Tests/DependencyInjection/fixtures/configurations/output/config_024.yml +++ b/Tests/DependencyInjection/fixtures/configurations/output/config_024.yml @@ -164,7 +164,15 @@ easy_admin: label: action.edit class: '' icon: edit + design: + assets: + css: { } + js: { } site_name: 'Easy Admin' + formats: + date: Y-m-d + time: 'H:i:s' + datetime: 'F j, Y H:i' list: actions: { } max_results: 15 @@ -174,10 +182,3 @@ easy_admin: actions: { } show: actions: { } - assets: - css: { } - js: { } - formats: - date: Y-m-d - time: 'H:i:s' - datetime: 'F j, Y H:i' diff --git a/Tests/DependencyInjection/fixtures/configurations/output/config_025.yml b/Tests/DependencyInjection/fixtures/configurations/output/config_025.yml index e63c3b5cca..2b418484b8 100644 --- a/Tests/DependencyInjection/fixtures/configurations/output/config_025.yml +++ b/Tests/DependencyInjection/fixtures/configurations/output/config_025.yml @@ -164,7 +164,15 @@ easy_admin: label: action.edit class: '' icon: edit + design: + assets: + css: { } + js: { } site_name: 'Easy Admin' + formats: + date: Y-m-d + time: 'H:i:s' + datetime: 'F j, Y H:i' list: actions: { } max_results: 15 @@ -174,10 +182,3 @@ easy_admin: actions: { } show: actions: { } - assets: - css: { } - js: { } - formats: - date: Y-m-d - time: 'H:i:s' - datetime: 'F j, Y H:i' diff --git a/Tests/DependencyInjection/fixtures/configurations/output/config_026.yml b/Tests/DependencyInjection/fixtures/configurations/output/config_026.yml index 3749c6577b..4ab3516994 100644 --- a/Tests/DependencyInjection/fixtures/configurations/output/config_026.yml +++ b/Tests/DependencyInjection/fixtures/configurations/output/config_026.yml @@ -82,7 +82,15 @@ easy_admin: label: action.edit class: '' icon: edit + design: + assets: + css: { } + js: { } site_name: 'Easy Admin' + formats: + date: Y-m-d + time: 'H:i:s' + datetime: 'F j, Y H:i' list: actions: { } max_results: 15 @@ -92,10 +100,3 @@ easy_admin: actions: { } show: actions: { } - assets: - css: { } - js: { } - formats: - date: Y-m-d - time: 'H:i:s' - datetime: 'F j, Y H:i' diff --git a/Tests/DependencyInjection/fixtures/configurations/output/config_027.yml b/Tests/DependencyInjection/fixtures/configurations/output/config_027.yml index 9edb5d78ac..d31ce11eba 100644 --- a/Tests/DependencyInjection/fixtures/configurations/output/config_027.yml +++ b/Tests/DependencyInjection/fixtures/configurations/output/config_027.yml @@ -164,7 +164,15 @@ easy_admin: label: action.edit class: '' icon: edit + design: + assets: + css: { } + js: { } site_name: 'Easy Admin' + formats: + date: Y-m-d + time: 'H:i:s' + datetime: 'F j, Y H:i' list: actions: { } max_results: 15 @@ -174,10 +182,3 @@ easy_admin: actions: { } show: actions: { } - assets: - css: { } - js: { } - formats: - date: Y-m-d - time: 'H:i:s' - datetime: 'F j, Y H:i' diff --git a/Tests/DependencyInjection/fixtures/configurations/output/config_028.yml b/Tests/DependencyInjection/fixtures/configurations/output/config_028.yml index 91f7c77262..c3442216f3 100644 --- a/Tests/DependencyInjection/fixtures/configurations/output/config_028.yml +++ b/Tests/DependencyInjection/fixtures/configurations/output/config_028.yml @@ -164,7 +164,15 @@ easy_admin: label: action.edit class: '' icon: edit + design: + assets: + css: { } + js: { } site_name: 'Easy Admin' + formats: + date: Y-m-d + time: 'H:i:s' + datetime: 'F j, Y H:i' list: actions: { } max_results: 15 @@ -174,10 +182,3 @@ easy_admin: actions: { } show: actions: { } - assets: - css: { } - js: { } - formats: - date: Y-m-d - time: 'H:i:s' - datetime: 'F j, Y H:i' diff --git a/Tests/DependencyInjection/fixtures/configurations/output/config_029.yml b/Tests/DependencyInjection/fixtures/configurations/output/config_029.yml index aaca051a12..5709b1a52a 100644 --- a/Tests/DependencyInjection/fixtures/configurations/output/config_029.yml +++ b/Tests/DependencyInjection/fixtures/configurations/output/config_029.yml @@ -164,7 +164,15 @@ easy_admin: label: action.edit class: '' icon: edit + design: + assets: + css: { } + js: { } site_name: 'Easy Admin' + formats: + date: Y-m-d + time: 'H:i:s' + datetime: 'F j, Y H:i' list: actions: { } max_results: 15 @@ -174,10 +182,3 @@ easy_admin: actions: { } show: actions: { } - assets: - css: { } - js: { } - formats: - date: Y-m-d - time: 'H:i:s' - datetime: 'F j, Y H:i' diff --git a/Tests/DependencyInjection/fixtures/configurations/output/config_030.yml b/Tests/DependencyInjection/fixtures/configurations/output/config_030.yml index 91f7c77262..c3442216f3 100644 --- a/Tests/DependencyInjection/fixtures/configurations/output/config_030.yml +++ b/Tests/DependencyInjection/fixtures/configurations/output/config_030.yml @@ -164,7 +164,15 @@ easy_admin: label: action.edit class: '' icon: edit + design: + assets: + css: { } + js: { } site_name: 'Easy Admin' + formats: + date: Y-m-d + time: 'H:i:s' + datetime: 'F j, Y H:i' list: actions: { } max_results: 15 @@ -174,10 +182,3 @@ easy_admin: actions: { } show: actions: { } - assets: - css: { } - js: { } - formats: - date: Y-m-d - time: 'H:i:s' - datetime: 'F j, Y H:i' diff --git a/Tests/DependencyInjection/fixtures/configurations/output/config_031.yml b/Tests/DependencyInjection/fixtures/configurations/output/config_031.yml index ed2ffb49e0..85321d0ebd 100644 --- a/Tests/DependencyInjection/fixtures/configurations/output/config_031.yml +++ b/Tests/DependencyInjection/fixtures/configurations/output/config_031.yml @@ -86,7 +86,15 @@ easy_admin: label: action.edit class: '' icon: edit + design: + assets: + css: { } + js: { } site_name: 'Easy Admin' + formats: + date: Y-m-d + time: 'H:i:s' + datetime: 'F j, Y H:i' list: actions: { } max_results: 15 @@ -96,10 +104,3 @@ easy_admin: actions: { } show: actions: { } - assets: - css: { } - js: { } - formats: - date: Y-m-d - time: 'H:i:s' - datetime: 'F j, Y H:i' diff --git a/Tests/DependencyInjection/fixtures/configurations/output/config_032.yml b/Tests/DependencyInjection/fixtures/configurations/output/config_032.yml index 8d25749ecf..957d69ef32 100644 --- a/Tests/DependencyInjection/fixtures/configurations/output/config_032.yml +++ b/Tests/DependencyInjection/fixtures/configurations/output/config_032.yml @@ -86,7 +86,15 @@ easy_admin: label: action.edit class: '' icon: edit + design: + assets: + css: { } + js: { } site_name: 'Easy Admin' + formats: + date: Y-m-d + time: 'H:i:s' + datetime: 'F j, Y H:i' list: actions: { } max_results: 15 @@ -96,10 +104,3 @@ easy_admin: actions: { } show: actions: { } - assets: - css: { } - js: { } - formats: - date: Y-m-d - time: 'H:i:s' - datetime: 'F j, Y H:i' diff --git a/Tests/DependencyInjection/fixtures/configurations/output/config_033.yml b/Tests/DependencyInjection/fixtures/configurations/output/config_033.yml index 8632aaa13a..fce8a523c9 100644 --- a/Tests/DependencyInjection/fixtures/configurations/output/config_033.yml +++ b/Tests/DependencyInjection/fixtures/configurations/output/config_033.yml @@ -86,7 +86,15 @@ easy_admin: label: action.edit class: '' icon: edit + design: + assets: + css: { } + js: { } site_name: 'Easy Admin' + formats: + date: Y-m-d + time: 'H:i:s' + datetime: 'F j, Y H:i' list: actions: { } max_results: 15 @@ -96,10 +104,3 @@ easy_admin: actions: { } show: actions: { } - assets: - css: { } - js: { } - formats: - date: Y-m-d - time: 'H:i:s' - datetime: 'F j, Y H:i' diff --git a/Tests/DependencyInjection/fixtures/configurations/output/config_034.yml b/Tests/DependencyInjection/fixtures/configurations/output/config_034.yml index 13d51ad246..c1809384fd 100644 --- a/Tests/DependencyInjection/fixtures/configurations/output/config_034.yml +++ b/Tests/DependencyInjection/fixtures/configurations/output/config_034.yml @@ -90,7 +90,15 @@ easy_admin: label: action.edit class: '' icon: edit + design: + assets: + css: { } + js: { } site_name: 'Easy Admin' + formats: + date: Y-m-d + time: 'H:i:s' + datetime: 'F j, Y H:i' list: actions: { } max_results: 15 @@ -100,10 +108,3 @@ easy_admin: actions: { } show: actions: { } - assets: - css: { } - js: { } - formats: - date: Y-m-d - time: 'H:i:s' - datetime: 'F j, Y H:i' diff --git a/Tests/DependencyInjection/fixtures/configurations/output/config_035.yml b/Tests/DependencyInjection/fixtures/configurations/output/config_035.yml index dd692c89e0..75f365b84e 100644 --- a/Tests/DependencyInjection/fixtures/configurations/output/config_035.yml +++ b/Tests/DependencyInjection/fixtures/configurations/output/config_035.yml @@ -94,7 +94,15 @@ easy_admin: label: action.edit class: '' icon: edit + design: + assets: + css: { } + js: { } site_name: 'Easy Admin' + formats: + date: Y-m-d + time: 'H:i:s' + datetime: 'F j, Y H:i' list: actions: { } max_results: 15 @@ -104,10 +112,3 @@ easy_admin: actions: { } show: actions: { } - assets: - css: { } - js: { } - formats: - date: Y-m-d - time: 'H:i:s' - datetime: 'F j, Y H:i' diff --git a/Tests/DependencyInjection/fixtures/configurations/output/config_036.yml b/Tests/DependencyInjection/fixtures/configurations/output/config_036.yml index e741d5c35e..6b6234bbc3 100644 --- a/Tests/DependencyInjection/fixtures/configurations/output/config_036.yml +++ b/Tests/DependencyInjection/fixtures/configurations/output/config_036.yml @@ -97,7 +97,15 @@ easy_admin: label: action.edit class: '' icon: edit + design: + assets: + css: { } + js: { } site_name: 'Easy Admin' + formats: + date: Y-m-d + time: 'H:i:s' + datetime: 'F j, Y H:i' list: actions: { } max_results: 15 @@ -107,10 +115,3 @@ easy_admin: actions: { } show: actions: { } - assets: - css: { } - js: { } - formats: - date: Y-m-d - time: 'H:i:s' - datetime: 'F j, Y H:i' diff --git a/Tests/DependencyInjection/fixtures/configurations/output/config_037.yml b/Tests/DependencyInjection/fixtures/configurations/output/config_037.yml index 68d003d2d0..69992ab4f4 100644 --- a/Tests/DependencyInjection/fixtures/configurations/output/config_037.yml +++ b/Tests/DependencyInjection/fixtures/configurations/output/config_037.yml @@ -97,7 +97,15 @@ easy_admin: label: action.edit class: '' icon: edit + design: + assets: + css: { } + js: { } site_name: 'Easy Admin' + formats: + date: Y-m-d + time: 'H:i:s' + datetime: 'F j, Y H:i' list: actions: { } max_results: 15 @@ -107,10 +115,3 @@ easy_admin: actions: { } show: actions: { } - assets: - css: { } - js: { } - formats: - date: Y-m-d - time: 'H:i:s' - datetime: 'F j, Y H:i' diff --git a/Tests/DependencyInjection/fixtures/configurations/output/config_038.yml b/Tests/DependencyInjection/fixtures/configurations/output/config_038.yml index ed4971693e..e6567e1408 100644 --- a/Tests/DependencyInjection/fixtures/configurations/output/config_038.yml +++ b/Tests/DependencyInjection/fixtures/configurations/output/config_038.yml @@ -97,7 +97,15 @@ easy_admin: label: action.edit class: '' icon: edit + design: + assets: + css: { } + js: { } site_name: 'Easy Admin' + formats: + date: Y-m-d + time: 'H:i:s' + datetime: 'F j, Y H:i' list: actions: { } max_results: 15 @@ -107,10 +115,3 @@ easy_admin: actions: { } show: actions: { } - assets: - css: { } - js: { } - formats: - date: Y-m-d - time: 'H:i:s' - datetime: 'F j, Y H:i' diff --git a/Tests/DependencyInjection/fixtures/configurations/output/config_039.yml b/Tests/DependencyInjection/fixtures/configurations/output/config_039.yml index 5323da9bbb..b3d78a6ad6 100644 --- a/Tests/DependencyInjection/fixtures/configurations/output/config_039.yml +++ b/Tests/DependencyInjection/fixtures/configurations/output/config_039.yml @@ -82,7 +82,15 @@ easy_admin: icon: edit label: TestEntity name: TestEntity + design: + assets: + css: { } + js: { } site_name: 'Easy Admin' + formats: + date: Y-m-d + time: 'H:i:s' + datetime: 'F j, Y H:i' list: actions: { } max_results: 15 @@ -92,10 +100,3 @@ easy_admin: actions: { } show: actions: { } - assets: - css: { } - js: { } - formats: - date: Y-m-d - time: 'H:i:s' - datetime: 'F j, Y H:i' diff --git a/Tests/DependencyInjection/fixtures/configurations/output/config_040.yml b/Tests/DependencyInjection/fixtures/configurations/output/config_040.yml index a1771fbc2d..016e6e62a2 100644 --- a/Tests/DependencyInjection/fixtures/configurations/output/config_040.yml +++ b/Tests/DependencyInjection/fixtures/configurations/output/config_040.yml @@ -98,7 +98,15 @@ easy_admin: icon: edit label: TestEntity name: TestEntity + design: + assets: + css: { } + js: { } site_name: 'Easy Admin' + formats: + date: Y-m-d + time: 'H:i:s' + datetime: 'F j, Y H:i' list: actions: { } max_results: 15 @@ -108,10 +116,3 @@ easy_admin: actions: { } show: actions: { } - assets: - css: { } - js: { } - formats: - date: Y-m-d - time: 'H:i:s' - datetime: 'F j, Y H:i' diff --git a/Tests/DependencyInjection/fixtures/configurations/output/config_041.yml b/Tests/DependencyInjection/fixtures/configurations/output/config_041.yml index 942856c5bb..e065668a48 100644 --- a/Tests/DependencyInjection/fixtures/configurations/output/config_041.yml +++ b/Tests/DependencyInjection/fixtures/configurations/output/config_041.yml @@ -86,7 +86,15 @@ easy_admin: label: action.edit class: '' icon: edit + design: + assets: + css: { } + js: { } site_name: 'Easy Admin' + formats: + date: Y-m-d + time: 'H:i:s' + datetime: 'F j, Y H:i' list: actions: { } max_results: 15 @@ -96,10 +104,3 @@ easy_admin: actions: { } show: actions: { } - assets: - css: { } - js: { } - formats: - date: Y-m-d - time: 'H:i:s' - datetime: 'F j, Y H:i' diff --git a/Tests/DependencyInjection/fixtures/configurations/output/config_042.yml b/Tests/DependencyInjection/fixtures/configurations/output/config_042.yml index 1c8844188a..428f9746a5 100644 --- a/Tests/DependencyInjection/fixtures/configurations/output/config_042.yml +++ b/Tests/DependencyInjection/fixtures/configurations/output/config_042.yml @@ -87,7 +87,15 @@ easy_admin: label: action.edit class: '' icon: edit + design: + assets: + css: { } + js: { } site_name: 'Easy Admin' + formats: + date: Y-m-d + time: 'H:i:s' + datetime: 'F j, Y H:i' list: actions: { } max_results: 15 @@ -97,10 +105,3 @@ easy_admin: actions: { } show: actions: { } - assets: - css: { } - js: { } - formats: - date: Y-m-d - time: 'H:i:s' - datetime: 'F j, Y H:i' diff --git a/Tests/DependencyInjection/fixtures/configurations/output/config_043.yml b/Tests/DependencyInjection/fixtures/configurations/output/config_043.yml index acc4a82642..e0049277cf 100644 --- a/Tests/DependencyInjection/fixtures/configurations/output/config_043.yml +++ b/Tests/DependencyInjection/fixtures/configurations/output/config_043.yml @@ -87,7 +87,15 @@ easy_admin: label: action.edit class: '' icon: edit + design: + assets: + css: { } + js: { } site_name: 'Easy Admin' + formats: + date: Y-m-d + time: 'H:i:s' + datetime: 'F j, Y H:i' list: actions: { } max_results: 15 @@ -97,10 +105,3 @@ easy_admin: actions: { } show: actions: { } - assets: - css: { } - js: { } - formats: - date: Y-m-d - time: 'H:i:s' - datetime: 'F j, Y H:i' diff --git a/Tests/DependencyInjection/fixtures/configurations/output/config_044.yml b/Tests/DependencyInjection/fixtures/configurations/output/config_044.yml index 20b71708ee..0eb3ebc437 100644 --- a/Tests/DependencyInjection/fixtures/configurations/output/config_044.yml +++ b/Tests/DependencyInjection/fixtures/configurations/output/config_044.yml @@ -1,5 +1,13 @@ easy_admin: + design: + assets: + css: { } + js: { } site_name: 'Easy Admin' + formats: + date: Y-m-d + time: 'H:i:s' + datetime: 'F j, Y H:i' list: actions: { } max_results: 15 @@ -9,11 +17,4 @@ easy_admin: actions: { } show: actions: { } - assets: - css: { } - js: { } - formats: - date: Y-m-d - time: 'H:i:s' - datetime: 'F j, Y H:i' entities: { } diff --git a/Tests/DependencyInjection/fixtures/configurations/output/config_045.yml b/Tests/DependencyInjection/fixtures/configurations/output/config_045.yml index edcc260931..56ecf76019 100644 --- a/Tests/DependencyInjection/fixtures/configurations/output/config_045.yml +++ b/Tests/DependencyInjection/fixtures/configurations/output/config_045.yml @@ -80,17 +80,18 @@ easy_admin: label: action.edit class: '' icon: edit + design: + assets: + css: { } + js: { } site_name: 'Easy Admin' + formats: + date: Y-m-d + time: 'H:i:s' + datetime: 'F j, Y H:i' edit: actions: { } new: actions: { } show: actions: { } - assets: - css: { } - js: { } - formats: - date: Y-m-d - time: 'H:i:s' - datetime: 'F j, Y H:i' diff --git a/Tests/DependencyInjection/fixtures/configurations/output/config_046.yml b/Tests/DependencyInjection/fixtures/configurations/output/config_046.yml index 69f1176ec7..e41d1f8716 100644 --- a/Tests/DependencyInjection/fixtures/configurations/output/config_046.yml +++ b/Tests/DependencyInjection/fixtures/configurations/output/config_046.yml @@ -79,7 +79,15 @@ easy_admin: label: action.edit class: '' icon: edit + design: + assets: + css: { } + js: { } site_name: 'Easy Admin' + formats: + date: Y-m-d + time: 'H:i:s' + datetime: 'F j, Y H:i' list: actions: { } max_results: 15 @@ -87,10 +95,3 @@ easy_admin: actions: { } show: actions: { } - assets: - css: { } - js: { } - formats: - date: Y-m-d - time: 'H:i:s' - datetime: 'F j, Y H:i' diff --git a/Tests/DependencyInjection/fixtures/configurations/output/config_047.yml b/Tests/DependencyInjection/fixtures/configurations/output/config_047.yml index eb2bb925f9..d4af9b1400 100644 --- a/Tests/DependencyInjection/fixtures/configurations/output/config_047.yml +++ b/Tests/DependencyInjection/fixtures/configurations/output/config_047.yml @@ -79,7 +79,15 @@ easy_admin: label: action.list class: '' icon: null + design: + assets: + css: { } + js: { } site_name: 'Easy Admin' + formats: + date: Y-m-d + time: 'H:i:s' + datetime: 'F j, Y H:i' list: actions: { } max_results: 15 @@ -87,10 +95,3 @@ easy_admin: actions: { } new: actions: { } - assets: - css: { } - js: { } - formats: - date: Y-m-d - time: 'H:i:s' - datetime: 'F j, Y H:i' diff --git a/Tests/DependencyInjection/fixtures/configurations/output/config_048.yml b/Tests/DependencyInjection/fixtures/configurations/output/config_048.yml index b8f13e87b7..8f4e1d1cf8 100644 --- a/Tests/DependencyInjection/fixtures/configurations/output/config_048.yml +++ b/Tests/DependencyInjection/fixtures/configurations/output/config_048.yml @@ -85,7 +85,15 @@ easy_admin: label: action.edit class: '' icon: edit + design: + assets: + css: { } + js: { } site_name: 'Easy Admin' + formats: + date: Y-m-d + time: 'H:i:s' + datetime: 'F j, Y H:i' list: actions: { } max_results: 15 @@ -93,10 +101,3 @@ easy_admin: actions: { } show: actions: { } - assets: - css: { } - js: { } - formats: - date: Y-m-d - time: 'H:i:s' - datetime: 'F j, Y H:i' diff --git a/Tests/DependencyInjection/fixtures/configurations/output/config_049.yml b/Tests/DependencyInjection/fixtures/configurations/output/config_049.yml index c213a7cf46..eacc2ca817 100644 --- a/Tests/DependencyInjection/fixtures/configurations/output/config_049.yml +++ b/Tests/DependencyInjection/fixtures/configurations/output/config_049.yml @@ -66,17 +66,18 @@ easy_admin: label: action.edit class: '' icon: edit + design: + assets: + css: { } + js: { } site_name: 'Easy Admin' + formats: + date: Y-m-d + time: 'H:i:s' + datetime: 'F j, Y H:i' edit: actions: { } new: actions: { } show: actions: { } - assets: - css: { } - js: { } - formats: - date: Y-m-d - time: 'H:i:s' - datetime: 'F j, Y H:i' diff --git a/Tests/DependencyInjection/fixtures/configurations/output/config_050.yml b/Tests/DependencyInjection/fixtures/configurations/output/config_050.yml index 8d2a254bd6..2ca6a272a6 100644 --- a/Tests/DependencyInjection/fixtures/configurations/output/config_050.yml +++ b/Tests/DependencyInjection/fixtures/configurations/output/config_050.yml @@ -80,7 +80,15 @@ easy_admin: label: action.edit class: '' icon: edit + design: + assets: + css: { } + js: { } site_name: 'Easy Admin' + formats: + date: Y-m-d + time: 'H:i:s' + datetime: 'F j, Y H:i' list: actions: { } max_results: 15 @@ -88,10 +96,3 @@ easy_admin: actions: { } show: actions: { } - assets: - css: { } - js: { } - formats: - date: Y-m-d - time: 'H:i:s' - datetime: 'F j, Y H:i' diff --git a/Tests/DependencyInjection/fixtures/configurations/output/config_051.yml b/Tests/DependencyInjection/fixtures/configurations/output/config_051.yml index c39306fdc9..6c211d69ee 100644 --- a/Tests/DependencyInjection/fixtures/configurations/output/config_051.yml +++ b/Tests/DependencyInjection/fixtures/configurations/output/config_051.yml @@ -75,7 +75,15 @@ easy_admin: label: action.list class: '' icon: null + design: + assets: + css: { } + js: { } site_name: 'Easy Admin' + formats: + date: Y-m-d + time: 'H:i:s' + datetime: 'F j, Y H:i' list: actions: { } max_results: 15 @@ -83,10 +91,3 @@ easy_admin: actions: { } new: actions: { } - assets: - css: { } - js: { } - formats: - date: Y-m-d - time: 'H:i:s' - datetime: 'F j, Y H:i' diff --git a/Tests/DependencyInjection/fixtures/configurations/output/config_052.yml b/Tests/DependencyInjection/fixtures/configurations/output/config_052.yml index b8f13e87b7..8f4e1d1cf8 100644 --- a/Tests/DependencyInjection/fixtures/configurations/output/config_052.yml +++ b/Tests/DependencyInjection/fixtures/configurations/output/config_052.yml @@ -85,7 +85,15 @@ easy_admin: label: action.edit class: '' icon: edit + design: + assets: + css: { } + js: { } site_name: 'Easy Admin' + formats: + date: Y-m-d + time: 'H:i:s' + datetime: 'F j, Y H:i' list: actions: { } max_results: 15 @@ -93,10 +101,3 @@ easy_admin: actions: { } show: actions: { } - assets: - css: { } - js: { } - formats: - date: Y-m-d - time: 'H:i:s' - datetime: 'F j, Y H:i' diff --git a/Tests/DependencyInjection/fixtures/configurations/output/config_053.yml b/Tests/DependencyInjection/fixtures/configurations/output/config_053.yml index b3aead8c49..ab6a83e486 100644 --- a/Tests/DependencyInjection/fixtures/configurations/output/config_053.yml +++ b/Tests/DependencyInjection/fixtures/configurations/output/config_053.yml @@ -81,17 +81,18 @@ easy_admin: label: action.edit class: '' icon: edit + design: + assets: + css: { } + js: { } site_name: 'Easy Admin' + formats: + date: Y-m-d + time: 'H:i:s' + datetime: 'F j, Y H:i' edit: actions: { } new: actions: { } show: actions: { } - assets: - css: { } - js: { } - formats: - date: Y-m-d - time: 'H:i:s' - datetime: 'F j, Y H:i' diff --git a/Tests/DependencyInjection/fixtures/configurations/output/config_054.yml b/Tests/DependencyInjection/fixtures/configurations/output/config_054.yml index 7742ede53a..e3fc8e5169 100644 --- a/Tests/DependencyInjection/fixtures/configurations/output/config_054.yml +++ b/Tests/DependencyInjection/fixtures/configurations/output/config_054.yml @@ -80,7 +80,15 @@ easy_admin: label: action.edit class: '' icon: edit + design: + assets: + css: { } + js: { } site_name: 'Easy Admin' + formats: + date: Y-m-d + time: 'H:i:s' + datetime: 'F j, Y H:i' list: actions: { } max_results: 15 @@ -88,10 +96,3 @@ easy_admin: actions: { } show: actions: { } - assets: - css: { } - js: { } - formats: - date: Y-m-d - time: 'H:i:s' - datetime: 'F j, Y H:i' diff --git a/Tests/DependencyInjection/fixtures/configurations/output/config_055.yml b/Tests/DependencyInjection/fixtures/configurations/output/config_055.yml index 74b9202139..348fc81b3e 100644 --- a/Tests/DependencyInjection/fixtures/configurations/output/config_055.yml +++ b/Tests/DependencyInjection/fixtures/configurations/output/config_055.yml @@ -80,7 +80,15 @@ easy_admin: label: action.list class: '' icon: null + design: + assets: + css: { } + js: { } site_name: 'Easy Admin' + formats: + date: Y-m-d + time: 'H:i:s' + datetime: 'F j, Y H:i' list: actions: { } max_results: 15 @@ -88,10 +96,3 @@ easy_admin: actions: { } new: actions: { } - assets: - css: { } - js: { } - formats: - date: Y-m-d - time: 'H:i:s' - datetime: 'F j, Y H:i' diff --git a/Tests/DependencyInjection/fixtures/configurations/output/config_056.yml b/Tests/DependencyInjection/fixtures/configurations/output/config_056.yml index 2fae0af064..9d29dc1f31 100644 --- a/Tests/DependencyInjection/fixtures/configurations/output/config_056.yml +++ b/Tests/DependencyInjection/fixtures/configurations/output/config_056.yml @@ -86,7 +86,15 @@ easy_admin: label: action.edit class: '' icon: edit + design: + assets: + css: { } + js: { } site_name: 'Easy Admin' + formats: + date: Y-m-d + time: 'H:i:s' + datetime: 'F j, Y H:i' list: actions: { } max_results: 15 @@ -94,10 +102,3 @@ easy_admin: actions: { } show: actions: { } - assets: - css: { } - js: { } - formats: - date: Y-m-d - time: 'H:i:s' - datetime: 'F j, Y H:i' diff --git a/Tests/DependencyInjection/fixtures/configurations/output/config_057.yml b/Tests/DependencyInjection/fixtures/configurations/output/config_057.yml index 4fa5e79c48..c149dafe7d 100644 --- a/Tests/DependencyInjection/fixtures/configurations/output/config_057.yml +++ b/Tests/DependencyInjection/fixtures/configurations/output/config_057.yml @@ -77,10 +77,11 @@ easy_admin: label: action.list class: '' icon: null + design: + assets: + css: { } + js: { } site_name: 'Easy Admin' - assets: - css: { } - js: { } formats: date: Y-m-d time: 'H:i:s' diff --git a/Tests/DependencyInjection/fixtures/configurations/output/config_058.yml b/Tests/DependencyInjection/fixtures/configurations/output/config_058.yml index d5428e45d1..0c708dc874 100644 --- a/Tests/DependencyInjection/fixtures/configurations/output/config_058.yml +++ b/Tests/DependencyInjection/fixtures/configurations/output/config_058.yml @@ -60,10 +60,11 @@ easy_admin: label: action.list class: '' icon: null + design: + assets: + css: { } + js: { } site_name: 'Easy Admin' - assets: - css: { } - js: { } formats: date: Y-m-d time: 'H:i:s' diff --git a/Tests/DependencyInjection/fixtures/configurations/output/config_059.yml b/Tests/DependencyInjection/fixtures/configurations/output/config_059.yml index 2619749049..79970f943f 100644 --- a/Tests/DependencyInjection/fixtures/configurations/output/config_059.yml +++ b/Tests/DependencyInjection/fixtures/configurations/output/config_059.yml @@ -81,10 +81,11 @@ easy_admin: label: action.list class: '' icon: null + design: + assets: + css: { } + js: { } site_name: 'Easy Admin' - assets: - css: { } - js: { } formats: date: Y-m-d time: 'H:i:s' diff --git a/Tests/DependencyInjection/fixtures/configurations/output/config_060.yml b/Tests/DependencyInjection/fixtures/configurations/output/config_060.yml index 74d4f3b2ce..c70520cce2 100644 --- a/Tests/DependencyInjection/fixtures/configurations/output/config_060.yml +++ b/Tests/DependencyInjection/fixtures/configurations/output/config_060.yml @@ -71,10 +71,11 @@ easy_admin: label: action.list class: '' icon: null + design: + assets: + css: { } + js: { } site_name: 'Easy Admin' - assets: - css: { } - js: { } formats: date: Y-m-d time: 'H:i:s' diff --git a/Tests/DependencyInjection/fixtures/configurations/output/config_061.yml b/Tests/DependencyInjection/fixtures/configurations/output/config_061.yml index 7ece98abf2..6f14729fa9 100644 --- a/Tests/DependencyInjection/fixtures/configurations/output/config_061.yml +++ b/Tests/DependencyInjection/fixtures/configurations/output/config_061.yml @@ -115,10 +115,11 @@ easy_admin: label: action.edit class: '' icon: edit + design: + assets: + css: { } + js: { } site_name: 'Easy Admin' - assets: - css: { } - js: { } formats: date: Y-m-d time: 'H:i:s' diff --git a/Tests/DependencyInjection/fixtures/configurations/output/config_062.yml b/Tests/DependencyInjection/fixtures/configurations/output/config_062.yml index 793c5b7d70..92603cc44f 100644 --- a/Tests/DependencyInjection/fixtures/configurations/output/config_062.yml +++ b/Tests/DependencyInjection/fixtures/configurations/output/config_062.yml @@ -119,10 +119,11 @@ easy_admin: label: 'Custom action for show' class: '' icon: null + design: + assets: + css: { } + js: { } site_name: 'Easy Admin' - assets: - css: { } - js: { } formats: date: Y-m-d time: 'H:i:s' diff --git a/Tests/DependencyInjection/fixtures/configurations/output/config_063.yml b/Tests/DependencyInjection/fixtures/configurations/output/config_063.yml index 46e99bba44..0a46e38dcb 100644 --- a/Tests/DependencyInjection/fixtures/configurations/output/config_063.yml +++ b/Tests/DependencyInjection/fixtures/configurations/output/config_063.yml @@ -95,10 +95,11 @@ easy_admin: label: action.edit class: '' icon: edit + design: + assets: + css: { } + js: { } site_name: 'Easy Admin' - assets: - css: { } - js: { } formats: date: Y-m-d time: 'H:i:s' diff --git a/Tests/DependencyInjection/fixtures/configurations/output/config_064.yml b/Tests/DependencyInjection/fixtures/configurations/output/config_064.yml index 264af575ed..4200e2a841 100644 --- a/Tests/DependencyInjection/fixtures/configurations/output/config_064.yml +++ b/Tests/DependencyInjection/fixtures/configurations/output/config_064.yml @@ -139,10 +139,11 @@ easy_admin: label: custom-show-label class: custom-show-class icon: custom-show-icon + design: + assets: + css: { } + js: { } site_name: 'Easy Admin' - assets: - css: { } - js: { } formats: date: Y-m-d time: 'H:i:s' diff --git a/Tests/DependencyInjection/fixtures/configurations/output/config_065.yml b/Tests/DependencyInjection/fixtures/configurations/output/config_065.yml index c18f87c229..da04ed23db 100644 --- a/Tests/DependencyInjection/fixtures/configurations/output/config_065.yml +++ b/Tests/DependencyInjection/fixtures/configurations/output/config_065.yml @@ -122,10 +122,11 @@ easy_admin: label: action.list class: '' icon: null + design: + assets: + css: { } + js: { } site_name: 'Easy Admin' - assets: - css: { } - js: { } formats: date: Y-m-d time: 'H:i:s' diff --git a/Tests/DependencyInjection/fixtures/configurations/output/config_066.yml b/Tests/DependencyInjection/fixtures/configurations/output/config_066.yml index e5d50a36fd..0add380720 100644 --- a/Tests/DependencyInjection/fixtures/configurations/output/config_066.yml +++ b/Tests/DependencyInjection/fixtures/configurations/output/config_066.yml @@ -90,17 +90,18 @@ easy_admin: label: action.edit class: '' icon: edit + design: + assets: + css: { } + js: { } site_name: 'Easy Admin' + formats: + date: Y-m-d + time: 'H:i:s' + datetime: 'F j, Y H:i' edit: actions: { } new: actions: { } show: actions: { } - assets: - css: { } - js: { } - formats: - date: Y-m-d - time: 'H:i:s' - datetime: 'F j, Y H:i' diff --git a/Tests/DependencyInjection/fixtures/configurations/output/config_067.yml b/Tests/DependencyInjection/fixtures/configurations/output/config_067.yml index 39f812d707..1da3eb9a73 100644 --- a/Tests/DependencyInjection/fixtures/configurations/output/config_067.yml +++ b/Tests/DependencyInjection/fixtures/configurations/output/config_067.yml @@ -4,6 +4,10 @@ easy_admin: time: 'H:i A' datetime: 'd/m/Y H:i:s' number: '%6.2f' + design: + assets: + css: { } + js: { } site_name: 'Easy Admin' list: actions: { } @@ -14,7 +18,4 @@ easy_admin: actions: { } show: actions: { } - assets: - css: { } - js: { } entities: { } diff --git a/Tests/DependencyInjection/fixtures/configurations/output/config_068.yml b/Tests/DependencyInjection/fixtures/configurations/output/config_068.yml index 7e3050ac9a..ffd5525a17 100644 --- a/Tests/DependencyInjection/fixtures/configurations/output/config_068.yml +++ b/Tests/DependencyInjection/fixtures/configurations/output/config_068.yml @@ -76,7 +76,15 @@ easy_admin: label: action.edit class: '' icon: edit + design: + assets: + css: { } + js: { } site_name: 'Easy Admin' + formats: + date: Y-m-d + time: 'H:i:s' + datetime: 'F j, Y H:i' list: actions: { } max_results: 15 @@ -86,10 +94,3 @@ easy_admin: actions: { } show: actions: { } - assets: - css: { } - js: { } - formats: - date: Y-m-d - time: 'H:i:s' - datetime: 'F j, Y H:i' diff --git a/Tests/DependencyInjection/fixtures/configurations/output/config_069.yml b/Tests/DependencyInjection/fixtures/configurations/output/config_069.yml index b896752e32..2d0740da8d 100644 --- a/Tests/DependencyInjection/fixtures/configurations/output/config_069.yml +++ b/Tests/DependencyInjection/fixtures/configurations/output/config_069.yml @@ -76,7 +76,15 @@ easy_admin: label: action.edit class: '' icon: edit + design: + assets: + css: { } + js: { } site_name: 'Easy Admin' + formats: + date: Y-m-d + time: 'H:i:s' + datetime: 'F j, Y H:i' list: actions: { } max_results: 15 @@ -86,10 +94,3 @@ easy_admin: actions: { } show: actions: { } - assets: - css: { } - js: { } - formats: - date: Y-m-d - time: 'H:i:s' - datetime: 'F j, Y H:i' diff --git a/Tests/DependencyInjection/fixtures/configurations/output/config_070.yml b/Tests/DependencyInjection/fixtures/configurations/output/config_070.yml index 23af3232ad..989ae667e0 100644 --- a/Tests/DependencyInjection/fixtures/configurations/output/config_070.yml +++ b/Tests/DependencyInjection/fixtures/configurations/output/config_070.yml @@ -76,7 +76,15 @@ easy_admin: label: action.list class: '' icon: null + design: + assets: + css: { } + js: { } site_name: 'Easy Admin' + formats: + date: Y-m-d + time: 'H:i:s' + datetime: 'F j, Y H:i' list: actions: { } max_results: 15 @@ -86,10 +94,3 @@ easy_admin: actions: { } show: actions: { } - assets: - css: { } - js: { } - formats: - date: Y-m-d - time: 'H:i:s' - datetime: 'F j, Y H:i' diff --git a/Tests/DependencyInjection/fixtures/configurations/output/config_071.yml b/Tests/DependencyInjection/fixtures/configurations/output/config_071.yml index 8d2b943c94..b50d4d7eec 100644 --- a/Tests/DependencyInjection/fixtures/configurations/output/config_071.yml +++ b/Tests/DependencyInjection/fixtures/configurations/output/config_071.yml @@ -82,7 +82,15 @@ easy_admin: label: action.edit class: '' icon: edit + design: + assets: + css: { } + js: { } site_name: 'Easy Admin' + formats: + date: Y-m-d + time: 'H:i:s' + datetime: 'F j, Y H:i' list: actions: { } max_results: 15 @@ -92,10 +100,3 @@ easy_admin: actions: { } show: actions: { } - assets: - css: { } - js: { } - formats: - date: Y-m-d - time: 'H:i:s' - datetime: 'F j, Y H:i' diff --git a/Tests/DependencyInjection/fixtures/configurations/output/config_072.yml b/Tests/DependencyInjection/fixtures/configurations/output/config_072.yml index 070aa37071..375df48bba 100644 --- a/Tests/DependencyInjection/fixtures/configurations/output/config_072.yml +++ b/Tests/DependencyInjection/fixtures/configurations/output/config_072.yml @@ -77,10 +77,11 @@ easy_admin: fields: { } label: TestEntity name: TestEntity + design: + assets: + css: { } + js: { } site_name: 'Easy Admin' - assets: - css: { } - js: { } formats: date: Y-m-d time: 'H:i:s' diff --git a/Tests/DependencyInjection/fixtures/configurations/output/config_073.yml b/Tests/DependencyInjection/fixtures/configurations/output/config_073.yml index ef5901a217..013cf80d0a 100644 --- a/Tests/DependencyInjection/fixtures/configurations/output/config_073.yml +++ b/Tests/DependencyInjection/fixtures/configurations/output/config_073.yml @@ -95,10 +95,11 @@ easy_admin: fields: { } label: TestEntity name: TestEntity + design: + assets: + css: { } + js: { } site_name: 'Easy Admin' - assets: - css: { } - js: { } formats: date: Y-m-d time: 'H:i:s' diff --git a/Tests/DependencyInjection/fixtures/configurations/output/config_074.yml b/Tests/DependencyInjection/fixtures/configurations/output/config_074.yml index 6692f9c165..8b32eb4f9d 100644 --- a/Tests/DependencyInjection/fixtures/configurations/output/config_074.yml +++ b/Tests/DependencyInjection/fixtures/configurations/output/config_074.yml @@ -79,10 +79,11 @@ easy_admin: fields: { } label: TestEntity name: TestEntity + design: + assets: + css: { } + js: { } site_name: 'Easy Admin' - assets: - css: { } - js: { } formats: date: Y-m-d time: 'H:i:s' diff --git a/Tests/DependencyInjection/fixtures/configurations/output/config_075.yml b/Tests/DependencyInjection/fixtures/configurations/output/config_075.yml index 1d078af1e7..e2955d2d0c 100644 --- a/Tests/DependencyInjection/fixtures/configurations/output/config_075.yml +++ b/Tests/DependencyInjection/fixtures/configurations/output/config_075.yml @@ -97,10 +97,11 @@ easy_admin: fields: { } label: TestEntity name: TestEntity + design: + assets: + css: { } + js: { } site_name: 'Easy Admin' - assets: - css: { } - js: { } formats: date: Y-m-d time: 'H:i:s' diff --git a/Tests/DependencyInjection/fixtures/configurations/output/config_076.yml b/Tests/DependencyInjection/fixtures/configurations/output/config_076.yml index b943c71fa3..a9cf9c74bc 100644 --- a/Tests/DependencyInjection/fixtures/configurations/output/config_076.yml +++ b/Tests/DependencyInjection/fixtures/configurations/output/config_076.yml @@ -96,10 +96,11 @@ easy_admin: fields: { } label: TestEntity name: TestEntity + design: + assets: + css: { } + js: { } site_name: 'Easy Admin' - assets: - css: { } - js: { } formats: date: Y-m-d time: 'H:i:s' diff --git a/Tests/DependencyInjection/fixtures/configurations/output/config_077.yml b/Tests/DependencyInjection/fixtures/configurations/output/config_077.yml index 27d54aff56..3baf576d40 100644 --- a/Tests/DependencyInjection/fixtures/configurations/output/config_077.yml +++ b/Tests/DependencyInjection/fixtures/configurations/output/config_077.yml @@ -119,10 +119,11 @@ easy_admin: fields: { } label: TestEntity name: TestEntity + design: + assets: + css: { } + js: { } site_name: 'Easy Admin' - assets: - css: { } - js: { } formats: date: Y-m-d time: 'H:i:s' diff --git a/Tests/DependencyInjection/fixtures/configurations/output/config_078.yml b/Tests/DependencyInjection/fixtures/configurations/output/config_078.yml index 3c2115d081..289aeaf334 100644 --- a/Tests/DependencyInjection/fixtures/configurations/output/config_078.yml +++ b/Tests/DependencyInjection/fixtures/configurations/output/config_078.yml @@ -98,10 +98,11 @@ easy_admin: fields: { } label: TestEntity name: TestEntity + design: + assets: + css: { } + js: { } site_name: 'Easy Admin' - assets: - css: { } - js: { } formats: date: Y-m-d time: 'H:i:s' diff --git a/Tests/DependencyInjection/fixtures/configurations/output/config_079.yml b/Tests/DependencyInjection/fixtures/configurations/output/config_079.yml index 36705e126e..36f600bcb7 100644 --- a/Tests/DependencyInjection/fixtures/configurations/output/config_079.yml +++ b/Tests/DependencyInjection/fixtures/configurations/output/config_079.yml @@ -121,10 +121,11 @@ easy_admin: fields: { } label: TestEntity name: TestEntity + design: + assets: + css: { } + js: { } site_name: 'Easy Admin' - assets: - css: { } - js: { } formats: date: Y-m-d time: 'H:i:s' diff --git a/Tests/DependencyInjection/fixtures/configurations/output/config_080.yml b/Tests/DependencyInjection/fixtures/configurations/output/config_080.yml index 370a304663..83be6acbfa 100644 --- a/Tests/DependencyInjection/fixtures/configurations/output/config_080.yml +++ b/Tests/DependencyInjection/fixtures/configurations/output/config_080.yml @@ -111,10 +111,11 @@ easy_admin: fields: { } label: TestEntity name: TestEntity + design: + assets: + css: { } + js: { } site_name: 'Easy Admin' - assets: - css: { } - js: { } formats: date: Y-m-d time: 'H:i:s' diff --git a/Tests/DependencyInjection/fixtures/configurations/output/config_081.yml b/Tests/DependencyInjection/fixtures/configurations/output/config_081.yml index 22d7f6ca87..41876c4a3a 100644 --- a/Tests/DependencyInjection/fixtures/configurations/output/config_081.yml +++ b/Tests/DependencyInjection/fixtures/configurations/output/config_081.yml @@ -259,10 +259,11 @@ easy_admin: label: 'W e i r d case action' class: '' icon: null + design: + assets: + css: { } + js: { } site_name: 'Easy Admin' - assets: - css: { } - js: { } formats: date: Y-m-d time: 'H:i:s' diff --git a/Tests/DependencyInjection/fixtures/configurations/output/config_082.yml b/Tests/DependencyInjection/fixtures/configurations/output/config_082.yml index ab464971b4..4ba616f760 100644 --- a/Tests/DependencyInjection/fixtures/configurations/output/config_082.yml +++ b/Tests/DependencyInjection/fixtures/configurations/output/config_082.yml @@ -226,7 +226,15 @@ easy_admin: fields: { } label: TestEntity name: TestEntity + design: + assets: + css: { } + js: { } site_name: 'Easy Admin' + formats: + date: Y-m-d + time: 'H:i:s' + datetime: 'F j, Y H:i' list: actions: { } max_results: 15 @@ -236,10 +244,3 @@ easy_admin: actions: { } show: actions: { } - assets: - css: { } - js: { } - formats: - date: Y-m-d - time: 'H:i:s' - datetime: 'F j, Y H:i' diff --git a/Tests/DependencyInjection/fixtures/deprecations/input/admin_008.yml b/Tests/DependencyInjection/fixtures/deprecations/input/admin_008.yml new file mode 100644 index 0000000000..4b26fa516c --- /dev/null +++ b/Tests/DependencyInjection/fixtures/deprecations/input/admin_008.yml @@ -0,0 +1,12 @@ +# TEST +# the deprecated 'assets -> css' option should be transformed into the +# 'design -> assets -> css' option + +# CONFIGURATION +easy_admin: + assets: + css: + - 'path/to/asset1.css' + - '/path/to/asset2.css' + - '//path/to/asset3.css' + - 'http://exmaple.com/path/to/asset4.css' diff --git a/Tests/DependencyInjection/fixtures/deprecations/input/admin_009.yml b/Tests/DependencyInjection/fixtures/deprecations/input/admin_009.yml new file mode 100644 index 0000000000..da197b4485 --- /dev/null +++ b/Tests/DependencyInjection/fixtures/deprecations/input/admin_009.yml @@ -0,0 +1,12 @@ +# TEST +# the deprecated 'assets -> js' option should be transformed into the +# 'design -> assets -> js' option + +# CONFIGURATION +easy_admin: + assets: + js: + - 'path/to/asset1.js' + - '/path/to/asset2.js' + - '//path/to/asset3.js' + - 'http://exmaple.com/path/to/asset4.js' diff --git a/Tests/DependencyInjection/fixtures/deprecations/input/admin_010.yml b/Tests/DependencyInjection/fixtures/deprecations/input/admin_010.yml new file mode 100644 index 0000000000..d6d4c73745 --- /dev/null +++ b/Tests/DependencyInjection/fixtures/deprecations/input/admin_010.yml @@ -0,0 +1,17 @@ +# TEST +# the deprecated 'assets -> css' and 'assets -> js' options should be transformed +# into the 'design -> assets -> css' and 'design -> assets -> js' options + +# CONFIGURATION +easy_admin: + assets: + css: + - 'path/to/asset1.css' + - '/path/to/asset2.css' + - '//path/to/asset3.css' + - 'http://exmaple.com/path/to/asset4.css' + js: + - 'path/to/asset1.js' + - '/path/to/asset2.js' + - '//path/to/asset3.js' + - 'http://exmaple.com/path/to/asset4.js' diff --git a/Tests/DependencyInjection/fixtures/deprecations/input/admin_011.yml b/Tests/DependencyInjection/fixtures/deprecations/input/admin_011.yml new file mode 100644 index 0000000000..2b2d2ce087 --- /dev/null +++ b/Tests/DependencyInjection/fixtures/deprecations/input/admin_011.yml @@ -0,0 +1,19 @@ +# TEST +# when defining both the deprecated 'assets -> css' option and the new +# 'design -> assets -> css' option, the latter should prevail + +# CONFIGURATION +easy_admin: + design: + assets: + css: + - 'path/to/asset1.css' + - '/path/to/asset2.css' + - '//path/to/asset3.css' + - 'http://exmaple.com/path/to/asset4.css' + assets: + css: + - 'path/to/deprecated_asset1.css' + - '/path/to/deprecated_asset2.css' + - '//path/to/deprecated_asset3.css' + - 'http://exmaple.com/path/to/deprecated_asset4.css' diff --git a/Tests/DependencyInjection/fixtures/deprecations/input/admin_012.yml b/Tests/DependencyInjection/fixtures/deprecations/input/admin_012.yml new file mode 100644 index 0000000000..874f01b6a7 --- /dev/null +++ b/Tests/DependencyInjection/fixtures/deprecations/input/admin_012.yml @@ -0,0 +1,19 @@ +# TEST +# when defining both the deprecated 'assets -> js' option and the new +# 'design -> assets -> js' option, the latter should prevail + +# CONFIGURATION +easy_admin: + design: + assets: + js: + - 'path/to/asset1.js' + - '/path/to/asset2.js' + - '//path/to/asset3.js' + - 'http://exmaple.com/path/to/asset4.js' + assets: + js: + - 'path/to/deprecated_asset1.js' + - '/path/to/deprecated_asset2.js' + - '//path/to/deprecated_asset3.js' + - 'http://exmaple.com/path/to/deprecated_asset4.js' diff --git a/Tests/DependencyInjection/fixtures/deprecations/output/config_001.yml b/Tests/DependencyInjection/fixtures/deprecations/output/config_001.yml index 20b71708ee..0eb3ebc437 100644 --- a/Tests/DependencyInjection/fixtures/deprecations/output/config_001.yml +++ b/Tests/DependencyInjection/fixtures/deprecations/output/config_001.yml @@ -1,5 +1,13 @@ easy_admin: + design: + assets: + css: { } + js: { } site_name: 'Easy Admin' + formats: + date: Y-m-d + time: 'H:i:s' + datetime: 'F j, Y H:i' list: actions: { } max_results: 15 @@ -9,11 +17,4 @@ easy_admin: actions: { } show: actions: { } - assets: - css: { } - js: { } - formats: - date: Y-m-d - time: 'H:i:s' - datetime: 'F j, Y H:i' entities: { } diff --git a/Tests/DependencyInjection/fixtures/deprecations/output/config_002.yml b/Tests/DependencyInjection/fixtures/deprecations/output/config_002.yml index 20b71708ee..0eb3ebc437 100644 --- a/Tests/DependencyInjection/fixtures/deprecations/output/config_002.yml +++ b/Tests/DependencyInjection/fixtures/deprecations/output/config_002.yml @@ -1,5 +1,13 @@ easy_admin: + design: + assets: + css: { } + js: { } site_name: 'Easy Admin' + formats: + date: Y-m-d + time: 'H:i:s' + datetime: 'F j, Y H:i' list: actions: { } max_results: 15 @@ -9,11 +17,4 @@ easy_admin: actions: { } show: actions: { } - assets: - css: { } - js: { } - formats: - date: Y-m-d - time: 'H:i:s' - datetime: 'F j, Y H:i' entities: { } diff --git a/Tests/DependencyInjection/fixtures/deprecations/output/config_003.yml b/Tests/DependencyInjection/fixtures/deprecations/output/config_003.yml index dd4b021ce7..8942e539f8 100644 --- a/Tests/DependencyInjection/fixtures/deprecations/output/config_003.yml +++ b/Tests/DependencyInjection/fixtures/deprecations/output/config_003.yml @@ -2,18 +2,19 @@ easy_admin: list: max_results: 50 actions: { } + design: + assets: + css: { } + js: { } site_name: 'Easy Admin' + formats: + date: Y-m-d + time: 'H:i:s' + datetime: 'F j, Y H:i' edit: actions: { } new: actions: { } show: actions: { } - assets: - css: { } - js: { } - formats: - date: Y-m-d - time: 'H:i:s' - datetime: 'F j, Y H:i' entities: { } diff --git a/Tests/DependencyInjection/fixtures/deprecations/output/config_004.yml b/Tests/DependencyInjection/fixtures/deprecations/output/config_004.yml index 3c4d849e48..3d136c8cc8 100644 --- a/Tests/DependencyInjection/fixtures/deprecations/output/config_004.yml +++ b/Tests/DependencyInjection/fixtures/deprecations/output/config_004.yml @@ -7,18 +7,19 @@ easy_admin: action: edit label: 'Custom Label' max_results: 15 + design: + assets: + css: { } + js: { } site_name: 'Easy Admin' + formats: + date: Y-m-d + time: 'H:i:s' + datetime: 'F j, Y H:i' edit: actions: { } new: actions: { } show: actions: { } - assets: - css: { } - js: { } - formats: - date: Y-m-d - time: 'H:i:s' - datetime: 'F j, Y H:i' entities: { } diff --git a/Tests/DependencyInjection/fixtures/deprecations/output/config_005.yml b/Tests/DependencyInjection/fixtures/deprecations/output/config_005.yml index 3c0061e20f..fe90f254f1 100644 --- a/Tests/DependencyInjection/fixtures/deprecations/output/config_005.yml +++ b/Tests/DependencyInjection/fixtures/deprecations/output/config_005.yml @@ -2,18 +2,19 @@ easy_admin: list: max_results: 100 actions: { } + design: + assets: + css: { } + js: { } site_name: 'Easy Admin' + formats: + date: Y-m-d + time: 'H:i:s' + datetime: 'F j, Y H:i' edit: actions: { } new: actions: { } show: actions: { } - assets: - css: { } - js: { } - formats: - date: Y-m-d - time: 'H:i:s' - datetime: 'F j, Y H:i' entities: { } diff --git a/Tests/DependencyInjection/fixtures/deprecations/output/config_006.yml b/Tests/DependencyInjection/fixtures/deprecations/output/config_006.yml index 5bfce65f5c..b761e17fe4 100644 --- a/Tests/DependencyInjection/fixtures/deprecations/output/config_006.yml +++ b/Tests/DependencyInjection/fixtures/deprecations/output/config_006.yml @@ -7,18 +7,19 @@ easy_admin: action: edit label: 'Custom Label' max_results: 15 + design: + assets: + css: { } + js: { } site_name: 'Easy Admin' + formats: + date: Y-m-d + time: 'H:i:s' + datetime: 'F j, Y H:i' edit: actions: { } new: actions: { } show: actions: { } - assets: - css: { } - js: { } - formats: - date: Y-m-d - time: 'H:i:s' - datetime: 'F j, Y H:i' entities: { } diff --git a/Tests/DependencyInjection/fixtures/deprecations/output/config_007.yml b/Tests/DependencyInjection/fixtures/deprecations/output/config_007.yml index a131a26fd9..15a170aed9 100644 --- a/Tests/DependencyInjection/fixtures/deprecations/output/config_007.yml +++ b/Tests/DependencyInjection/fixtures/deprecations/output/config_007.yml @@ -7,18 +7,19 @@ easy_admin: - action: edit label: 'Custom Label' + design: + assets: + css: { } + js: { } site_name: 'Easy Admin' + formats: + date: Y-m-d + time: 'H:i:s' + datetime: 'F j, Y H:i' edit: actions: { } new: actions: { } show: actions: { } - assets: - css: { } - js: { } - formats: - date: Y-m-d - time: 'H:i:s' - datetime: 'F j, Y H:i' entities: { } diff --git a/Tests/DependencyInjection/fixtures/deprecations/output/config_008.yml b/Tests/DependencyInjection/fixtures/deprecations/output/config_008.yml new file mode 100644 index 0000000000..10e92ca910 --- /dev/null +++ b/Tests/DependencyInjection/fixtures/deprecations/output/config_008.yml @@ -0,0 +1,24 @@ +easy_admin: + design: + assets: + css: + - path/to/asset1.css + - /path/to/asset2.css + - //path/to/asset3.css + - 'http://exmaple.com/path/to/asset4.css' + js: { } + site_name: 'Easy Admin' + formats: + date: Y-m-d + time: 'H:i:s' + datetime: 'F j, Y H:i' + list: + actions: { } + max_results: 15 + edit: + actions: { } + new: + actions: { } + show: + actions: { } + entities: { } diff --git a/Tests/DependencyInjection/fixtures/deprecations/output/config_009.yml b/Tests/DependencyInjection/fixtures/deprecations/output/config_009.yml new file mode 100644 index 0000000000..89b1a64cef --- /dev/null +++ b/Tests/DependencyInjection/fixtures/deprecations/output/config_009.yml @@ -0,0 +1,24 @@ +easy_admin: + design: + assets: + js: + - path/to/asset1.js + - /path/to/asset2.js + - //path/to/asset3.js + - 'http://exmaple.com/path/to/asset4.js' + css: { } + site_name: 'Easy Admin' + formats: + date: Y-m-d + time: 'H:i:s' + datetime: 'F j, Y H:i' + list: + actions: { } + max_results: 15 + edit: + actions: { } + new: + actions: { } + show: + actions: { } + entities: { } diff --git a/Tests/DependencyInjection/fixtures/deprecations/output/config_010.yml b/Tests/DependencyInjection/fixtures/deprecations/output/config_010.yml new file mode 100644 index 0000000000..b80d92c205 --- /dev/null +++ b/Tests/DependencyInjection/fixtures/deprecations/output/config_010.yml @@ -0,0 +1,28 @@ +easy_admin: + design: + assets: + css: + - path/to/asset1.css + - /path/to/asset2.css + - //path/to/asset3.css + - 'http://exmaple.com/path/to/asset4.css' + js: + - path/to/asset1.js + - /path/to/asset2.js + - //path/to/asset3.js + - 'http://exmaple.com/path/to/asset4.js' + site_name: 'Easy Admin' + formats: + date: Y-m-d + time: 'H:i:s' + datetime: 'F j, Y H:i' + list: + actions: { } + max_results: 15 + edit: + actions: { } + new: + actions: { } + show: + actions: { } + entities: { } diff --git a/Tests/DependencyInjection/fixtures/deprecations/output/config_011.yml b/Tests/DependencyInjection/fixtures/deprecations/output/config_011.yml new file mode 100644 index 0000000000..10e92ca910 --- /dev/null +++ b/Tests/DependencyInjection/fixtures/deprecations/output/config_011.yml @@ -0,0 +1,24 @@ +easy_admin: + design: + assets: + css: + - path/to/asset1.css + - /path/to/asset2.css + - //path/to/asset3.css + - 'http://exmaple.com/path/to/asset4.css' + js: { } + site_name: 'Easy Admin' + formats: + date: Y-m-d + time: 'H:i:s' + datetime: 'F j, Y H:i' + list: + actions: { } + max_results: 15 + edit: + actions: { } + new: + actions: { } + show: + actions: { } + entities: { } diff --git a/Tests/DependencyInjection/fixtures/deprecations/output/config_012.yml b/Tests/DependencyInjection/fixtures/deprecations/output/config_012.yml new file mode 100644 index 0000000000..89b1a64cef --- /dev/null +++ b/Tests/DependencyInjection/fixtures/deprecations/output/config_012.yml @@ -0,0 +1,24 @@ +easy_admin: + design: + assets: + js: + - path/to/asset1.js + - /path/to/asset2.js + - //path/to/asset3.js + - 'http://exmaple.com/path/to/asset4.js' + css: { } + site_name: 'Easy Admin' + formats: + date: Y-m-d + time: 'H:i:s' + datetime: 'F j, Y H:i' + list: + actions: { } + max_results: 15 + edit: + actions: { } + new: + actions: { } + show: + actions: { } + entities: { }