Skip to content

Commit 788ffe2

Browse files
committed
Merge branch '2.7' into 2.8
* 2.7: 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 f104e1a + 254f501 commit 788ffe2

File tree

3 files changed

+6
-3
lines changed

3 files changed

+6
-3
lines changed

components/serializer.rst

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -423,8 +423,9 @@ CamelCase to snake_case
423423
interface was introduced in Symfony 2.7.
424424

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

429430
Symfony provides a built-in name converter designed to transform between
430431
snake_case and CamelCased styles during serialization and deserialization
@@ -689,5 +690,6 @@ Learn more
689690
A popular alternative to the Symfony Serializer Component is the third-party
690691
library, `JMS serializer`_ (released under the Apache license, so incompatible with GPLv2 projects).
691692

693+
.. _`PSR-1 standard`: http://www.php-fig.org/psr/psr-1/
692694
.. _`JMS serializer`: https://github.com/schmittjoh/serializer
693695
.. _Packagist: https://packagist.org/packages/symfony/serializer

reference/forms/types/date.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ picker:
109109

110110
<script>
111111
$(document).ready(function() {
112-
// configure the bootstrap datepicker
112+
// you may need to change this code if you are not using Bootstrap Datepicker
113113
$('.js-datepicker').datepicker({
114114
format: 'yyyy-mm-dd'
115115
});

testing.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -916,6 +916,7 @@ Learn more
916916

917917
testing/*
918918

919+
* :ref:`Testing a console command <console-testing-commands>`
919920
* :doc:`The chapter about tests in the Symfony Framework Best Practices </best_practices/tests>`
920921
* :doc:`/components/dom_crawler`
921922
* :doc:`/components/css_selector`

0 commit comments

Comments
 (0)