Skip to content

Commit 218074e

Browse files
committed
Merge branch '5.2' into 5.x
* 5.2: [Uid] Add note about ULIDs not being random in one case s/it's/its [Serializer] Fixed occurence of an old FQCN notation
2 parents b5e2317 + c7f60e1 commit 218074e

File tree

3 files changed

+11
-2
lines changed

3 files changed

+11
-2
lines changed

components/serializer.rst

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,6 +174,8 @@ when this happens, set the ``AbstractNormalizer::ALLOW_EXTRA_ATTRIBUTES`` contex
174174
``false`` and provide an object that implements ``ClassMetadataFactoryInterface``
175175
when constructing the normalizer::
176176

177+
use App\Model\Person;
178+
177179
$data = <<<EOF
178180
<person>
179181
<name>foo</name>
@@ -189,7 +191,7 @@ when constructing the normalizer::
189191

190192
// this will throw a Symfony\Component\Serializer\Exception\ExtraAttributesException
191193
// because "city" is not an attribute of the Person class
192-
$person = $serializer->deserialize($data, 'App\Model\Person', 'xml', [
194+
$person = $serializer->deserialize($data, Person::class, 'xml', [
193195
AbstractNormalizer::ALLOW_EXTRA_ATTRIBUTES => false,
194196
]);
195197

components/uid.rst

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -238,6 +238,13 @@ ULIDs are an alternative to UUIDs when using those is impractical. They provide
238238
128-bit compatibility with UUID, they are lexicographically sortable and they
239239
are encoded as 26-character strings (vs 36-character UUIDs).
240240

241+
.. note::
242+
243+
If you generate more than one ULID during the same millisecond in the
244+
same process then the random portion is incremented by one bit in order
245+
to provide monotonicity for sorting. The random portion is not random
246+
compared to the previous ULID in this case.
247+
241248
Generating ULIDs
242249
~~~~~~~~~~~~~~~~
243250

workflow.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ like this:
160160
If you are creating your first workflows, consider using the ``workflow:dump``
161161
command to :doc:`debug the workflow contents </workflow/dumping-workflows>`.
162162

163-
The configured property will be used via it's implemented getter/setter methods by the marking store::
163+
The configured property will be used via its implemented getter/setter methods by the marking store::
164164

165165
// src/Entity/BlogPost.php
166166
namespace App\Entity;

0 commit comments

Comments
 (0)