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

Preparing for 1.2 release #580

Merged
merged 4 commits into from
Oct 25, 2014
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion book/installation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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::
Expand Down
27 changes: 0 additions & 27 deletions bundles/core/dependency_injection_tags.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
~~~~~~~~~~~~~~~~~~~

Expand Down
2 changes: 1 addition & 1 deletion bundles/create/introduction.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I seem to remember CreateBundle now supported ORM too?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

createphp does, but the bundle not yet. we should really try to add that though, should not be very hard. but not for 1.2, this has to go out.

so yeah, lets keep that change and when we implement support we will want to update the doc anyways.

configure the ``cmf_create.object_mapper_service_id``.

Expand Down
3 changes: 1 addition & 2 deletions bundles/menu/introduction.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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::

Expand Down
6 changes: 3 additions & 3 deletions bundles/phpcr_odm/introduction.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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.*",
...
}

Expand Down
2 changes: 1 addition & 1 deletion components/testing.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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::
Expand Down
4 changes: 2 additions & 2 deletions conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
6 changes: 3 additions & 3 deletions cookbook/database/create_new_project_phpcr_odm.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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.*"
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

these were locked to 1.0, but I think 1.2.* would be correct?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

+1

}
}

Expand Down
2 changes: 1 addition & 1 deletion cookbook/editions/cmf_core.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion cookbook/editions/cmf_sandbox.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion quick_tour/the_big_picture.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
~~~~~~~~~~~~~~~~~~~~~~~
Expand Down