Skip to content
This repository was archived by the owner on Sep 16, 2021. It is now read-only.

Commit 28bd76b

Browse files
committed
Merge pull request #580 from symfony-cmf/prepare-1.2
Preparing for 1.2 release
2 parents 90e3987 + b793ae5 commit 28bd76b

File tree

11 files changed

+15
-43
lines changed

11 files changed

+15
-43
lines changed

book/installation.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ and then get the Symfony CMF code with it (this may take a while):
6060

6161
.. code-block:: bash
6262
63-
$ composer create-project symfony-cmf/standard-edition <path-to-install> ~1.1
63+
$ composer create-project symfony-cmf/standard-edition <path-to-install> ~1.2
6464
$ cd <path-to-install>
6565
6666
.. note::

bundles/core/dependency_injection_tags.rst

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -4,33 +4,6 @@
44
Dependency Injection Tags
55
-------------------------
66

7-
cmf_request_aware
8-
~~~~~~~~~~~~~~~~~
9-
10-
.. caution::
11-
12-
This tag has been deprecated in CoreBundle 1.1 and will be removed
13-
in CoreBundle 1.2. Since Symfony 2.3, you can profit from the fact
14-
that the request is a `synchronized service`_.
15-
16-
When working with the 1.0 version of the CMF in Symfony 2.2 and you have
17-
services that need the request (e.g. for the publishing workflow or current
18-
menu item voters), you can tag services with ``cmf_request_aware`` to have a
19-
kernel listener inject the request. Any class used in such a tagged service
20-
must have the ``setRequest`` method or you will get a fatal error::
21-
22-
use Symfony\Component\HttpFoundation\Request;
23-
24-
class MyClass
25-
{
26-
private $request;
27-
28-
public function setRequest(Request $request)
29-
{
30-
$this->request = $request;
31-
}
32-
}
33-
347
cmf_published_voter
358
~~~~~~~~~~~~~~~~~~~
369

bundles/create/introduction.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -511,7 +511,7 @@ Mapping Requests to Domain Objects
511511
One last piece is the mapping between CreatePHP data and the application
512512
domain objects. Data needs to be stored back into the database.
513513

514-
In version 1.0, the CreateBundle only provides a service to map to Doctrine
514+
Currently, the CreateBundle only provides a service to map to Doctrine
515515
PHPCR-ODM. If you do not enable the phpcr persistence layer, you need to
516516
configure the ``cmf_create.object_mapper_service_id``.
517517

bundles/menu/introduction.rst

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,7 @@ features:
1111
* Render menus stored in the persistence layer;
1212
* Generate menu node URLs from linked Content or Route.
1313

14-
Note that only the Doctrine PHPCR-ODM persistence layer is supported in the
15-
1.0 release.
14+
Note that only the Doctrine PHPCR-ODM persistence layer is currently supported.
1615

1716
.. caution::
1817

bundles/phpcr_odm/introduction.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,9 @@ If you want to use PHPCR-ODM, you additionally need to require
4646
4747
require: {
4848
...
49-
"jackalope/jackalope-doctrine-dbal": "1.1.*",
50-
"doctrine/phpcr-odm": "1.1.*",
51-
"doctrine/phpcr-bundle": "1.1.*",
49+
"jackalope/jackalope-doctrine-dbal": "1.2.*",
50+
"doctrine/phpcr-odm": "1.2.*",
51+
"doctrine/phpcr-bundle": "1.2.*",
5252
...
5353
}
5454

components/testing.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ Add the following dependency to the ``require-dev`` section of ``composer.json``
1919
.. code-block:: javascript
2020
2121
"require-dev": {
22-
"symfony-cmf/testing": "1.1.*"
22+
"symfony-cmf/testing": "1.2.*"
2323
},
2424
2525
.. note::

conf.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,9 @@
5555
# built documents.
5656
#
5757
# The short X.Y version.
58-
version = '1.1.0'
58+
version = '1.2.0'
5959
# The full version, including alpha/beta/rc tags.
60-
release = '1.1.0'
60+
release = '1.2.0'
6161

6262
# The language for content autogenerated by Sphinx. Refer to documentation
6363
# for a list of supported languages.

cookbook/database/create_new_project_phpcr_odm.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@ content repository.
3636
...
3737
"require": {
3838
...
39-
"doctrine/phpcr-bundle": "1.1.*",
40-
"doctrine/phpcr-odm": "1.0.*",
41-
"jackalope/jackalope-doctrine-dbal": "1.0.0"
39+
"doctrine/phpcr-bundle": "1.2.*",
40+
"doctrine/phpcr-odm": "1.2.*",
41+
"jackalope/jackalope-doctrine-dbal": "1.2.*"
4242
}
4343
}
4444

cookbook/editions/cmf_core.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ Add the following to your ``composer.json`` file:
3737
3838
"require": {
3939
...
40-
"symfony-cmf/symfony-cmf": "1.1.*"
40+
"symfony-cmf/symfony-cmf": "1.2.*"
4141
}
4242
4343
And then run:

cookbook/editions/cmf_sandbox.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ and then get the Symfony CMF code with it (this may take a while):
4848

4949
.. code-block:: bash
5050
51-
$ composer create-project --no-install symfony-cmf/sandbox <path-to-install> ~1.1
51+
$ composer create-project --no-install symfony-cmf/sandbox <path-to-install> ~1.2
5252
$ cd <path-to-install>
5353
5454
Getting the Sandbox Code: GIT

quick_tour/the_big_picture.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ The best way to download the Symfony CMF Standard Edition is using Composer_:
4545

4646
.. code-block:: bash
4747
48-
$ php composer create-project symfony-cmf/standard-edition cmf ~1.1
48+
$ composer create-project symfony-cmf/standard-edition cmf ~1.2
4949
5050
Setting up the Database
5151
~~~~~~~~~~~~~~~~~~~~~~~

0 commit comments

Comments
 (0)