Merge pull request #332 from symfony-cmf/move_sonata_admin

Author: ElectricMaxxx

app/AppKernel.php

@@ -40,6 +40,7 @@ public function registerBundles()
             new Symfony\Cmf\Bundle\RoutingAutoBundle\CmfRoutingAutoBundle(),
             new Symfony\Cmf\Bundle\ResourceBundle\CmfResourceBundle(),
             new Symfony\Cmf\Bundle\ResourceRestBundle\CmfResourceRestBundle(),
+            new Symfony\Cmf\Bundle\SonataAdminIntegrationBundle\CmfSonataAdminIntegrationBundle(),
 
             // language switcher
             new Lunetics\LocaleBundle\LuneticsLocaleBundle(),

app/config/config.yml

@@ -88,11 +88,6 @@ cmf_core:
         phpcr:
             enabled: true
 
-cmf_content:
-    persistence:
-        phpcr:
-            document_class: AppBundle\Document\DemoSeoContent
-
 cmf_routing:
     chain:
         routers_by_id:
@@ -127,6 +122,16 @@ cmf_resource_rest:
     enhancer_map:
         - { repository: default, enhancer: sonata_admin }
 
+cmf_sonata_admin_integration:
+    bundles:
+        seo: ~
+        menu: ~
+        core: ~
+        content: ~
+        block: ~
+        routing: ~
+
+
 sonata_block:
     default_contexts: [cms]
     blocks:
@@ -144,30 +149,30 @@ sonata_block:
 
 sonata_admin:
     extensions:
-        cmf_core.admin_extension.child:
+        cmf_sonata_admin_integration.core.extension.child:
             implements:
                 - Symfony\Cmf\Bundle\CoreBundle\Model\ChildInterface
-        cmf_core.admin_extension.publish_workflow.time_period:
+        cmf_sonata_admin_integration.core.extension.publish_workflow.time_period:
             implements:
                 - Symfony\Cmf\Bundle\CoreBundle\PublishWorkflow\PublishTimePeriodInterface
-        cmf_core.admin_extension.publish_workflow.publishable:
+        cmf_sonata_admin_integration.core.extension.publish_workflow.publishable:
             implements:
                 - Symfony\Cmf\Bundle\CoreBundle\PublishWorkflow\PublishableInterface
-        cmf_menu.admin_extension.menu_node_referrers:
+        cmf_sonata_admin_integration.menu.extension.menu_node_referrers:
             implements:
                 - Symfony\Cmf\Bundle\MenuBundle\Model\MenuNodeReferrersInterface
-        cmf_menu.admin_extension.menu_options:
+        cmf_sonata_admin_integration.menu.extension.menu_options:
             implements:
                 - Symfony\Cmf\Bundle\MenuBundle\Model\MenuOptionsInterface
-        cmf_routing.admin_extension.route_referrers:
+        cmf_sonata_admin_integration.routing.extension.route_referrers:
             implements:
                 - Symfony\Cmf\Component\Routing\RouteReferrersInterface
-        cmf_routing.admin_extension.frontend_link:
+        cmf_sonata_admin_integration.routing.extension.frontend_link:
             implements:
                 - Symfony\Cmf\Component\Routing\RouteReferrersReadInterface
             extends:
                 - Symfony\Component\Routing\Route
-        cmf_seo.admin_extension:
+        cmf_sonata_admin_integration.seo.extension.metadata:
             implements:
                 - Symfony\Cmf\Bundle\SeoBundle\SeoAwareInterface
 
@@ -183,23 +188,23 @@ sonata_admin:
                 label: Content
                 icon: '<i class="fa fa-file-text-o"></i>'
                 items:
-                    - cmf_content.admin
-                    - cmf_block.simple_admin
-                    - cmf_block.container_admin
-                    - cmf_block.reference_admin
-                    - cmf_block.action_admin
+                    - cmf_sonata_admin_integration.content.admin
+                    - cmf_sonata_admin_integration.block.simple_admin
+                    - cmf_sonata_admin_integration.block.container_admin
+                    - cmf_sonata_admin_integration.block.reference_admin
+                    - cmf_sonata_admin_integration.block.action_admin
             routing:
                 label: URLs
                 icon: '<i class="fa fa-link"></i>'
                 items:
-                    - cmf_routing.route_admin
-                    - cmf_routing.redirect_route_admin
+                    - cmf_sonata_admin_integration.routing.route_admin
+                    - cmf_sonata_admin_integration.routing.redirect_route_admin
             menu:
                 label: Menu
                 icon: '<i class="fa  fa-bars"></i>'
                 items:
-                    - cmf_menu.menu_admin
-                    - cmf_menu.node_admin
+                    - cmf_sonata_admin_integration.menu.menu_admin
+                    - cmf_sonata_admin_integration.menu.node_admin
 
 sonata_doctrine_phpcr_admin:
     templates:

bin/symfony_requirements

@@ -22,7 +22,6 @@ echo '> Checking Symfony requirements:'.PHP_EOL.'  ';
 
 $messages = array();
 foreach ($symfonyRequirements->getRequirements() as $req) {
-    /** @var $req Requirement */
     if ($helpText = get_error_message($req, $lineSize)) {
         echo_style('red', 'E');
         $messages['error'][] = $helpText;
@@ -121,10 +120,14 @@ function echo_block($style, $title, $message)
 
     echo PHP_EOL.PHP_EOL;
 
-    echo_style($style, str_repeat(' ', $width).PHP_EOL);
-    echo_style($style, str_pad(' ['.$title.']', $width, ' ', STR_PAD_RIGHT).PHP_EOL);
-    echo_style($style, str_pad($message, $width, ' ', STR_PAD_RIGHT).PHP_EOL);
-    echo_style($style, str_repeat(' ', $width).PHP_EOL);
+    echo_style($style, str_repeat(' ', $width));
+    echo PHP_EOL;
+    echo_style($style, str_pad(' ['.$title.']', $width, ' ', STR_PAD_RIGHT));
+    echo PHP_EOL;
+    echo_style($style, $message);
+    echo PHP_EOL;
+    echo_style($style, str_repeat(' ', $width));
+    echo PHP_EOL;
 }
 
 function has_color_support()

composer.json

@@ -26,7 +26,7 @@
         "sensio/framework-extra-bundle": "^3.0.2",
         "incenteev/composer-parameter-handler": "^2.0",
 
-        "symfony-cmf/symfony-cmf": "2.0.*",
+        "symfony-cmf/symfony-cmf": "^2.0",
         "symfony-cmf/seo-bundle": "2.0.*",
         "symfony-cmf/routing-auto-bundle": "2.0.*",
 
@@ -39,15 +39,16 @@
 
         "sonata-project/cache-bundle": "^2.1",
         "sonata-project/doctrine-phpcr-admin-bundle": "^2.0",
-        "sonata-project/admin-bundle": "^3.2",
+        "sonata-project/admin-bundle": "^3.6",
         "sonata-project/translation-bundle": "^2.0",
 
         "jms/serializer-bundle": "^1.1",
         "friendsofsymfony/rest-bundle": "~1.7",
         "eko/feedbundle": "^1.2.7",
         "lunetics/locale-bundle": "^2.5",
         "burgov/key-value-form-bundle": "^1.4",
-        "egeloen/ckeditor-bundle": "^4.0"
+        "egeloen/ckeditor-bundle": "^4.0",
+        "symfony-cmf/sonata-admin-integration-bundle": "^1.0"
     },
     "require-dev": {
         "sensio/generator-bundle": "^3.0",