Updated composer.json + others

Author: dantleech

bootstrap/bootstrap.php

@@ -25,3 +25,6 @@
 });
 
 AnnotationRegistry::registerFile($vendorDir.'/doctrine/phpcr-odm/lib/Doctrine/ODM/PHPCR/Mapping/Annotations/DoctrineAnnotations.php');
+
+define('CMF_TEST_ROOT_DIR', realpath(__DIR__.'/..'));
+define('CMF_TEST_CONFIG_DIR', CMF_TEST_ROOT_DIR.'/skeleton/app/config');

composer.json

@@ -10,10 +10,7 @@
     ],
     "minimum-stability": "dev",
     "require": {
-        "symfony/class-loader": ">=2.1,<2.3-dev",
-        "symfony/yaml": ">=2.1,<2.3-dev",
-        "symfony/form": ">=2.1,<2.3-dev",
-        "symfony/finder": ">=2.1,<2.3-dev",
+        "symfony/symfony": ">=2.1,<2.3-dev",
 
         "doctrine/common": "2.3.x-dev",
         "doctrine/doctrine-bundle": "1.*",

skeleton/app/config/default.php

@@ -0,0 +1,6 @@
+<?php
+
+$loader->import('dist/parameters.yml');
+$loader->import('dist/framework.yml');
+$loader->import('dist/doctrine.yml');
+$loader->import('dist/phpcrodm.yml');

skeleton/app/config/default.yml

@@ -3,34 +3,3 @@ doctrine:
         driver:   %database_driver%
         path:     %database_path%
         charset:  UTF8
-
-doctrine_phpcr:
-    # configure the PHPCR session
-    session:
-        backend: %phpcr_backend%
-        workspace: %phpcr_workspace%
-        username: %phpcr_user%
-        password: %phpcr_pass%
-    # enable the ODM layer
-    odm:
-        auto_mapping: true
-        mappings:
-            test:
-                type: annotation
-                prefix: Symfony\Cmf\Bundle\RoutingAutoBundle\Tests\Functional\app\Document
-                dir: %kernel.root_dir%/Document
-                is_bundle: false
-        auto_generate_proxy_classes: %kernel.debug%
-        locales:
-            en:
-                - en
-                - de
-                - fr
-            de:
-                - de
-                - en
-                - fr
-            fr:
-                - fr
-                - en
-                - de

skeleton/app/config/dist/doctrine.yml

@@ -0,0 +1,21 @@
+doctrine_phpcr:
+    # configure the PHPCR session
+    session:
+        backend: %phpcr_backend%
+        workspace: %phpcr_workspace%
+        username: %phpcr_user%
+        password: %phpcr_pass%
+    # enable the ODM layer
+    odm:
+        auto_mapping: true
+        auto_generate_proxy_classes: %kernel.debug%
+        locales:
+            en:
+                - de
+                - fr
+            de:
+                - en
+                - fr
+            fr:
+                - en
+                - de