Skip to content

Commit 2010eb3

Browse files
committed
Merge branch '2.8' into 3.4
* 2.8: Add rule to import classes except for built-in PHP classes. Remove non-interpreted stars in property_info.rst Fix French translation fix for simple table layout
2 parents 7bebfa7 + 9579a3d commit 2010eb3

File tree

4 files changed

+11
-9
lines changed

4 files changed

+11
-9
lines changed

components/property_info.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -122,10 +122,10 @@ Extractable Information
122122
The :class:`Symfony\\Component\\PropertyInfo\\PropertyInfoExtractor`
123123
class exposes public methods to extract four types of information:
124124

125-
* :ref:`*List* of properties <property-info-list>`: `getProperties()`
126-
* :ref:`Property *type* <property-info-type>`: `getTypes()`
127-
* :ref:`Property *description* <property-info-description>`: `getShortDescription()` and `getLongDescription()`
128-
* :ref:`Property *access* details <property-info-access>`: `isReadable()` and `isWritable()`
125+
* :ref:`List of properties <property-info-list>`: `getProperties()`
126+
* :ref:`Property type <property-info-type>`: `getTypes()`
127+
* :ref:`Property description <property-info-description>`: `getShortDescription()` and `getLongDescription()`
128+
* :ref:`Property access details <property-info-access>`: `isReadable()` and `isWritable()`
129129

130130
.. note::
131131

components/translation/usage.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Imagine you want to translate the string *"Symfony is great"* into French::
1212
$translator = new Translator('fr_FR');
1313
$translator->addLoader('array', new ArrayLoader());
1414
$translator->addResource('array', array(
15-
'Symfony is great!' => 'J\'aime Symfony!',
15+
'Symfony is great!' => 'Symfony est super !',
1616
), 'fr_FR');
1717

1818
var_dump($translator->trans('Symfony is great!'));

contributing/code/standards.rst

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,9 @@ Structure
192192
* Do not use ``else``, ``elseif``, ``break`` after ``if`` and ``case`` conditions
193193
which return or throw something;
194194

195-
* Do not use spaces around ``[`` offset accessor and before ``]`` offset accessor.
195+
* Do not use spaces around ``[`` offset accessor and before ``]`` offset accessor;
196+
197+
* Add a ``use`` statement for every class that is not part of the global namespace.
196198

197199
Naming Conventions
198200
~~~~~~~~~~~~~~~~~~

routing.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -506,12 +506,12 @@ redirect between them.
506506
Symfony follows this logic to redirect between URLs with and without trailing
507507
slashes (but only for ``GET`` and ``HEAD`` requests):
508508

509-
---------- ---------------------------------------- ------------------------------------------
509+
========== ======================================== ==========================================
510510
Route path If the requested URL is ``/foo`` If the requested URL is ``/foo/``
511-
---------- ---------------------------------------- ------------------------------------------
511+
========== ======================================== ==========================================
512512
``/foo`` It matches (``200`` status response) It doesn't match (``404`` status response)
513513
``/foo/`` It makes a ``301`` redirect to ``/foo/`` It matches (``200`` status response)
514-
---------- ---------------------------------------- ------------------------------------------
514+
========== ======================================== ==========================================
515515

516516
In summary, adding a trailing slash in the route path is the best way to ensure
517517
that both URLs work. Read the :doc:`/routing/redirect_trailing_slash` article to

0 commit comments

Comments
 (0)