Merge pull request #580 from symfony-cmf/prepare-1.2

Preparing for 1.2 release

Author: wouterj

book/installation.rst

@@ -60,7 +60,7 @@ and then get the Symfony CMF code with it (this may take a while):
 
 .. code-block:: bash
 
-    $ composer create-project symfony-cmf/standard-edition <path-to-install> ~1.1
+    $ composer create-project symfony-cmf/standard-edition <path-to-install> ~1.2
     $ cd <path-to-install>
 
 .. note::

bundles/core/dependency_injection_tags.rst

@@ -4,33 +4,6 @@
 Dependency Injection Tags
 -------------------------
 
-cmf_request_aware
-~~~~~~~~~~~~~~~~~
-
-.. caution::
-
-    This tag has been deprecated in CoreBundle 1.1 and will be removed
-    in CoreBundle 1.2. Since Symfony 2.3, you can profit from the fact
-    that the request is a `synchronized service`_.
-
-When working with the 1.0 version of the CMF in Symfony 2.2 and you have
-services that need the request (e.g. for the publishing workflow or current
-menu item voters), you can tag services with ``cmf_request_aware`` to have a
-kernel listener inject the request. Any class used in such a tagged service
-must have the ``setRequest`` method or you will get a fatal error::
-
-    use Symfony\Component\HttpFoundation\Request;
-
-    class MyClass
-    {
-        private $request;
-
-        public function setRequest(Request $request)
-        {
-            $this->request = $request;
-        }
-    }
-
 cmf_published_voter
 ~~~~~~~~~~~~~~~~~~~
 

bundles/create/introduction.rst

@@ -511,7 +511,7 @@ Mapping Requests to Domain Objects
 One last piece is the mapping between CreatePHP data and the application
 domain objects. Data needs to be stored back into the database.
 
-In version 1.0, the CreateBundle only provides a service to map to Doctrine
+Currently, the CreateBundle only provides a service to map to Doctrine
 PHPCR-ODM. If you do not enable the phpcr persistence layer, you need to
 configure the ``cmf_create.object_mapper_service_id``.
 

bundles/menu/introduction.rst

@@ -11,8 +11,7 @@ features:
 * Render menus stored in the persistence layer;
 * Generate menu node URLs from linked Content or Route.
 
-Note that only the Doctrine PHPCR-ODM persistence layer is supported in the
-1.0 release.
+Note that only the Doctrine PHPCR-ODM persistence layer is currently supported.
 
 .. caution::
 

bundles/phpcr_odm/introduction.rst

@@ -46,9 +46,9 @@ If you want to use PHPCR-ODM, you additionally need to require
 
     require: {
         ...
-        "jackalope/jackalope-doctrine-dbal": "1.1.*",
-        "doctrine/phpcr-odm": "1.1.*",
-        "doctrine/phpcr-bundle": "1.1.*",
+        "jackalope/jackalope-doctrine-dbal": "1.2.*",
+        "doctrine/phpcr-odm": "1.2.*",
+        "doctrine/phpcr-bundle": "1.2.*",
         ...
     }
 

components/testing.rst

@@ -19,7 +19,7 @@ Add the following dependency to the ``require-dev`` section of ``composer.json``
 .. code-block:: javascript
 
     "require-dev": {
-        "symfony-cmf/testing": "1.1.*"
+        "symfony-cmf/testing": "1.2.*"
     },
 
 .. note::

conf.py

@@ -55,9 +55,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '1.1.0'
+version = '1.2.0'
 # The full version, including alpha/beta/rc tags.
-release = '1.1.0'
+release = '1.2.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

cookbook/database/create_new_project_phpcr_odm.rst

@@ -36,9 +36,9 @@ content repository.
         ...
         "require": {
             ...
-            "doctrine/phpcr-bundle": "1.1.*",
-            "doctrine/phpcr-odm": "1.0.*",
-            "jackalope/jackalope-doctrine-dbal": "1.0.0"
+            "doctrine/phpcr-bundle": "1.2.*",
+            "doctrine/phpcr-odm": "1.2.*",
+            "jackalope/jackalope-doctrine-dbal": "1.2.*"
         }
     }
 

cookbook/editions/cmf_core.rst

@@ -37,7 +37,7 @@ Add the following to your ``composer.json`` file:
 
     "require": {
         ...
-        "symfony-cmf/symfony-cmf": "1.1.*"
+        "symfony-cmf/symfony-cmf": "1.2.*"
     }
 
 And then run:

cookbook/editions/cmf_sandbox.rst

@@ -48,7 +48,7 @@ and then get the Symfony CMF code with it (this may take a while):
 
 .. code-block:: bash
 
-    $ composer create-project --no-install symfony-cmf/sandbox <path-to-install> ~1.1
+    $ composer create-project --no-install symfony-cmf/sandbox <path-to-install> ~1.2
     $ cd <path-to-install>
 
 Getting the Sandbox Code: GIT

quick_tour/the_big_picture.rst

@@ -45,7 +45,7 @@ The best way to download the Symfony CMF Standard Edition is using Composer_:
 
 .. code-block:: bash
 
-    $ php composer create-project symfony-cmf/standard-edition cmf ~1.1
+    $ composer create-project symfony-cmf/standard-edition cmf ~1.2
 
 Setting up the Database
 ~~~~~~~~~~~~~~~~~~~~~~~