From 5b99c7327ca6ca286d656ba28ef088857b5b82c3 Mon Sep 17 00:00:00 2001
From: ElectricMaxxx <maximilian.berghoff@gmx.de>
Date: Fri, 23 Mar 2018 23:41:32 +0100
Subject: [PATCH 1/2] create pack for symfony-cmf using doctrine phpcr with its
 dbal implementation

---
 .../1.0/config/packages/cmf_phpcr_dbal.yaml   | 24 +++++++++++++++++++
 .../cmf-phpcr-dbal-pack/1.0/manifest.json     | 12 ++++++++++
 .../config/packages/cmf_routing_bundle.yaml   | 11 ---------
 symfony-cmf/routing-bundle/2.0/manifest.json  |  8 -------
 4 files changed, 36 insertions(+), 19 deletions(-)
 create mode 100644 symfony-cmf/cmf-phpcr-dbal-pack/1.0/config/packages/cmf_phpcr_dbal.yaml
 create mode 100644 symfony-cmf/cmf-phpcr-dbal-pack/1.0/manifest.json
 delete mode 100644 symfony-cmf/routing-bundle/2.0/config/packages/cmf_routing_bundle.yaml
 delete mode 100644 symfony-cmf/routing-bundle/2.0/manifest.json

diff --git a/symfony-cmf/cmf-phpcr-dbal-pack/1.0/config/packages/cmf_phpcr_dbal.yaml b/symfony-cmf/cmf-phpcr-dbal-pack/1.0/config/packages/cmf_phpcr_dbal.yaml
new file mode 100644
index 00000000..206cf413
--- /dev/null
+++ b/symfony-cmf/cmf-phpcr-dbal-pack/1.0/config/packages/cmf_phpcr_dbal.yaml
@@ -0,0 +1,24 @@
+framework:
+    templating: { engines: ['twig'] }
+
+cmf_menu:
+    persistence:
+        phpcr: ~
+
+cmf_routing:
+    chain:
+        routers_by_id:
+            cmf_routing.dynamic_router: 200
+            router.default:             100
+    dynamic:
+        persistence:
+            phpcr:
+                enabled: true
+
+cmf_content:
+    persistence:
+        phpcr: ~
+
+cmf_core:
+    multilang:
+        locales: [en,de]
diff --git a/symfony-cmf/cmf-phpcr-dbal-pack/1.0/manifest.json b/symfony-cmf/cmf-phpcr-dbal-pack/1.0/manifest.json
new file mode 100644
index 00000000..33752b94
--- /dev/null
+++ b/symfony-cmf/cmf-phpcr-dbal-pack/1.0/manifest.json
@@ -0,0 +1,12 @@
+{
+    "bundles": {
+        "Symfony\\Cmf\\Bundle\\RoutingBundle\\CmfRoutingBundle": ["all"],
+        "Symfony\\Cmf\\Bundle\\MenuBundle\\CmfMenuBundle": ["all"],
+        "Symfony\\Cmf\\Bundle\\CoreBundle\\CmfCoreBundle": ["all"],
+        "Symfony\\Cmf\\Bundle\\ContentBundle\\CmfContentBundle": ["all"],
+        "Symfony\\Cmf\\Bundle\\BlockBundle\\CmfBlockBundle": ["all"]
+    },
+    "copy-from-recipe": {
+        "config/": "%CONFIG_DIR%/"
+    }
+}
diff --git a/symfony-cmf/routing-bundle/2.0/config/packages/cmf_routing_bundle.yaml b/symfony-cmf/routing-bundle/2.0/config/packages/cmf_routing_bundle.yaml
deleted file mode 100644
index 131825bc..00000000
--- a/symfony-cmf/routing-bundle/2.0/config/packages/cmf_routing_bundle.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-# Read the documentation: https://symfony.com/doc/master/cmf/bundles/routing/configuration.html
-# Install phpcr stack before using this configuration
-#cmf_routing:
-#    chain:
-#        routers_by_id:
-#            cmf_routing.dynamic_router: 200
-#            router.default:             100
-#    dynamic:
-#        persistence:
-#            phpcr:
-#                enabled: true
diff --git a/symfony-cmf/routing-bundle/2.0/manifest.json b/symfony-cmf/routing-bundle/2.0/manifest.json
deleted file mode 100644
index e1b99df6..00000000
--- a/symfony-cmf/routing-bundle/2.0/manifest.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    "bundles": {
-        "Symfony\\Cmf\\Bundle\\RoutingBundle\\CmfRoutingBundle": ["all"]
-    },
-    "copy-from-recipe": {
-        "config/": "%CONFIG_DIR%/"
-    }
-}

From 9bdb611d58efc44ba24fd4d6cb29e13a911e5336 Mon Sep 17 00:00:00 2001
From: ElectricMaxxx <maximilian.berghoff@gmx.de>
Date: Sun, 25 Mar 2018 06:43:24 +0200
Subject: [PATCH 2/2] less configuration a priory

---
 .../1.0/config/packages/cmf_phpcr_dbal.yaml   | 26 ++++++++-----------
 1 file changed, 11 insertions(+), 15 deletions(-)

diff --git a/symfony-cmf/cmf-phpcr-dbal-pack/1.0/config/packages/cmf_phpcr_dbal.yaml b/symfony-cmf/cmf-phpcr-dbal-pack/1.0/config/packages/cmf_phpcr_dbal.yaml
index 206cf413..422e7bfc 100644
--- a/symfony-cmf/cmf-phpcr-dbal-pack/1.0/config/packages/cmf_phpcr_dbal.yaml
+++ b/symfony-cmf/cmf-phpcr-dbal-pack/1.0/config/packages/cmf_phpcr_dbal.yaml
@@ -1,24 +1,20 @@
-framework:
-    templating: { engines: ['twig'] }
-
-cmf_menu:
-    persistence:
-        phpcr: ~
+# persistence is configured through propagation of core-bundle's configuration: https://symfony.com/doc/current/cmf/bundles/core/configuration.html#persistence
+# So core-bundle, menu-bundle, block-bundle and routing bundle can be configured on their own too. Have a look at:
+# menu-bundle: https://symfony.com/doc/current/cmf/bundles/menu/configuration.html
+# block-bundle: https://symfony.com/doc/current/cmf/bundles/block/configuration.html
+# content-bundle: https://symfony.com/doc/current/cmf/bundles/content/configuration.html
+# routing-bundle: https://symfony.com/doc/current/cmf/bundles/routing/configuration.html
+# for their specific configuration
 
 cmf_routing:
     chain:
         routers_by_id:
             cmf_routing.dynamic_router: 200
-            router.default:             100
-    dynamic:
-        persistence:
-            phpcr:
-                enabled: true
+            routder.default:             100
 
-cmf_content:
+cmf_core:
+    # content-bundle, menu-bundle, block-bundle and routing-bundle will get same persistence configduration as core
+    # read about configuration: https://symfony.com/doc/current/cmf/bundles/core/configuration.html
     persistence:
         phpcr: ~
 
-cmf_core:
-    multilang:
-        locales: [en,de]