Permalink
Browse files

Merge branch 'hotfix/form-annotations-doctrine' of git://github.com/w…

…eierophinney/zf2-documentation into weierophinney-hotfix/form-annotations-doctrine

* 'hotfix/form-annotations-doctrine' of git://github.com/weierophinney/zf2-documentation:
  Add note about need for doctrine/common
  • Loading branch information...
2 parents b3d5dfe + 25460fa commit d6efcea4c3c09c789aa69ec051eb1aaf21b51b98 @Freeaqingme Freeaqingme committed Oct 13, 2012
Showing with 20 additions and 1 deletion.
  1. +3 −1 .gitignore
  2. +17 −0 docs/languages/en/modules/zend.form.quick-start.rst
View
@@ -5,4 +5,6 @@ nbproject
.settings/
tmp/
.DS_Store
-composer.lock
+composer.lock
+.*.sw*
+.*.un~
@@ -917,6 +917,23 @@ To use annotations, you simply include them in your class and/or property docblo
resolved according to the import statements in your class; as such, you can make them as long or as short as you
want depending on what you import.
+.. note::
+
+ Form annotations require ``Doctrine\\Common``, which contains an annotation
+ parsering engine. The simplest way to install ``Doctrine\\Common`` is if you
+ are using ``Composer``; simply update your ``composer.json`` and add the
+ following line to the ``require`` section:
+
+ .. code-block:: javascript
+
+ "doctrine/common": ">=2.1",
+
+ Then run ``php composer.phar update`` to install the dependency.
+
+ If you're not using ``Composer``, visit `the Doctrine project website
+ <http://www.doctrine-project.org/projects/common.html>`_ for more details on
+ installation.
+
Here's a simple example.
.. code-block:: php

0 comments on commit d6efcea

Please sign in to comment.