Breaking : Fix exception when building forms (#12)

* fix: exception when building form * fix: update tests twig namespaces * docs: update changelog
Codein-Labs · Jul 9, 2021 · 9126f6d · 9126f6d
1 parent 2374181
commit 9126f6d
Show file tree

Hide file tree

Showing 8 changed files with 31 additions and 12 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [Unreleased]
+### Fixed
+- Fix exception when building forms #12
+
 ## [1.0.1] - 2020-09-23
 ### Fixed
 - Package no longer require `dev` minimum stability.

diff --git a/bundle/Resources/config/prepend/ezplatform.yaml b/bundle/Resources/config/prepend/ezplatform.yaml
@@ -1,5 +1,9 @@
 system:
+  admin_group:
+    field_templates:
+      - template: '@eZColorPicker/admin/content_fields.html.twig'
+        priority: 1
   default:
     field_templates:
-      - template: '@ezdesign/ColorPicker/content_fields.html.twig'
+      - template: '@eZColorPicker/standard/content_fields.html.twig'
         priority: 1
diff --git a/bundle/Resources/config/prepend/twig.yaml b/bundle/Resources/config/prepend/twig.yaml
@@ -1,2 +1,2 @@
 form_themes:
-  - '@ezdesign/ColorPicker/field_template.html.twig'
+  - '@eZColorPicker/admin/field_template.html.twig'
diff --git a/...dmin/ColorPicker/content_fields.html.twig → ...rces/views/admin/content_fields.html.twig b/...dmin/ColorPicker/content_fields.html.twig → ...rces/views/admin/content_fields.html.twig
diff --git a/...dmin/ColorPicker/field_template.html.twig → ...rces/views/admin/field_template.html.twig b/...dmin/ColorPicker/field_template.html.twig → ...rces/views/admin/field_template.html.twig
diff --git a/...dard/ColorPicker/content_fields.html.twig → ...s/views/standard/content_fields.html.twig b/...dard/ColorPicker/content_fields.html.twig → ...s/views/standard/content_fields.html.twig
diff --git a/composer.json b/composer.json
@@ -37,6 +37,7 @@
         }
     },
     "require-dev": {
-        "matthiasnoback/symfony-dependency-injection-test": "v2.3.*"
+        "matthiasnoback/symfony-dependency-injection-test": "v2.3.*",
+        "phpunit/phpunit": "^6.5"
     }
 }
diff --git a/tests/bundle/DependencyInjection/eZColorPickerExtensionTest.php b/tests/bundle/DependencyInjection/eZColorPickerExtensionTest.php
@@ -35,17 +35,27 @@ public function testPrependEzpublish()
         $actualPrependedConfig = array_merge(...$actualPrependedConfig);
 
         $expectedPrependedConfig = [
-            'field_templates' => [
-                [
-                    'template' => '@ezdesign/ColorPicker/content_fields.html.twig',
-                    'priority' => 1,
-                ],
-            ]
+            'admin_group' => [
+                'field_templates' => [
+                    [
+                        'template' => '@eZColorPicker/admin/content_fields.html.twig',
+                        'priority' => 1,
+                    ]
+                ]
+            ],
+            'default' => [
+                'field_templates' => [
+                    [
+                        'template' => '@eZColorPicker/standard/content_fields.html.twig',
+                        'priority' => 1,
+                    ],
+                ]
+            ],
         ];
 
         self::assertSame(
             $expectedPrependedConfig,
-            $actualPrependedConfig['system']['default']
+            $actualPrependedConfig['system']
         );
     }
 
@@ -59,7 +69,7 @@ public function testPrependTwig()
 
         $expectedPrependedConfig = [
             'form_themes' => [
-                "@ezdesign/ColorPicker/field_template.html.twig"
+                "@eZColorPicker/admin/field_template.html.twig"
             ]
         ];
 
@@ -68,4 +78,4 @@ public function testPrependTwig()
             $actualPrependedConfig
         );
     }
-}
+}