Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit e89ffa0

Browse filesBrowse files
committed
Merge branch '3.3' into 3.4
* 3.3: Update collection.rst Mention that PSR-1 doesn't recommend CamelCase or anything else minor #8091 Update js-datepicker usage for new jQuery UI (AdrianBorodziuk, javiereguiluz) minor #8983 cross-reference console command testing from testing guide (dbu)
2 parents c028faa + 168d5d6 commit e89ffa0
Copy full SHA for e89ffa0

File tree

3 files changed

+6
-3
lines changed
Filter options

3 files changed

+6
-3
lines changed

‎components/serializer.rst

Copy file name to clipboardExpand all lines: components/serializer.rst
+4-2Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -463,8 +463,9 @@ CamelCase to snake_case
463463
~~~~~~~~~~~~~~~~~~~~~~~
464464

465465
In many formats, it's common to use underscores to separate words (also known
466-
as snake_case). However, PSR-1 specifies that the preferred style for PHP
467-
properties and methods is CamelCase.
466+
as snake_case). However, in Symfony applications is common to use CamelCase to
467+
name properties (even though the `PSR-1 standard`_ doesn't recommend any
468+
specific case for property names).
468469

469470
Symfony provides a built-in name converter designed to transform between
470471
snake_case and CamelCased styles during serialization and deserialization
@@ -1005,6 +1006,7 @@ Learn more
10051006
A popular alternative to the Symfony Serializer Component is the third-party
10061007
library, `JMS serializer`_ (released under the Apache license, so incompatible with GPLv2 projects).
10071008

1009+
.. _`PSR-1 standard`: http://www.php-fig.org/psr/psr-1/
10081010
.. _`JMS serializer`: https://github.com/schmittjoh/serializer
10091011
.. _Packagist: https://packagist.org/packages/symfony/serializer
10101012
.. _RFC3339: https://tools.ietf.org/html/rfc3339#section-5.8

‎reference/forms/types/collection.rst

Copy file name to clipboardExpand all lines: reference/forms/types/collection.rst
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -338,7 +338,7 @@ type::
338338
entry_type
339339
~~~~~~~~~~
340340

341-
**type**: ``string`` or :class:`Symfony\\Component\\Form\\FormTypeInterface` **required**
341+
**type**: ``string`` or :class:`Symfony\\Component\\Form\\FormTypeInterface` **default**: Symfony\\Component\\Form\\Extension\\Core\\Type\\TextType
342342

343343
This is the field type for each item in this collection (e.g. ``TextType``,
344344
``ChoiceType``, etc). For example, if you have an array of email addresses,

‎testing.rst

Copy file name to clipboardExpand all lines: testing.rst
+1Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -910,6 +910,7 @@ Learn more
910910

911911
testing/*
912912

913+
* :ref:`Testing a console command <console-testing-commands>`
913914
* :doc:`The chapter about tests in the Symfony Framework Best Practices </best_practices/tests>`
914915
* :doc:`/components/dom_crawler`
915916
* :doc:`/components/css_selector`

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.