Allow Page entity class to be overridden.

dankempster · Mar 25, 2015 · 2620313 · 2620313
1 parent 94740ad
commit 2620313
Show file tree

Hide file tree

Showing 11 changed files with 14 additions and 17 deletions.
diff --git a/.idea/axstrad-page-bundle.iml b/.idea/axstrad-page-bundle.iml
diff --git a/.idea/webResources.xml b/.idea/webResources.xml
diff --git a/Controller/DefaultController.php b/Controller/DefaultController.php
@@ -28,7 +28,7 @@
 class DefaultController extends Controller
 {
     /**
-     * @ParamConverter("page")
+     * @ParamConverter("page", class="%axstrad_page.entity.page.class%")
      * @SeoPageData
      */
     public function indexAction(Page $page)

diff --git a/DependencyInjection/AxstradPageExtension.php b/DependencyInjection/AxstradPageExtension.php
@@ -39,10 +39,12 @@ public function load(array $configs, ContainerBuilder $container)
         $configuration = new Configuration();
         $config = $this->processConfiguration($configuration, $configs);
 
+        $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
+        $loader->load('services.yml');
+
         if ($config['admin_enabled'] &&
             array_key_exists('SonataAdminBundle', $container->getParameter('kernel.bundles'))
         ) {
-            $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
             $loader->load('admin.yml');
         }
     }

diff --git a/Resources/config/admin.yml b/Resources/config/admin.yml
@@ -8,7 +8,7 @@ services:
             - { name: sonata.admin, manager_type: orm, group: "Content", label: "Page" }
         arguments:
             - ~
-            - Axstrad\Bundle\PageBundle\Entity\Page
+            - %axstrad_page.entity.page.class%
             - ~
         calls:
             - [ setTranslationDomain, [AxstradPageBundle]]

diff --git a/Resources/config/services.yml b/Resources/config/services.yml
@@ -0,0 +1,2 @@
+parameters:
+    axstrad_page.entity.page.class: Axstrad\Bundle\PageBundle\Entity\Page
diff --git a/Resources/doc/index.md b/Resources/doc/index.md
@@ -18,6 +18,7 @@ $bundles = array(
     // requires
     new \Stof\DoctrineExtensionsBundle\StofDoctrineExtensionsBundle(),
     new \Axstrad\Bundle\DoctrineExtensionsBundle\AxstradDoctrineExtensionsBundle(),
+    new \Axstrad\Bundle\ExtraFrameworkBundle\AxstradExtraFrameworkBundle(),
     new \Sonata\SeoBundle\SonataSeoBundle(),
     new \Symfony\Cmf\Bundle\SeoBundle\CmfSeoBundle(),
     new \Axstrad\Bundle\SeoBundle\AxstradSeoBundle(),

diff --git a/Tests/Functional/TestAdmin/app/AppKernel.php b/Tests/Functional/TestAdmin/app/AppKernel.php
@@ -48,6 +48,7 @@ public function registerBundles()
             // AxstradPageBundle and it's dependencies
             new \Stof\DoctrineExtensionsBundle\StofDoctrineExtensionsBundle(),
             new \Axstrad\Bundle\DoctrineExtensionsBundle\AxstradDoctrineExtensionsBundle(),
+            new \Axstrad\Bundle\ExtraFrameworkBundle\AxstradExtraFrameworkBundle(),
             new \Sonata\SeoBundle\SonataSeoBundle(),
             new \Symfony\Cmf\Bundle\SeoBundle\CmfSeoBundle(),
             new \Burgov\Bundle\KeyValueFormBundle\BurgovKeyValueFormBundle(),

diff --git a/Tests/Functional/TestPage/app/AppKernel.php b/Tests/Functional/TestPage/app/AppKernel.php
@@ -54,6 +54,7 @@ public function registerBundles()
             // Axstrad Bundles
             new \Stof\DoctrineExtensionsBundle\StofDoctrineExtensionsBundle(),
             new \Axstrad\Bundle\DoctrineExtensionsBundle\AxstradDoctrineExtensionsBundle(),
+            new \Axstrad\Bundle\ExtraFrameworkBundle\AxstradExtraFrameworkBundle(),
             new \Axstrad\Bundle\PageBundle\AxstradPageBundle(),
             new \Axstrad\Bundle\PageBundle\Tests\Functional\TestPage\AxstradTestPageBundle(),
         );

diff --git a/Tests/Functional/TestPageExtension/app/AppKernel.php b/Tests/Functional/TestPageExtension/app/AppKernel.php
@@ -53,6 +53,7 @@ public function registerBundles()
             // Axstrad Bundles
             new \Stof\DoctrineExtensionsBundle\StofDoctrineExtensionsBundle(),
             new \Axstrad\Bundle\DoctrineExtensionsBundle\AxstradDoctrineExtensionsBundle(),
+            new \Axstrad\Bundle\ExtraFrameworkBundle\AxstradExtraFrameworkBundle(),
             new \Axstrad\Bundle\PageBundle\AxstradPageBundle(),
             new \Axstrad\Bundle\PageBundle\Tests\Functional\TestPageExtension\AxstradTestPageExtensionBundle(),
         );

diff --git a/composer.json b/composer.json
@@ -18,6 +18,7 @@
         "axstrad/content": "0.4.x-dev",
         "axstrad/doctrine-extensions-bundle": ">=0.2.x-dev",
         "axstrad/doctrine-extensions": "0.2.*",
+        "axstrad/extra-framework-bundle": "dev-develop@dev",
         "axstrad/seo-bundle": ">=0.1.x-dev",
         "doctrine/orm": "~2.3",
         "doctrine/doctrine-bundle": "~1.2",