fixes after rebase

Author: ElectricMaxxx

tests/Unit/DependencyInjection/Factory/BlockAdminFactoryTest.php

@@ -24,7 +24,6 @@ public function testParametersBundle()
             'bundles' => [
                 'block' => [
                     'enabled' => true,
-                    'use_imagine' => true,
                     'basepath' => 'basepath_value',
                     'menu_basepath' => 'menu_basepath_value',
                     'extensions' => [

tests/Unit/DependencyInjection/Factory/ContentAdminFactoryTest.php

@@ -2,6 +2,10 @@
 
 namespace Symfony\Cmf\Bundle\SonataPhpcrAdminIntegrationBundle\Tests\Unit\DependencyInjection\Factory;
 
+use Symfony\Cmf\Bundle\SonataPhpcrAdminIntegrationBundle\DependencyInjection\Factory\ContentAdminFactory;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
+
 /**
  * @author Maximilian Berghoff <[email protected]>
  */

tests/Unit/DependencyInjection/Factory/SeoAdminFactoryTest.php

@@ -34,14 +34,18 @@ public function testParametersBundle()
             'bundles' => [
                 'seo' => [
                     'enabled' => true,
-                    'form_group' => 'seo_group',
-                    'form_tab' => 'seo_tab'
+                    'extensions' => [
+                        'metadata' => [
+                            'form_group' => 'seo_group',
+                            'form_tab' => 'seo_tab',
+                        ],
+                    ],
                 ],
             ],
         ]);
 
-        $this->assertContainerBuilderHasParameter('cmf_sonata_phpcr_admin_integration.seo.form_group', 'seo_group');
-        $this->assertContainerBuilderHasParameter('cmf_sonata_phpcr_admin_integration.seo.form_tab', 'seo_tab');
+        $this->assertContainerBuilderHasParameter('cmf_sonata_phpcr_admin_integration.seo.extension.metadata.form_group', 'seo_group');
+        $this->assertContainerBuilderHasParameter('cmf_sonata_phpcr_admin_integration.seo.extension.metadata.form_tab', 'seo_tab');
     }
 
     public function testAdminServicesBundle()