Reverted 1.1 features

Author: wouterj

book/routing.rst

@@ -248,7 +248,7 @@ order of precedence):
 
 * Explicit: The ``Route`` document itself can explicitly declare the target
   Controller if one is returned from ``getDefault('_controller')``.
-* By type The ``Route`` document returns a value from ``getDefault('type')``,
+* By alias: The ``Route`` document returns a value from ``getDefault('type')``,
   which is then matched against the provided configuration from config.yml
 * By class: Requires the ``Route`` document to implement ``RouteObjectInterface``
   and return an object for ``getContent()``. The returned class type is
@@ -302,7 +302,7 @@ Here's an example of how to configure the above mentioned options:
                         cmf_content.controller::indexAction
                     </controllers-by-class>
 
-                    <templates-by-class class"Symfony\Cmf\Bundle\ContentBundle\Document\StaticContent"
+                    <templates-by-class alias="Symfony\Cmf\Bundle\ContentBundle\Document\StaticContent"
                     >
                         CmfContentBundle:StaticContent:index.html.twig
                     </templates-by-class>

bundles/create/introduction.rst

@@ -281,30 +281,12 @@ Access Control
 
 In order to limit who can edit content, the provided controllers as well as the
 JavaScript loader check if the current user is granted the configured
-``cmf_create.security.role``. By default the role is ``ROLE_ADMIN``.
+``cmf_create.role``. By default the role is ``ROLE_ADMIN``.
 
 .. tip::
 
     In order to have security in place, you need to configure a
     "Symfony2 firewall". Read more in the `Symfony2 security chapter`_.
-    If you do not do that, create.js will not be loaded and editing
-    will be disabled.
-
-    If you do not want to edit on the production domain directly, e.g.
-    because of caching, you can provide a second domain where you have
-    security configured and do the editing there.
-
-You can completely disable security checks by setting the role parameter to
-boolean ``false``. Then you need to configure access permissions on the routes
-defined in ``Resources/routing/rest.xml`` and, if activated, in ``image.xml``.
-If you set the role to false but do not configure any security,
-**every visitor of your site will be able to edit the content**.
-You also will need custom logic to decide whether to include the create.js
-JavaScript files.
-
-You can also use a custom security check service by implementing
-``Symfony\Cmf\Bundle\CreateBundle\Security\AccessCheckerInterface``
-and setting this service in ``cmf_create.security.checker_service``.
 
 If you need more fine grained access control, look into the CreatePHP
 ``RdfMapperInterface`` ``isEditable`` method.  You can extend a mapper and
@@ -314,12 +296,9 @@ editable.
 Load create.js JavaScript and CSS
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-This bundle provides a template that loads the required CSS files, as well as
-a controller action that loads the necessary JavaScript *if* the current user
-is allowed to edit according to
-:ref:`the security configuration <bundle_create_introduction_access_control>`.
-The JavaScript loader also parametrizes the configuration for create.js and
-WYSIWYG editor.
+This bundle provides templates that load the required Javascript and CSS files
+based on Assetic. The Javascript loader also parametrizes the configuration
+for create.js and the chosen editor.
 
 Alternatively, you can of course use your own templates to include the assets
 needed by create.js.
@@ -377,12 +356,6 @@ For Symfony 2.1, the syntax is:
             '_locale' => $app->getRequest()->getLocale(),
         ) ?>
 
-.. tip::
-
-    You can include this call unconditionally. The controller checks if the
-    current user is allowed to edit and only in that case includes the
-    JavaScript.
-
 .. note::
 
     The provided JavaScript file configures create.js and the editor. If you
@@ -391,7 +364,6 @@ For Symfony 2.1, the syntax is:
     configuration further, you will need to use a
     :ref:`custom template to load the editor<bundle-create-custom>`.
 
-
 .. _bundle-create-usage-embed:
 
 Rendering Content

bundles/phpcr_odm.rst

@@ -588,12 +588,6 @@ and remove them on the fly.
 phpcr_odm_reference_collection
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-.. caution::
-
-    This form type was deprecated in DoctrinePHPCRBundle 1.1 and will be
-    removed in DoctrinePHPCRBundle 1.2. You should use the `phpcr_document`_
-    type instead, which can do the same but better.
-
 This form type handles editing ``ReferenceMany`` collections on PHPCR-ODM
 documents.  It is a choice field with an added ``referenced_class`` required
 option that specifies the class of the referenced target document.
