Skip to content

Commit ac970b2

Browse files
committed
Merge branch '3.4'
* 3.4: (34 commits) Update resources.rst Update events.rst Improved a help note about authentication providers [#8280] add missing trailing comma [#8282] fix regex delimiters Add missing comment Update parameters.rst validateValue() is deprecated in 3.0 prefer getObject as getEntity is deprecated Fix non-existing Ldap::find() method Fix encore versioning config for SF 4 structure Update serializer.rst [#8308] fix commands order Update NotIdenticalTo.rst Correct psr/log package name Fixed typo Update debugging.rst Update group_service_resolver.rst Update remember_me.rst Update expression_language.rst ...
2 parents ef97812 + 556be4d commit ac970b2

33 files changed

+182
-61
lines changed

components/console/logger.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ The Console component comes with a standalone logger complying with the
99
be sent to the :class:`Symfony\\Component\\Console\\Output\\OutputInterface`
1010
instance passed as a parameter to the constructor.
1111

12-
The logger does not have any external dependency except ``php-fig/log``.
12+
The logger does not have any external dependency except ``psr/log``.
1313
This is useful for console applications and commands needing a lightweight
1414
PSR-3 compliant logger::
1515

components/ldap.rst

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -37,15 +37,11 @@ using the following options:
3737
``version``
3838
The version of the LDAP protocol to use
3939

40-
``useSsl``
41-
Whether or not to secure the connection using SSL
40+
``encryption``
41+
The encryption protocol : ``ssl``, ``tls`` or ``none`` (default)
4242

43-
``useStartTls``
44-
Whether or not to secure the connection using StartTLS
45-
46-
``optReferrals``
47-
Specifies whether to automatically follow referrals
48-
returned by the LDAP server
43+
``options``
44+
LDAP server's options as defined in :class:`ConnectionOptions <Symfony\\Component\\Ldap\\Adapter\\ExtLdap\\ConnectionOptions>`
4945

5046
For example, to connect to a start-TLS secured LDAP server::
5147

@@ -73,10 +69,10 @@ distinguished name (DN) and the password of a user::
7369

7470
Once bound (or if you enabled anonymous authentication on your
7571
LDAP server), you may query the LDAP server using the
76-
:method:`Symfony\\Component\\Ldap\\Ldap::find` method::
72+
:method:`Symfony\\Component\\Ldap\\Ldap::query` method::
7773

7874
// ...
7975

80-
$ldap->find('dc=symfony,dc=com', '(&(objectclass=person)(ou=Maintainers))');
76+
$ldap->query('dc=symfony,dc=com', '(&(objectclass=person)(ou=Maintainers))');
8177

8278
.. _Packagist: https://packagist.org/packages/symfony/ldap

components/serializer.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -405,7 +405,7 @@ class extending :class:`Symfony\\Component\\Serializer\\Normalizer\\AbstractNorm
405405
including :class:`Symfony\\Component\\Serializer\\Normalizer\\GetSetMethodNormalizer`
406406
and :class:`Symfony\\Component\\Serializer\\Normalizer\\PropertyNormalizer`::
407407

408-
use Symfony\Component\Serializer\Encoder\JsonEncoder
408+
use Symfony\Component\Serializer\Encoder\JsonEncoder;
409409
use Symfony\Component\Serializer\Normalizer\ObjectNormalizer;
410410
use Symfony\Component\Serializer\Serializer;
411411

components/validator/resources.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -173,14 +173,14 @@ Using a Custom MetadataFactory
173173
------------------------------
174174

175175
All the loaders and the cache are passed to an instance of
176-
:class:`Symfony\\Component\\Validator\\Mapping\\ClassMetadataFactory`. This
177-
class is responsible for creating a ``ClassMetadata`` instance from all the
176+
:class:`Symfony\\Component\\Validator\\Mapping\\Factory\\LazyLoadingMetadataFactory`.
177+
This class is responsible for creating a ``ClassMetadata`` instance from all the
178178
configured resources.
179179

180180
You can also use a custom metadata factory implementation by creating a class
181181
which implements
182-
:class:`Symfony\\Component\\Validator\\MetadataFactoryInterface`. You can set
183-
this custom implementation using
182+
:class:`Symfony\\Component\\Validator\\Mapping\\Factory\\MetadataFactoryInterface`.
183+
You can set this custom implementation using
184184
:method:`Symfony\\Component\\Validator\\ValidatorBuilder::setMetadataFactory`::
185185

186186
use Acme\Validation\CustomMetadataFactory;

components/var_dumper.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ Choosing between both is mostly a matter of personal taste, still:
101101
be suited to your use case (e.g. you shouldn't use it in an HTML
102102
attribute or a ``<script>`` tag).
103103

104-
This behavior can be changed by configuring the ``dump.dump_destination``
104+
This behavior can be changed by configuring the ``debug.dump_destination``
105105
option. Read more about this and other options in
106106
:doc:`the DebugBundle configuration reference </reference/configuration/debug>`.
107107

components/yaml/yaml_format.rst

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -300,4 +300,28 @@ Comments can be added in YAML by prefixing them with a hash mark (``#``):
300300
Comments are simply ignored by the YAML parser and do not need to be
301301
indented according to the current level of nesting in a collection.
302302

303+
Explicit Typing
304+
---------------
305+
306+
The YAML specification defines some tags to set the type of any data explicitly:
307+
308+
.. code-block:: yaml
309+
310+
data:
311+
# this value is parsed as a string (it's not transformed into a DateTime)
312+
start_date: !!str 2002-12-14
313+
314+
# this value is parsed as a float number (it will be 3.0 instead of 3)
315+
price: !!float 3
316+
317+
# this value is parsed as binary data encoded in base64
318+
picture: !!binary |
319+
R0lGODlhDAAMAIQAAP//9/X
320+
17unp5WZmZgAAAOfn515eXv
321+
Pz7Y6OjuDg4J+fn5OTk6enp
322+
56enmleECcgggoBADs=
323+
324+
.. versionadded:: 3.4
325+
Support for the ``!!str`` tag was introduced in Symfony 3.4.
326+
303327
.. _YAML: http://yaml.org/

debug/debugging.rst

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,9 @@ that can help you visualize and find the information.
2828
``debug:config``
2929
Shows all configured bundles, their class and their alias.
3030

31+
``debug:event-dispatcher``
32+
Displays information about all the registered listeners in the event dispatcher.
33+
3134
``debug:router``
3235
Displays information about all configured routes in the application as a
3336
table with the name, method, scheme, host and path for each route.

doctrine/event_listeners_subscribers.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ interface and have an event method for each event it subscribes to::
165165

166166
public function index(LifecycleEventArgs $args)
167167
{
168-
$entity = $args->getEntity();
168+
$entity = $args->getObject();
169169

170170
// perhaps you only want to act on some "Product" entity
171171
if ($entity instanceof Product) {

form/dynamic_form_modification.rst

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -412,7 +412,6 @@ sport like this::
412412
'class' => 'AppBundle:Position',
413413
'placeholder' => '',
414414
'choices' => $positions,
415-
'choices_as_values' => true,
416415
));
417416
}
418417
);
@@ -469,7 +468,6 @@ The type would now look like::
469468
'class' => 'AppBundle:Position',
470469
'placeholder' => '',
471470
'choices' => $positions,
472-
'choices_as_values' => true,
473471
));
474472
};
475473

form/events.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,8 @@ View data ``null``
8484

8585
.. sidebar:: ``FormEvents::PRE_SET_DATA`` in the Form component
8686

87-
The ``collection`` form type relies on the
88-
``Symfony\Component\Form\Extension\Core\EventListener\ResizeFormListener``
87+
The ``Symfony\Component\Form\Extension\Core\Type\CollectionType`` form type relies
88+
on the ``Symfony\Component\Form\Extension\Core\EventListener\ResizeFormListener``
8989
subscriber, listening to the ``FormEvents::PRE_SET_DATA`` event in order
9090
to reorder the form's fields depending on the data from the pre-populated
9191
object, by removing and adding all form rows.

0 commit comments

Comments
 (0)