diff --git a/book/installation.rst b/book/installation.rst index fd7649c1..f26fedbb 100644 --- a/book/installation.rst +++ b/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 ~1.1 + $ composer create-project symfony-cmf/standard-edition ~1.2 $ cd .. note:: diff --git a/bundles/core/dependency_injection_tags.rst b/bundles/core/dependency_injection_tags.rst index a4e76903..c09bef09 100644 --- a/bundles/core/dependency_injection_tags.rst +++ b/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 ~~~~~~~~~~~~~~~~~~~ diff --git a/bundles/create/introduction.rst b/bundles/create/introduction.rst index 6f98b932..2864c376 100644 --- a/bundles/create/introduction.rst +++ b/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``. diff --git a/bundles/menu/introduction.rst b/bundles/menu/introduction.rst index 65507eb0..c786ac32 100644 --- a/bundles/menu/introduction.rst +++ b/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:: diff --git a/bundles/phpcr_odm/introduction.rst b/bundles/phpcr_odm/introduction.rst index ba2c2f9d..fbbc3b5e 100644 --- a/bundles/phpcr_odm/introduction.rst +++ b/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.*", ... } diff --git a/components/testing.rst b/components/testing.rst index 1723e8bb..b8a11884 100644 --- a/components/testing.rst +++ b/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:: diff --git a/conf.py b/conf.py index a0cec41e..3dbe7d44 100644 --- a/conf.py +++ b/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. diff --git a/cookbook/database/create_new_project_phpcr_odm.rst b/cookbook/database/create_new_project_phpcr_odm.rst index 46038dac..0e01909a 100644 --- a/cookbook/database/create_new_project_phpcr_odm.rst +++ b/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.*" } } diff --git a/cookbook/editions/cmf_core.rst b/cookbook/editions/cmf_core.rst index e2ed0ea5..c43e9f29 100644 --- a/cookbook/editions/cmf_core.rst +++ b/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: diff --git a/cookbook/editions/cmf_sandbox.rst b/cookbook/editions/cmf_sandbox.rst index b1b82ca6..dac834e8 100644 --- a/cookbook/editions/cmf_sandbox.rst +++ b/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 ~1.1 + $ composer create-project --no-install symfony-cmf/sandbox ~1.2 $ cd Getting the Sandbox Code: GIT diff --git a/quick_tour/the_big_picture.rst b/quick_tour/the_big_picture.rst index 117a7134..58da1e57 100644 --- a/quick_tour/the_big_picture.rst +++ b/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 ~~~~~~~~~~~~~~~~~~~~~~~