From f33b10de86ef58b054db2ac714c4c8c216451e7f Mon Sep 17 00:00:00 2001 From: Alexander Schwenn Date: Sun, 26 Apr 2015 02:15:18 +0200 Subject: [PATCH 1/2] [Reference] Fix order of config blocks --- reference/constraints/Image.rst | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/reference/constraints/Image.rst b/reference/constraints/Image.rst index b73e75ac2e4..f19aa727d02 100644 --- a/reference/constraints/Image.rst +++ b/reference/constraints/Image.rst @@ -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 @@ -188,6 +177,16 @@ following code: 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 From 4240b4b8441bc997819b51e75adcffbba64736c0 Mon Sep 17 00:00:00 2001 From: Alexander Schwenn Date: Sun, 26 Apr 2015 02:37:14 +0200 Subject: [PATCH 2/2] [Reference] Fix missing comma in constraint annotation --- reference/constraints/Image.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/reference/constraints/Image.rst b/reference/constraints/Image.rst index f19aa727d02..e128a192987 100644 --- a/reference/constraints/Image.rst +++ b/reference/constraints/Image.rst @@ -170,7 +170,7 @@ following code: { /** * @Assert\Image( - * allowLandscape = false + * allowLandscape = false, * allowPortrait = false * ) */