From f42956a8195e98e09f5e578db814dce200e39b85 Mon Sep 17 00:00:00 2001 From: Wouter J Date: Mon, 3 Mar 2014 16:21:40 +0100 Subject: [PATCH 1/5] Added anchor for permissions --- book/installation.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/book/installation.rst b/book/installation.rst index 52a5f89ed01..326990d526b 100644 --- a/book/installation.rst +++ b/book/installation.rst @@ -212,6 +212,8 @@ to check your configuration: If there are any issues, correct them now before moving on. +.. _book-installation-permissions: + .. sidebar:: Setting up Permissions One common issue is that the ``app/cache`` and ``app/logs`` directories From 34f5b0c32d75cf407479aa08194bb1e7c7e1fdb9 Mon Sep 17 00:00:00 2001 From: Ryan Weaver Date: Mon, 3 Mar 2014 21:17:05 -0600 Subject: [PATCH 2/5] Some slight reordering of the form options - and also tweaking language around PATCH behavior --- reference/forms/types/form.rst | 12 ++++++------ reference/forms/types/options/action.rst.inc | 2 +- reference/forms/types/options/method.rst.inc | 8 +++++--- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/reference/forms/types/form.rst b/reference/forms/types/form.rst index fe795634475..20c8db4fe5b 100644 --- a/reference/forms/types/form.rst +++ b/reference/forms/types/form.rst @@ -9,14 +9,18 @@ See :class:`Symfony\\Component\\Form\\Extension\\Core\\Type\\FormType`. The ``form`` type predefines a couple of options that are then available on all fields. -.. include:: /reference/forms/types/options/compound.rst.inc - .. include:: /reference/forms/types/options/data.rst.inc .. include:: /reference/forms/types/options/data_class.rst.inc +.. include:: /reference/forms/types/options/action.rst.inc + +.. include:: /reference/forms/types/options/method.rst.inc + .. include:: /reference/forms/types/options/empty_data.rst.inc +.. include:: /reference/forms/types/options/compound.rst.inc + .. include:: /reference/forms/types/options/required.rst.inc .. include:: /reference/forms/types/options/label.rst.inc @@ -62,7 +66,3 @@ on all fields. .. include:: /reference/forms/types/options/post_max_size_message.rst.inc .. include:: /reference/forms/types/options/pattern.rst.inc - -.. include:: /reference/forms/types/options/action.rst.inc - -.. include:: /reference/forms/types/options/method.rst.inc diff --git a/reference/forms/types/options/action.rst.inc b/reference/forms/types/options/action.rst.inc index 70977722000..90dd1835613 100644 --- a/reference/forms/types/options/action.rst.inc +++ b/reference/forms/types/options/action.rst.inc @@ -6,7 +6,7 @@ action **type**: ``string`` **default**: empty string -This option specifies where to send the form's data on submission (usually an +This option specifies where to send the form's data on submission (usually a URI). Its value is rendered as the ``action`` attribute of the ``form`` element. An empty value is considered a same-document reference, i.e. the form will be submitted to the same URI that rendered the form. diff --git a/reference/forms/types/options/method.rst.inc b/reference/forms/types/options/method.rst.inc index d1d6c84b1ce..592191776a6 100644 --- a/reference/forms/types/options/method.rst.inc +++ b/reference/forms/types/options/method.rst.inc @@ -26,6 +26,8 @@ used to decide whether to process the form submission in the .. note: - Only the PATCH method allows submitting partial data without that missing - fields are set to ``null`` in the underlying data (preserving default - values, if any). + The PATCH method allows submitting partial data. In other words, if the + submitted form data is missing certain fields, those will be ignored + and the default values (if any) will be used. With all other HTTP methods, + if the submitted form data is missing some fields, those fields are set + to ``null``. From baa67ddd515ae2c2be744011d011229e864e8472 Mon Sep 17 00:00:00 2001 From: Christian Stoller Date: Tue, 4 Mar 2014 10:32:49 +0100 Subject: [PATCH 3/5] Added documentation for message option of the `True` constraint --- reference/constraints/Valid.rst | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/reference/constraints/Valid.rst b/reference/constraints/Valid.rst index 79c1b992ef9..029f6c50cde 100644 --- a/reference/constraints/Valid.rst +++ b/reference/constraints/Valid.rst @@ -9,6 +9,7 @@ object and all sub-objects associated with it. | Applies to | :ref:`property or method ` | +----------------+---------------------------------------------------------------------+ | Options | - `traverse`_ | +| | - `message`_ | +----------------+---------------------------------------------------------------------+ | Class | :class:`Symfony\\Component\\Validator\\Constraints\\Type` | +----------------+---------------------------------------------------------------------+ @@ -263,3 +264,10 @@ traverse If this constraint is applied to a property that holds an array of objects, then each object in that array will be validated only if this option is set to ``true``. + +message +~~~~~~~ + +**type**: ``string`` **default**: ``This value should be true.`` + +This is the message that will be shown if the value is false. From 370d61477c951322681327fcfff7f2a4189adf03 Mon Sep 17 00:00:00 2001 From: Inal DJAFAR Date: Tue, 11 Mar 2014 23:52:48 +0100 Subject: [PATCH 4/5] [Cookbook][Test]fix sample code --- cookbook/testing/profiling.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cookbook/testing/profiling.rst b/cookbook/testing/profiling.rst index 2ee70f00eae..c8f6c6cacf4 100644 --- a/cookbook/testing/profiling.rst +++ b/cookbook/testing/profiling.rst @@ -51,7 +51,7 @@ finish. It's easy to achieve if you embed the token in the error message:: $this->assertLessThan( 30, - $profile->get('db')->getQueryCount(), + $profile->getCollector('db')->getQueryCount(), sprintf( 'Checks that query count is less than 30 (token %s)', $profile->getToken() From f1f9bb03626273e5b755555cf6876d4a93d78c28 Mon Sep 17 00:00:00 2001 From: Ala Eddine khefifi Date: Wed, 12 Mar 2014 16:09:14 +0100 Subject: [PATCH 5/5] Update index.rst --- cookbook/controller/service.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cookbook/controller/service.rst b/cookbook/controller/service.rst index dbcb9689b99..3577c1a2487 100644 --- a/cookbook/controller/service.rst +++ b/cookbook/controller/service.rst @@ -96,7 +96,7 @@ To refer to a controller that's defined as a service, use the single colon (:) notation. For example, to forward to the ``indexAction()`` method of the service defined above with the id ``acme.hello.controller``:: - $this->forward('acme.hello.controller:indexAction'); + $this->forward('acme.hello.controller:indexAction', array('name' => $name)); .. note::