Skip to content

Commit dbfc512

Browse files
committed
Merge branch '5.2' into 5.3
* 5.2: fix readlink description Update best_practices.rst
2 parents dd23482 + c92b018 commit dbfc512

File tree

2 files changed

+6
-9
lines changed

2 files changed

+6
-9
lines changed

bundles/best_practices.rst

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,9 @@ interoperability standard for PHP namespaces and class names: it starts with a
2222
vendor segment, followed by zero or more category segments, and it ends with the
2323
namespace short name, which must end with ``Bundle``.
2424

25-
A namespace becomes a bundle as soon as you add a bundle class to it. The
26-
bundle class name must follow these rules:
25+
A namespace becomes a bundle as soon as you add "a bundle class" to it (which is
26+
a class that extends :class:`Symfony\\Component\\HttpKernel\\Bundle\\Bundle`).
27+
The bundle class name must follow these rules:
2728

2829
* Use only alphanumeric characters and underscores;
2930
* Use a StudlyCaps name (i.e. camelCase with an uppercase first letter);

components/filesystem.rst

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -214,13 +214,9 @@ support symbolic links, a third boolean argument is available::
214214

215215
:method:`Symfony\\Component\\Filesystem\\Filesystem::readlink` read links targets.
216216

217-
PHP's :phpfunction:`readlink` function returns the target of a symbolic link. However, its behavior
218-
is completely different under Windows and Unix. On Windows systems, ``readlink()``
219-
resolves recursively the children links of a link until a final target is found. On
220-
Unix-based systems ``readlink()`` only resolves the next link.
221-
222-
The :method:`Symfony\\Component\\Filesystem\\Filesystem::readlink` method provided
223-
by the Filesystem component always behaves in the same way::
217+
The :method:`Symfony\\Component\\Filesystem\\Filesystem::readlink` method
218+
provided by the Filesystem component behaves in the same way on all operating
219+
systems (unlike PHP's :phpfunction:`readlink` function)::
224220

225221
// returns the next direct target of the link without considering the existence of the target
226222
$filesystem->readlink('/path/to/link');

0 commit comments

Comments
 (0)