Merge pull request #394 from symfony-cmf/odm-init

the annotations are now autoloaded

Author: wouterj

bundles/phpcr_odm.rst

@@ -525,7 +525,7 @@ correct.
             xsi:schemaLocation="http://symfony.com/schema/dic/constraint-mapping
                 http://symfony.com/schema/dic/constraint-mapping/constraint-mapping-1.0.xsd">
 
-            <class name="Symfony\Cmf\Bundle\RoutingBundle\Document\Route">
+            <class name="Symfony\Cmf\Bundle\RoutingBundle\Doctrine\Phpcr\Route">
                 <constraint name="Doctrine\Bundle\PHPCRBundle\Validator\Constraints\ValidPhpcrOdm" />
             </class>
 

cookbook/create_new_project_phpcr_odm.rst

@@ -62,16 +62,7 @@ content repository.
         }
     }
 
-**Step 5**: (*optional*) Register the PHPCR-ODM annotations in ``app/autoload.php``::
-
-    // app/autoload.php
-
-    // ...
-    AnnotationRegistry::registerFile(
-        __DIR__.'/../vendor/doctrine/phpcr-odm/lib/Doctrine/ODM/PHPCR/Mapping/Annotations/DoctrineAnnotations.php'
-    );
-
-**Step 6**: Modify ``parameters.yml.dist``, adding the required PHPCR-ODM settings:
+**Step 5**: Modify ``parameters.yml.dist``, adding the required PHPCR-ODM settings:
 
 .. code-block:: yaml
 
@@ -83,15 +74,15 @@ content repository.
             connection: default
         phpcr_workspace: default
         phpcr_user: admin
-        phpcr_pass: admin 
+        phpcr_pass: admin
 
 .. note::
 
     You are modififying ``parameters.yml.dist`` and not ``paramaters.yml``.
     This is because the Standard Edition will use this file as a template when
     updating the configuration.
 
-**Step 7**: Add the Doctrine PHPCR configuration to the main application configuration:
+**Step 6**: Add the Doctrine PHPCR configuration to the main application configuration:
 
 .. configuration-block::
 
@@ -142,7 +133,7 @@ content repository.
             ),
         ));
 
-**Step 8**: Run ``composer update``:
+**Step 7**: Run ``composer update``:
 
 .. code-block:: bash
 

cookbook/editions/cmf_core.rst

@@ -99,7 +99,6 @@ If you haven't done so already, make sure you have followed these steps from
 
 * Initialize ``DoctrinePHPCRBundle`` in ``app/AppKernel.php``
 * Ensure there is a ``doctrine_phpcr:`` section in ``app/config/config.yml``
-* Add the ``AnnotationRegistry::registerFile`` line to ``app/autoload.php``
 
 Configure the BlockBundle in your ``config.yml``:
 

cookbook/installing_configuring_doctrine_phpcr_odm.rst

@@ -132,19 +132,6 @@ To install the above dependencies, run:
 
     $ php composer.phar update
 
-Register Annotations
-~~~~~~~~~~~~~~~~~~~~
-
-PHPCR-ODM uses annotations and these need to be registered in your
-``app/autoload.php`` file. Add the following line, immediately after the last
-``AnnotationRegistry::registerFile`` line::
-
-    // app/autoload.php
-
-    // ...
-    AnnotationRegistry::registerFile(__DIR__.'/../vendor/doctrine/phpcr-odm/lib/Doctrine/ODM/PHPCR/Mapping/Annotations/DoctrineAnnotations.php');
-    // ...
-
 Initialize Bundles
 ~~~~~~~~~~~~~~~~~~