Skip to content

Commit

Permalink
minor #5209 [Reference] Fix order of config blocks (xelaris)
Browse files Browse the repository at this point in the history
This PR was merged into the 2.6 branch.

Discussion
----------

[Reference] Fix order of config blocks

| Q             | A
| ------------- | ---
| Doc fix?      | yes
| New docs?     | no
| Applies to    | 2.6+
| Fixed tickets |

Commits
-------

4240b4b [Reference] Fix missing comma in constraint annotation
f33b10d [Reference] Fix order of config blocks
  • Loading branch information
wouterj committed Apr 26, 2015
2 parents 4eabb47 + 4240b4b commit 134268e
Showing 1 changed file with 11 additions and 12 deletions.
23 changes: 11 additions & 12 deletions reference/constraints/Image.rst
Original file line number Diff line number Diff line change
Expand Up @@ -159,17 +159,6 @@ following code:

.. configuration-block::

.. code-block:: yaml
# src/Acme/BlogBundle/Resources/config/validation.yml
Acme\BlogBundle\Entity\Author
properties:
headshot:
- Image:
allowLandscape: false
allowPortrait: false
.. code-block:: php-annotations
// src/Acme/BlogBundle/Entity/Author.php
Expand All @@ -181,13 +170,23 @@ following code:
{
/**
* @Assert\Image(
* allowLandscape = false
* allowLandscape = false,
* allowPortrait = false
* )
*/
protected $headshot;
}
.. code-block:: yaml
# src/Acme/BlogBundle/Resources/config/validation.yml
Acme\BlogBundle\Entity\Author
properties:
headshot:
- Image:
allowLandscape: false
allowPortrait: false
.. code-block:: xml
<!-- src/Acme/BlogBundle/Resources/config/validation.xml -->
Expand Down

0 comments on commit 134268e

Please sign in to comment.