Skip to content

Commit 62257c0

Browse files
committed
Merge branch '3.4' into 4.0
* 3.4: Add rule to import classes except for built-in PHP classes. Remove non-interpreted stars in property_info.rst Update deployment.rst Fix typo on Method for getSubject Docs Fix French translation fix for simple table layout
2 parents 8954b6d + 2010eb3 commit 62257c0

File tree

6 files changed

+13
-11
lines changed

6 files changed

+13
-11
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
~~~~~~~~~~~~~~~~~~

deployment.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ Deployments not Using the ``composer.json`` File
214214
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
215215

216216
Symfony applications provide a ``kernel.project_dir`` parameter and a related
217-
:method:`Symfony\\Component\\HttpKernel\\Kernel\\Kernel::getProjectDir>` method.
217+
:method:`Symfony\\Component\\HttpKernel\\Kernel::getProjectDir` method.
218218
You can use this method to perform operations with file paths relative to your
219219
project's root directory. The logic to find that project root directory is based
220220
on the location of the main ``composer.json`` file.

routing.rst

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

508-
---------- ---------------------------------------- ------------------------------------------
508+
========== ======================================== ==========================================
509509
Route path If the requested URL is ``/foo`` If the requested URL is ``/foo/``
510-
---------- ---------------------------------------- ------------------------------------------
510+
========== ======================================== ==========================================
511511
``/foo`` It matches (``200`` status response) It doesn't match (``404`` status response)
512512
``/foo/`` It makes a ``301`` redirect to ``/foo/`` It matches (``200`` status response)
513-
---------- ---------------------------------------- ------------------------------------------
513+
========== ======================================== ==========================================
514514

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

workflow/usage.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -383,7 +383,7 @@ This means that each event has access to the following information:
383383
:method:`Symfony\\Component\\Workflow\\Event\\Event::getMarking`
384384
Returns the :class:`Symfony\\Component\\Workflow\\Marking` of the workflow.
385385

386-
:method:`Symfony\\Component\\Worflow\\Event\\Event::getSubject`
386+
:method:`Symfony\\Component\\Workflow\\Event\\Event::getSubject`
387387
Returns the object that dispatches the event.
388388

389389
:method:`Symfony\\Component\\Workflow\\Event\\Event::getTransition`

0 commit comments

Comments
 (0)