@@ -691,16 +685,7 @@ A service to use the generic initializer looks like this:
         $definition->addTag('doctrine_phpcr.initializer');
         $container->setDefinition('acme.phpcr.initializer', $definition);
 
-You can execute your initializers using the following command:
-
-.. code-block:: bash
-
-    $ php app/console doctrine:phpcr:repository:init
-
-.. versionadded:: 1.1
-
-    Since DoctrinePHPCRBundle 1.1 the load data fixtures command will automatically
-    execute the initializers after purging the database.
+The ``doctrine:phpcr:repository:init`` command runs all tagged initializers.
 
 Fixture Loading
 ---------------

cookbook/create_new_project_phpcr_odm.rst

@@ -44,7 +44,7 @@ content repository.
  * Remove the ``doctrine\orm`` package from ``composer.json``;
  * Remove the ``orm`` section from ``app/config/config.yml``.
 
-**Step 4**: Add the DoctrinePHPCRBundle to the AppKernel::
+**Step 4**: Add the DoctrinePHPCRBundle to the ``AppKernel``::
 
     // app/AppKernel.php
 
@@ -62,7 +62,16 @@ content repository.
         }
     }
 
-**Step 5**: Modify ``parameters.yml.dist``, adding the required PHPCR-ODM settings:
+**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:
 
 .. code-block:: yaml
 
@@ -133,7 +142,7 @@ content repository.
             ),
         ));
 
-**Step 7**: Run ``composer update``:
+**Step 8**: Run ``composer update``:
 
 .. code-block:: bash
 

cookbook/creating_a_cms/getting-started.rst

@@ -246,11 +246,12 @@ example with ``{{ path(content) }}`` in Twig).
 Repository Initializer
 ~~~~~~~~~~~~~~~~~~~~~~
 
-:ref:`Repository initializers <phpcr-odm-repository-initializers>` enable you to establish and maintain PHPCR nodes
-required by your application, for example you will need the paths
-``/cms/pages``, ``/cms/posts`` and ``/cms/routes``. The ``GenericInitializer``
-class can be used easily initialize a list of paths. Add the following to your
-service container configuration:
+:ref:`Repository initializers <phpcr-odm-repository-initializers>` enable you
+to establish and maintain PHPCR nodes required by your application, for
+example you will need the paths ``/cms/pages``, ``/cms/posts`` and
+``/cms/routes``. The ``GenericInitializer`` class can be used easily
+initialize a list of paths. Add the following to your service container
+configuration:
 
 .. configuration-block::
 
