Skip to content

Updated to 2.3.0 #2688

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Jun 12, 2013
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
10 changes: 5 additions & 5 deletions book/installation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -57,12 +57,12 @@ Distribution:

.. code-block:: bash

php composer.phar create-project symfony/framework-standard-edition /path/to/webroot/Symfony 2.2.0
php composer.phar create-project symfony/framework-standard-edition /path/to/webroot/Symfony 2.3.0
Copy link
Member

Choose a reason for hiding this comment

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

should we think about giving 2.3 instead of 2.3.0?

Copy link
Member

Choose a reason for hiding this comment

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

👍

Copy link
Member

Choose a reason for hiding this comment

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

well, using 2.3 is strictly equivalent to 2.3.0 (composer normalizes all versions to 4 segments internally so both are considered as 2.3.0.0).

But you could use 2.3.* to install the latest 2.3 release (the --stability option defaults to stable) as create-project accepts any version constraint, not only exact match.

Copy link
Member

Choose a reason for hiding this comment

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

Thanks for the hint, stof. I thought 2.3 would already install the latest versions. So 2.3.* is what I intended to suggest.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

If I replace 2.3.0 by 2.3, should I change the line 84:
For an exact version, replace 2.3.0 with the latest Symfony version. by 2.3 too ?

Copy link
Member

Choose a reason for hiding this comment

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

yes, but replace it with 2.3.* as @stof suggested

Copy link
Member

Choose a reason for hiding this comment

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

@stof are you sure 2.3.* works? I get "[UnexpectedValueException] Invalid version string "2.2.*""

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Same for me, but I get Invalid version string "2.3.*"

Copy link
Member

Choose a reason for hiding this comment

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

ah, sorry, it is indeed not accepting version constraints


.. tip::

For an exact version, replace `2.2.0` with the latest Symfony version
(e.g. 2.2.1). For details, see the `Symfony Installation Page`_
For an exact version, replace "2.3.0" with the latest Symfony version.
For details, see the `Symfony Installation Page`_

.. tip::

Expand Down Expand Up @@ -109,10 +109,10 @@ one of the following commands (replacing ``###`` with your actual filename):
.. code-block:: bash

# for .tgz file
$ tar zxvf Symfony_Standard_Vendors_2.2.###.tgz
$ tar zxvf Symfony_Standard_Vendors_2.3.###.tgz

# for a .zip file
$ unzip Symfony_Standard_Vendors_2.2.###.zip
$ unzip Symfony_Standard_Vendors_2.3.###.zip

If you've downloaded "without vendors", you'll definitely need to read the
next section.
Expand Down
12 changes: 6 additions & 6 deletions components/using_components.rst
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,12 @@ Using the Finder Component

{
"require": {
"symfony/finder": "2.2.*"
"symfony/finder": "2.3.*"
}
}

If you already have a ``composer.json`` file, just add this line to it. You
may also need to adjust the version (e.g. ``2.1.1`` or ``2.2.*``).
may also need to adjust the version (e.g. ``2.2.2`` or ``2.3.*``).

You can research the component names and versions at `packagist.org`_.

Expand Down Expand Up @@ -69,9 +69,9 @@ immediately::

{
"require": {
"symfony/finder": "2.2.*",
"symfony/dom-crawler": "2.2.*",
"symfony/css-selector": "2.2.*"
"symfony/finder": "2.3.*",
"symfony/dom-crawler": "2.3.*",
"symfony/css-selector": "2.3.*"
}
}

Expand All @@ -81,7 +81,7 @@ immediately::

{
"require": {
"symfony/symfony": "2.2.*"
"symfony/symfony": "2.3.*"
}
}

Expand Down
5 changes: 2 additions & 3 deletions contributing/documentation/overview.rst
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,8 @@ then clone your fork:
$ git clone git://github.com/YOURUSERNAME/symfony-docs.git

Consistent with Symfony's source code, the documentation repository is split into
multiple branches: ``2.0``, ``2.1``, ``2.2`` corresponding to the different
versions of Symfony itself. The ``master`` branch holds the documentation
for the development branch of the code.
multiple branches, corresponding to the different versions of Symfony itself.
The ``master`` branch holds the documentation for the development branch of the code.

Unless you're documenting a feature that was introduced *after* Symfony 2.1
(e.g. in Symfony 2.2), your changes should always be based on the 2.1 branch.
Expand Down
8 changes: 4 additions & 4 deletions quick_tour/the_big_picture.rst
Original file line number Diff line number Diff line change
Expand Up @@ -76,13 +76,13 @@ have a ``Symfony/`` directory that looks like this:

.. code-block:: bash
$ composer.phar create-project symfony/framework-standard-edition path/to/install 2.2.0
$ composer.phar create-project symfony/framework-standard-edition path/to/install 2.3.*
# remove the Git history
$ rm -rf .git
For an exact version, replace `2.2.0` with the latest Symfony version
(e.g. 2.1.1). For details, see the `Symfony Installation Page`_
For an exact version, replace "2.3.0" with the latest Symfony version.
For details, see the `Symfony Installation Page`_

.. tip::

Expand Down