Merge pull request #111 from symfony-cmf/form_tabs

ElectricMaxxx · web-flow · commit ca7715a1c912 · 2017-04-25T20:16:20.000+02:00
revert renaming, little fixes
diff --git a/src/Admin/Routing/Extension/RouteReferrersExtension.php b/src/Admin/Routing/Extension/RouteReferrersExtension.php
@@ -26,7 +26,7 @@ class RouteReferrersExtension extends AbstractAdminExtension
     private $formGroup;
     private $formTab;
 
-    public function __construct($formGroup = 'form.group_routing', $formTab = 'form.tab_routing')
+    public function __construct($formGroup = 'form.group_routes', $formTab = 'form.tab_routes')
     {
         $this->formGroup = $formGroup;
         $this->formTab = $formTab;
diff --git a/src/Admin/Routing/RouteAdmin.php b/src/Admin/Routing/RouteAdmin.php
@@ -63,7 +63,7 @@ protected function configureFormFields(FormMapper $formMapper)
                 ->end() // group general
             ->end() // tab general
 
-            ->tab('form.tab_routing')
+            ->tab('form.tab_routes')
                 ->with('form.group_path', ['class' => 'col-md-6'])
                     ->add(
                         'variablePattern',
diff --git a/src/DependencyInjection/Factory/RoutingAdminFactory.php b/src/DependencyInjection/Factory/RoutingAdminFactory.php
@@ -39,11 +39,11 @@ public function addConfiguration(NodeBuilder $builder)
                 ->addDefaultsIfNotSet()
                 ->children()
                     ->arrayNode('referrers')
-                    ->addDefaultsIfNotSet()
-                    ->children()
-                        ->scalarNode('form_group')->defaultValue('form.group_routing')->end()
-                        ->scalarNode('form_tab')->defaultValue('form.tab_routing')->end()
-                    ->end()
+                        ->addDefaultsIfNotSet()
+                        ->children()
+                            ->scalarNode('form_group')->defaultValue('form.group_routes')->end()
+                            ->scalarNode('form_tab')->defaultValue('form.tab_routes')->end()
+                        ->end()
                     ->end()
                 ->end()
             ->end()
diff --git a/src/DependencyInjection/Factory/SeoAdminFactory.php b/src/DependencyInjection/Factory/SeoAdminFactory.php
@@ -38,13 +38,13 @@ public function addConfiguration(NodeBuilder $builder)
                 ->addDefaultsIfNotSet()
                 ->children()
                     ->arrayNode('metadata')
-                    ->addDefaultsIfNotSet()
-                    ->children()
-                        ->scalarNode('form_group')->defaultValue('form.group_seo')->end()
-                        ->scalarNode('form_tab')->defaultValue('form.tab_seo')->end()
+                        ->addDefaultsIfNotSet()
+                        ->children()
+                            ->scalarNode('form_group')->defaultValue('form.group_seo')->end()
+                            ->scalarNode('form_tab')->defaultValue('form.tab_seo')->end()
+                        ->end()
                     ->end()
                 ->end()
-                ->end()
             ->end()
         ;
     }
diff --git a/src/Resources/translations/CmfSonataPhpcrAdminIntegrationBundle.cs.xliff b/src/Resources/translations/CmfSonataPhpcrAdminIntegrationBundle.cs.xliff
@@ -465,8 +465,8 @@
                 <target>URL</target>
             </trans-unit>
 
-            <trans-unit id="form.tab_routing">
-                <source>form.tab_routing</source>
+            <trans-unit id="form.tab_routes">
+                <source>form.tab_routes</source>
                 <!-- TODO: Translate -->
                 <target>URLs</target>
             </trans-unit>
@@ -491,8 +491,8 @@
                 <!-- TODO: Translate -->
                 <target>Default values</target>
             </trans-unit>
-            <trans-unit id="form.group_routing">
-                <source>form.group_routing</source>
+            <trans-unit id="form.group_routes">
+                <source>form.group_routes</source>
                 <!-- TODO: Translate -->
                 <target>Routes</target>
             </trans-unit>
diff --git a/src/Resources/translations/CmfSonataPhpcrAdminIntegrationBundle.de.xliff b/src/Resources/translations/CmfSonataPhpcrAdminIntegrationBundle.de.xliff
@@ -469,8 +469,8 @@
                 <target>URL</target>
             </trans-unit>
 
-            <trans-unit id="form.tab_routing">
-                <source>form.tab_routing</source>
+            <trans-unit id="form.tab_routes">
+                <source>form.tab_routes</source>
                 <target>URLs</target>
             </trans-unit>
 
@@ -490,8 +490,8 @@
                 <source>form.group_defaults</source>
                 <target>Vorgabewerte</target>
             </trans-unit>
-            <trans-unit id="form.group_routing">
-                <source>form.group_routing</source>
+            <trans-unit id="form.group_routes">
+                <source>form.group_routes</source>
                 <target>Routen</target>
             </trans-unit>
 
diff --git a/src/Resources/translations/CmfSonataPhpcrAdminIntegrationBundle.en.xliff b/src/Resources/translations/CmfSonataPhpcrAdminIntegrationBundle.en.xliff
@@ -350,8 +350,8 @@
                 <source>form.group_menu_options</source>
                 <target>Menu Options</target>
             </trans-unit>
-            <trans-unit id="form.group_routing">
-                <source>form.group_routing</source>
+            <trans-unit id="form.group_routes">
+                <source>form.group_routes</source>
                 <target>Routes</target>
             </trans-unit>
 
@@ -466,8 +466,8 @@
                 <target>URL</target>
             </trans-unit>
 
-            <trans-unit id="form.tab_routing">
-                <source>form.tab_routing</source>
+            <trans-unit id="form.tab_routes">
+                <source>form.tab_routes</source>
                 <target>URLs</target>
             </trans-unit>
 
diff --git a/src/Resources/translations/CmfSonataPhpcrAdminIntegrationBundle.es.xliff b/src/Resources/translations/CmfSonataPhpcrAdminIntegrationBundle.es.xliff
@@ -464,8 +464,8 @@
                 <target>URL</target>
             </trans-unit>
 
-            <trans-unit id="form.tab_routing">
-                <source>form.tab_routing</source>
+            <trans-unit id="form.tab_routes">
+                <source>form.tab_routes</source>
                 <target>URLs</target>
             </trans-unit>
 
@@ -485,8 +485,8 @@
                 <source>form.group_defaults</source>
                 <target>Valores por defecto</target>
             </trans-unit>
-            <trans-unit id="form.group_routing">
-                <source>form.group_routing</source>
+            <trans-unit id="form.group_routes">
+                <source>form.group_routes</source>
                 <target>Rutas</target>
             </trans-unit>
 
diff --git a/src/Resources/translations/CmfSonataPhpcrAdminIntegrationBundle.fr.xliff b/src/Resources/translations/CmfSonataPhpcrAdminIntegrationBundle.fr.xliff
@@ -464,8 +464,8 @@
                 <target>URL</target>
             </trans-unit>
 
-            <trans-unit id="form.tab_routing">
-                <source>form.tab_routing</source>
+            <trans-unit id="form.tab_routes">
+                <source>form.tab_routes</source>
                 <target>URLs</target>
             </trans-unit>
 
@@ -485,8 +485,8 @@
                 <source>form.group_defaults</source>
                 <target>Defauts</target>
             </trans-unit>
-            <trans-unit id="form.group_routing">
-                <source>form.group_routing</source>
+            <trans-unit id="form.group_routes">
+                <source>form.group_routes</source>
                 <target>Routes</target>
             </trans-unit>
 
diff --git a/src/Resources/translations/CmfSonataPhpcrAdminIntegrationBundle.it.xliff b/src/Resources/translations/CmfSonataPhpcrAdminIntegrationBundle.it.xliff
@@ -464,8 +464,8 @@
                 <target>URL</target>
             </trans-unit>
 
-            <trans-unit id="form.tab_routing">
-                <source>form.tab_routing</source>
+            <trans-unit id="form.tab_routes">
+                <source>form.tab_routes</source>
                 <target>URL</target>
             </trans-unit>
 
@@ -485,8 +485,8 @@
                 <source>form.group_defaults</source>
                 <target>Valori predefiniti</target>
             </trans-unit>
-            <trans-unit id="form.group_routing">
-                <source>form.group_routing</source>
+            <trans-unit id="form.group_routes">
+                <source>form.group_routes</source>
                 <target>Rotte</target>
             </trans-unit>
 
diff --git a/src/Resources/translations/CmfSonataPhpcrAdminIntegrationBundle.nl.xliff b/src/Resources/translations/CmfSonataPhpcrAdminIntegrationBundle.nl.xliff
@@ -462,8 +462,8 @@
                 <target>URL</target>
             </trans-unit>
 
-            <trans-unit id="form.tab_routing">
-                <source>form.tab_routing</source>
+            <trans-unit id="form.tab_routes">
+                <source>form.tab_routes</source>
                 <target>URLs</target>
             </trans-unit>
 
@@ -483,8 +483,8 @@
                 <source>form.group_defaults</source>
                 <target>Standaardwaarden</target>
             </trans-unit>
-            <trans-unit id="form.group_routing">
-                <source>form.group_routing</source>
+            <trans-unit id="form.group_routes">
+                <source>form.group_routes</source>
                 <target>Routen</target>
             </trans-unit>
 
diff --git a/src/Resources/translations/CmfSonataPhpcrAdminIntegrationBundle.pl.xliff b/src/Resources/translations/CmfSonataPhpcrAdminIntegrationBundle.pl.xliff
@@ -548,8 +548,8 @@
                 <target>URL</target>
             </trans-unit>
 
-            <trans-unit id="form.tab_routing">
-                <source>form.tab_routing</source>
+            <trans-unit id="form.tab_routes">
+                <source>form.tab_routes</source>
                 <!-- TODO: Translate -->
                 <target>URLs</target>
             </trans-unit>
@@ -573,8 +573,8 @@
                 <source>form.group_defaults</source>
                 <target>Domyślne</target>
             </trans-unit>
-            <trans-unit id="form.group_routing">
-                <source>form.group_routing</source>
+            <trans-unit id="form.group_routes">
+                <source>form.group_routes</source>
                 <target>Ścieżki</target>
             </trans-unit>
 
diff --git a/src/Resources/translations/CmfSonataPhpcrAdminIntegrationBundle.pt_BR.xliff b/src/Resources/translations/CmfSonataPhpcrAdminIntegrationBundle.pt_BR.xliff
@@ -352,8 +352,8 @@
                 <source>form.group_menu_options</source>
                 <target>opções do menu</target>
             </trans-unit>
-            <trans-unit id="form.group_routing">
-                <source>form.group_routing</source>
+            <trans-unit id="form.group_routes">
+                <source>form.group_routes</source>
                 <target>Rotas</target>
             </trans-unit>
 
@@ -468,8 +468,8 @@
                 <target>URL</target>
             </trans-unit>
 
-            <trans-unit id="form.tab_routing">
-                <source>form.tab_routing</source>
+            <trans-unit id="form.tab_routes">
+                <source>form.tab_routes</source>
                 <target>URLs</target>
             </trans-unit>
 
diff --git a/src/Resources/translations/CmfSonataPhpcrAdminIntegrationBundle.sk.xliff b/src/Resources/translations/CmfSonataPhpcrAdminIntegrationBundle.sk.xliff
@@ -467,8 +467,8 @@
                 <target>URL</target>
             </trans-unit>
 
-            <trans-unit id="form.tab_routing">
-                <source>form.tab_routing</source>
+            <trans-unit id="form.tab_routes">
+                <source>form.tab_routes</source>
                 <!-- TODO: Translate -->
                 <target>URLs</target>
             </trans-unit>
@@ -493,8 +493,8 @@
                 <!-- TODO: Translate -->
                 <target>Default values</target>
             </trans-unit>
-            <trans-unit id="form.group_routing">
-                <source>form.group_routing</source>
+            <trans-unit id="form.group_routes">
+                <source>form.group_routes</source>
                 <!-- TODO: Translate -->
                 <target>Routes</target>
             </trans-unit>
diff --git a/src/Resources/translations/CmfSonataPhpcrAdminIntegrationBundle.sl.xliff b/src/Resources/translations/CmfSonataPhpcrAdminIntegrationBundle.sl.xliff
@@ -464,8 +464,8 @@
                 <target>URL</target>
             </trans-unit>
 
-            <trans-unit id="form.tab_routing">
-                <source>form.tab_routing</source>
+            <trans-unit id="form.tab_routes">
+                <source>form.tab_routes</source>
                 <target>URL-ji</target>
             </trans-unit>
 
@@ -485,8 +485,8 @@
                 <source>form.group_defaults</source>
                 <target>Privzete vrednosti</target>
             </trans-unit>
-            <trans-unit id="form.group_routing">
-                <source>form.group_routing</source>
+            <trans-unit id="form.group_routes">
+                <source>form.group_routes</source>
                 <target>Poti</target>
             </trans-unit>
 
diff --git a/tests/Resources/app/AppKernel.php b/tests/Resources/app/AppKernel.php
@@ -18,14 +18,10 @@ public function configure()
     {
         $this->requireBundleSet('default');
 
-        if ('phpcr' === $this->environment) {
-            $this->requireBundleSets(array(
-                'phpcr_odm',
-                'sonata_admin_phpcr',
-            ));
-        } elseif ('orm' === $this->environment) {
-            $this->requireBundleSet('doctrine_orm');
-        }
+        $this->requireBundleSets(array(
+            'phpcr_odm',
+            'sonata_admin_phpcr',
+        ));
 
         $this->addBundles(array(
             new Sonata\SeoBundle\SonataSeoBundle(),
@@ -53,7 +49,6 @@ public function configure()
     public function registerContainerConfiguration(LoaderInterface $loader)
     {
         $loader->load(__DIR__.'/config/config.php');
-        $loader->load(__DIR__.'/config/config_'.$this->environment.'.php');
         $loader->load(__DIR__.'/config/admin-test.xml');
     }
 }
diff --git a/tests/Resources/app/config/cmf_sonata_admin_integration.orm.yml b/tests/Resources/app/config/cmf_sonata_admin_integration.orm.yml
diff --git a/tests/Resources/app/config/cmf_sonata_admin_integration.phpcr.yml b/tests/Resources/app/config/cmf_sonata_admin_integration.phpcr.yml
diff --git a/tests/Resources/app/config/cmf_sonata_admin_integration.yml b/tests/Resources/app/config/cmf_sonata_admin_integration.yml
diff --git a/tests/Resources/app/config/config.php b/tests/Resources/app/config/config.php
diff --git a/tests/Resources/app/config/config_orm.php b/tests/Resources/app/config/config_orm.php
diff --git a/tests/Resources/app/config/config_phpcr.php b/tests/Resources/app/config/config_phpcr.php
diff --git a/tests/Resources/app/config/sonata_admin.yml b/tests/Resources/app/config/sonata_admin.yml
diff --git a/tests/WebTest/Admin/Block/PHPCRBlockLoaderTest.php b/tests/WebTest/Admin/Block/PHPCRBlockLoaderTest.php

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ class RouteReferrersExtension extends AbstractAdminExtension`
`26`	`26`	`private $formGroup;`
`27`	`27`	`private $formTab;`
`28`	`28`
`29`		`- public function __construct($formGroup = 'form.group_routing', $formTab = 'form.tab_routing')`
	`29`	`+ public function __construct($formGroup = 'form.group_routes', $formTab = 'form.tab_routes')`
`30`	`30`	`{`
`31`	`31`	`$this->formGroup = $formGroup;`
`32`	`32`	`$this->formTab = $formTab;`