Merge pull request #759 from mfdj/patch-1
Fixed out of sync code examples in getting-started.rst
This commit is contained in:
commit
f634ba343c
@ -25,7 +25,7 @@ The code of this tutorial is `available on Github <https://github.com/doctrine/d
|
||||
|
||||
.. note::
|
||||
|
||||
This tutorial assumes you work with Doctrine 2.4 and above.
|
||||
This tutorial assumes you work with **Doctrine 2.4** and above.
|
||||
Some of the code will not work with lower versions.
|
||||
|
||||
What is Doctrine?
|
||||
@ -87,13 +87,15 @@ the following contents:
|
||||
|
||||
{
|
||||
"require": {
|
||||
"doctrine/orm": "2.*",
|
||||
"doctrine/orm": "2.4.*",
|
||||
"symfony/yaml": "2.*"
|
||||
},
|
||||
"autoload": {
|
||||
"psr-0": {"": "src/"}
|
||||
},
|
||||
"minimum-stability" : "dev"
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Install Doctrine using the Composer Dependency Management tool, by calling:
|
||||
|
||||
@ -102,15 +104,13 @@ Install Doctrine using the Composer Dependency Management tool, by calling:
|
||||
$ composer install
|
||||
|
||||
This will install the packages Doctrine Common, Doctrine DBAL, Doctrine ORM,
|
||||
Symfony YAML and Symfony Console. Both Symfony dependencies are optional
|
||||
but will be used in this tutorial.
|
||||
|
||||
You can prepare the directory structure:
|
||||
Symfony YAML and Symfony Console into the `vendor` directory. The Symfony
|
||||
dependencies are not required by Doctrine but will be used in this tutorial.
|
||||
|
||||
Add the following directories:
|
||||
::
|
||||
|
||||
project
|
||||
|-- composer.json
|
||||
doctrine2-tutorial
|
||||
|-- config
|
||||
| |-- xml
|
||||
| `-- yaml
|
||||
|
Loading…
x
Reference in New Issue
Block a user