@@ -366,6 +367,7 @@ Create a page for your CMS::
     {
         public function load(ObjectManager $dm)
         {
+            NodeHelper::createPath($dm->getPhpcrSession(), '/cms/pages');
             $parent = $dm->find(null, '/cms/pages');
 
             $page = new Page();
@@ -396,6 +398,7 @@ and add some posts::
         public function load(ObjectManager $dm)
         {
             $parent = $dm->find(null, '/cms/posts');
+            NodeHelper::createPath($dm->getPhpcrSession(), '/cms/posts');
 
             foreach (array('First', 'Second', 'Third', 'Forth') as $title) {
                 $post = new Post();
@@ -421,6 +424,15 @@ and load the fixtures:
 
 You should now have some data in your content repository.
 
+.. note::
+
+    The classes above use ``NodeHelper::createPath`` to create the paths
+    ``/cms/posts`` and ``/cms/pages`` - this is exactly what the
+    initializer did -- why do the classes do it again? This is a known issue - the
+    data fixtures loader will purge the workspace and it will **not** call the
+    initializer, so when using data fixtures it is currently necessary to manually
+    create the paths.
+
 .. _`routingautobundle documentation`: http://symfony.com/doc/current/cmf/bundles/routing_auto.html
 .. _`dynamicrouter to generate urls`: http://symfony.com/doc/current/cmf/bundles/routing/dynamic.html#url-generation-with-the-dynamicrouterA
 .. _`idempotent`: http://en.wiktionary.org/wiki/idempotent

cookbook/creating_a_cms/make-homepage.rst

@@ -195,6 +195,11 @@ and verify that the ``cms`` node has been updated by using the
     disadvantage then is that there are two places where initialization
     choices take place - do whatever you prefer.
 
+As noted earlier, currently when data fixtures are loaded they will erase the
+workspace, including the paths created by the initializers. This means that
+each time you load your data fixtures you must also reinitialize the
+repository.
+
 Create the Make Homepage Button
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 

cookbook/editions/cmf_core.rst

@@ -99,6 +99,7 @@ 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,6 +132,19 @@ 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
 ~~~~~~~~~~~~~~~~~~
 

reference/configuration/core.rst

@@ -253,67 +253,3 @@ only published routes and content can be accessed.
                 'request_listener' => true,
             ),
         ));
-
-Sonata Admin
-------------
-
-This section configures the Sonata Admin Extensions, see:
-
-* :ref:`Publish Workflow Admin Extensions <bundle-core-workflow-admin-extensions>`;
-* :ref:`Translatable Admin Extension <bundle-core-translatable-admin-extension>`.
-
-.. configuration-block::
-
-    .. code-block:: yaml
-
-        cmf_core:
-            sonata_admin:
-                extensions:
-                    publishable:
-                        form_group: form.group_publish_workflow
-                    publish_time:
-                        form_group: form.group_general
-                    translatable:
-                        form_group: form.group_general
-
-    .. code-block:: xml
-
-        <?xml version="1.0" charset="UTF-8" ?>
-        <container xmlns="http://symfony.com/schema/dic/services">
-
-            <config xmlns="http://cmf.symfony.com/schema/dic/core">
-                <sonata-admin>
-                    <extension>
-                        <publishable form-group="form.group_publish_workflow" />
-                        <publish-time form-group="form.group_general" />
-                        <translatable form-group="form.group_general" />
-                    </extension>
-                </sonata-admin>
-            </config>
-        </container>
-
-    .. code-block:: php
-
-        $container->loadFromExtension('cmf_core', array(
-            'sonata_admin' => array(
-                'extensions' => array(
-                    'publishable' => array(
-                        'form_group' => 'form.group_publish_workflow',
-                    ),
-                    'publish_time' => array(
-                        'form_group' => 'form.group_general',
-                    ),
-                    'translatable' => array(
-                        'form_group' => 'form.group_general',
-                    ),
-                ),
-            ),
-        ));
-
-form_group
-~~~~~~~~~~
-
-**type**: ``string`` **default**: as in above example.
-
-Defines which form group the fields from this extension will appear in within
-the Sonata Admin edit interface.

reference/configuration/create.rst

@@ -18,49 +18,33 @@ Configuration
 Security
 ~~~~~~~~
 
-The controller that receives save requests from create.js does a security check
-to determine whether the current user is allowed to edit content. As it would
+The controller that receives save requests from create.js requires the user to
+have a specific role to control who is allowed to edit content. As it would
 not be convenient to show the create.js editor to users not allowed to edit the
-site, the controller loading the create.js JavaScript files with the
-``includeJSFilesAction`` also uses the same security check, as does the image
-upload controller if it is activated.
-
-The default security check checks if the user has a specified role. If nothing
-is configured, the default role is ``ROLE_ADMIN``. If you set the parameter to
-boolean ``false``, every user will be allowed to save changes through the REST
-controller.
-
-A last option is to configure your own ``checker_service`` to be used instead
-of the role based check.
-
-For more information, see the
-:ref:`security section in the bundle doc <bundle_create_introduction_access_control>`.
+site, the controller loading the create.js javascripts with the
+``includeJSFilesAction`` also checks this role. If the image controller is
+activated, it checks for this role as well.
 
 .. configuration-block::
 
     .. code-block:: yaml
 
         cmf_create:
-            security:
-                role: ROLE_ADMIN
-                checker_service: ~
+            role: ROLE_ADMIN
 
     .. code-block:: xml
 
         <?xml version="1.0" charset="UTF-8" ?>
         <container xmlns="http://symfony.com/schema/dic/services">
-            <config xmlns="http://cmf.symfony.com/schema/dic/create">
-                <security role="ROLE_ADMIN" checker-service="null"/>
-            <config/>
+            <config xmlns="http://cmf.symfony.com/schema/dic/create"
+                role="ROLE_ADMIN"
+            />
         </container>
 
     .. code-block:: php
 
         $container->loadFromExtension('cmf_create', array(
-            'security' => array(
-                'role' => 'ROLE_ADMIN',
-                'checker_service' => null,
-            ),
+            'role' => 'ROLE_ADMIN',
         ));
 
 .. _config-create-persistence: