Merge branch '2.8' into 3.4

javiereguiluz · javiereguiluz · commit 26493f342f87 · 2018-07-19T11:06:26.000+02:00
* 2.8:
  Image to console
  Show console table examples in a console terminal
  Showed the output of the command in the same CLI window
  Replace entry/section by "article"
diff --git a/_images/components/console/table.png b/_images/components/console/table.png
diff --git a/_images/components/phpunit_bridge/report.png b/_images/components/phpunit_bridge/report.png
diff --git a/_images/translation/debug_1.png b/_images/translation/debug_1.png
diff --git a/_images/translation/debug_2.png b/_images/translation/debug_2.png
diff --git a/_images/translation/debug_3.png b/_images/translation/debug_3.png
diff --git a/_images/translation/debug_4.png b/_images/translation/debug_4.png
diff --git a/components/console/helpers/table.rst b/components/console/helpers/table.rst
@@ -6,7 +6,7 @@ Table
 
 When building a console application it may be useful to display tabular data:
 
-.. code-block:: text
+.. code-block:: terminal
 
     +---------------+--------------------------+------------------+
     | ISBN          | Title                    | Author           |
@@ -54,7 +54,7 @@ You can add a table separator anywhere in the output by passing an instance of
         array('80-902734-1-6', 'And Then There Were None', 'Agatha Christie'),
     ));
 
-.. code-block:: text
+.. code-block:: terminal
 
     +---------------+--------------------------+------------------+
     | ISBN          | Title                    | Author           |
@@ -78,7 +78,7 @@ In this example, the first column width will be ``10``, the last column width
 will be ``30`` and the second column width will be calculated automatically
 because of the ``0`` value. The output of this command will be:
 
-.. code-block:: text
+.. code-block:: terminal
 
     +---------------+--------------------------+--------------------------------+
     | ISBN          | Title                    | Author                         |
@@ -117,7 +117,7 @@ The table style can be changed to any built-in styles via
 
 This code results in:
 
-.. code-block:: text
+.. code-block:: terminal
 
      ISBN          Title                    Author
      99921-58-10-7 Divine Comedy            Dante Alighieri
@@ -132,7 +132,7 @@ You can also set the style to ``borderless``::
 
 which outputs:
 
-.. code-block:: text
+.. code-block:: terminal
 
      =============== ========================== ==================
       ISBN            Title                      Author
@@ -205,7 +205,7 @@ To make a table cell that spans multiple columns you can use a :class:`Symfony\\
 
 This results in:
 
-.. code-block:: text
+.. code-block:: terminal
 
     +---------------+---------------+-----------------+
     | ISBN          | Title         | Author          |
@@ -228,7 +228,7 @@ This results in:
 
     This generates:
 
-    .. code-block:: text
+    .. code-block:: terminal
 
         +-------+-------+--------+
         | Main table title       |
@@ -259,7 +259,7 @@ In a similar way you can span multiple rows::
 
 This outputs:
 
-.. code-block:: text
+.. code-block:: terminal
 
     +----------------+---------------+---------------------+
     | ISBN           | Title         | Author              |
diff --git a/components/http_foundation/session_configuration.rst b/components/http_foundation/session_configuration.rst
@@ -5,7 +5,7 @@
 Configuring Sessions and Save Handlers
 ======================================
 
-This section deals with how to configure session management and fine tune it
+This article deals with how to configure session management and fine tune it
 to your specific needs. This documentation covers save handlers, which
 store and retrieve session data, and configuring session behavior.
 
diff --git a/components/phpunit_bridge.rst b/components/phpunit_bridge.rst
@@ -79,7 +79,23 @@ to provide more features:
 
 After running your PHPUnit tests, you will get a report similar to this one:
 
-.. image:: /_images/components/phpunit_bridge/report.png
+.. code-block:: terminal
+
+    $ phpunit -c app
+      PHPUnit by Sebastian Bergmann.
+
+      Configuration read from <your-project>/app/phpunit.xml.dist
+      .................
+
+      Time: 1.77 seconds, Memory: 5.75Mb
+
+      OK (17 tests, 21 assertions)
+
+      Remaining deprecation notices (2)
+
+      getEntityManager is deprecated since Symfony 2.1. Use getManager instead: 2x
+        1x in DefaultControllerTest::testPublicUrls from AppBundle\Tests\Controller
+        1x in BlogControllerTest::testIndex from AppBundle\Tests\Controller
 
 The summary includes:
 
diff --git a/components/security/firewall.rst b/components/security/firewall.rst
@@ -36,7 +36,7 @@ certain action or resource of the application::
 
 .. note::
 
-    Read the dedicated sections to learn more about :doc:`/components/security/authentication`
+    Read the dedicated articles to learn more about :doc:`/components/security/authentication`
     and :doc:`/components/security/authorization`.
 
 .. _firewall:
@@ -163,5 +163,5 @@ context works:
 #. Once a user is authenticated, you'll use :doc:`/components/security/authorization`
    to deny access to certain resources.
 
-Read the next sections to find out more about :doc:`/components/security/authentication`
+Read the next articles to find out more about :doc:`/components/security/authentication`
 and :doc:`/components/security/authorization`.
diff --git a/deployment.rst b/deployment.rst
@@ -202,7 +202,7 @@ setup:
 Application Lifecycle: Continuous Integration, QA, etc.
 -------------------------------------------------------
 
-While this entry covers the technical details of deploying, the full lifecycle
+While this article covers the technical details of deploying, the full lifecycle
 of taking code from development up to production may have more steps:
 deploying to staging, QA (Quality Assurance), running tests, etc.
 
diff --git a/doctrine/event_listeners_subscribers.rst b/doctrine/event_listeners_subscribers.rst
@@ -237,7 +237,7 @@ to the tag like so:
 .. note::
 
     Marking an event listener as ``lazy`` has nothing to do with lazy service
-    definitions which are described :doc:`in their own section </service_container/lazy_services>`
+    definitions which are described :doc:`in their own article </service_container/lazy_services>`
 
 .. _`The Event System`: http://docs.doctrine-project.org/projects/doctrine-orm/en/latest/reference/events.html
 .. _`the Doctrine Documentation`: http://docs.doctrine-project.org/projects/doctrine-orm/en/latest/reference/events.html#entity-listeners
diff --git a/doctrine/repository.rst b/doctrine/repository.rst
@@ -4,10 +4,10 @@
 How to Create custom Repository Classes
 =======================================
 
-In the previous sections, you began constructing and using more complex queries
-from inside a controller. In order to isolate, reuse and test these queries,
-it's a good practice to create a custom repository class for your entity.
-Methods containing your query logic can then be stored in this class.
+Constructing and using complex queries inside controllers complicate the
+maintenance of your application. In order to isolate, reuse and test these
+queries, it's a good practice to create a custom repository class for your
+entity. Methods containing your query logic can then be stored in this class.
 
 To do this, add the repository class name to your entity's mapping definition:
 
diff --git a/form/dynamic_form_modification.rst b/form/dynamic_form_modification.rst
@@ -4,7 +4,7 @@
 How to Dynamically Modify Forms Using Form Events
 =================================================
 
-Often times, a form can't be created statically. In this entry, you'll learn
+Often times, a form can't be created statically. In this article, you'll learn
 how to customize your form based on three common use-cases:
 
 1) :ref:`form-events-underlying-data`
@@ -74,7 +74,7 @@ Suppose now, that you don't want the user to be able to change the ``name`` valu
 once the object has been created. To do this, you can rely on Symfony's
 :doc:`EventDispatcher component </components/event_dispatcher>`
 system to analyze the data on the object and modify the form based on the
-Product object's data. In this entry, you'll learn how to add this level of
+Product object's data. In this article, you'll learn how to add this level of
 flexibility to your forms.
 
 Adding an Event Listener to a Form Class
diff --git a/form/form_collections.rst b/form/form_collections.rst
@@ -4,14 +4,14 @@
 How to Embed a Collection of Forms
 ==================================
 
-In this entry, you'll learn how to create a form that embeds a collection
+In this article, you'll learn how to create a form that embeds a collection
 of many other forms. This could be useful, for example, if you had a ``Task``
 class and you wanted to edit/create/remove many ``Tag`` objects related to
 that Task, right inside the same form.
 
 .. note::
 
-    In this entry, it's loosely assumed that you're using Doctrine as your
+    In this article, it's loosely assumed that you're using Doctrine as your
     database store. But if you're not using Doctrine (e.g. Propel or just
     a database connection), it's all very similar. There are only a few parts
     of this tutorial that really care about "persistence".
@@ -224,7 +224,7 @@ great, your user can't actually add any new tags yet.
 
 .. caution::
 
-    In this entry, you embed only one collection, but you are not limited
+    In this article, you embed only one collection, but you are not limited
     to this. You can also embed nested collection as many levels down as you
     like. But if you use Xdebug in your development setup, you may receive
     a ``Maximum function nesting level of '100' reached, aborting!`` error.
diff --git a/introduction/http_fundamentals.rst b/introduction/http_fundamentals.rst
@@ -78,7 +78,7 @@ resource - the most common HTTP methods are:
     Delete the resource from the server (used by APIs).
 
 With this in mind, you can imagine what an HTTP request might look like to
-delete a specific blog entry, for example:
+delete a specific blog post, for example:
 
 .. code-block:: text
 
diff --git a/routing.rst b/routing.rst
@@ -29,7 +29,7 @@ Routing Examples
 
 A *route* is a map from a URL path to a controller. For example, suppose
 you want to match any URL like ``/blog/my-post`` or ``/blog/all-about-symfony``
-and send it to a controller that can look up and render that blog entry.
+and send it to a controller that can look up and render that blog post.
 The route is simple:
 
 .. configuration-block::
diff --git a/security/acl.rst b/security/acl.rst
@@ -21,7 +21,7 @@ the ACL system comes in.
     :doc:`voters </security/voters>`. A voter is passed the object
     being voted on, which you can use to make complex decisions and effectively
     implement your own ACL. Enforcing authorization (e.g. the ``isGranted()``
-    part) will look similar to what you see in this entry, but your voter
+    part) will look similar to what you see in this article, but your voter
     class will handle the logic behind the scenes, instead of the ACL system.
 
 Imagine you are designing a blog system where your users can comment on your
diff --git a/security/api_key_authentication.rst b/security/api_key_authentication.rst
@@ -410,7 +410,7 @@ to store authentication in the session, keep reading!
 Storing Authentication in the Session
 -------------------------------------
 
-So far, this entry has described a situation where some sort of authentication
+So far, this article has described a situation where some sort of authentication
 token is sent on every request. But in some situations (like an OAuth flow),
 the token may be sent on only *one* request. In this case, you will want to
 authenticate the user and store that authentication in the session so that
@@ -569,7 +569,7 @@ of the user to make sure it's not out-of-date. But regardless of your requiremen
 Only Authenticating for Certain URLs
 ------------------------------------
 
-This entry has assumed that you want to look for the ``apikey`` authentication
+This article has assumed that you want to look for the ``apikey`` authentication
 on *every* request. But in some situations (like an OAuth flow), you only
 really need to look for authentication information once the user has reached
 a certain URL (e.g. the redirect URL in OAuth).
diff --git a/security/custom_authentication_provider.rst b/security/custom_authentication_provider.rst
@@ -6,7 +6,7 @@ How to Create a custom Authentication Provider
 
 .. tip::
 
-    Creating a custom authentication system is hard, and this entry will walk
+    Creating a custom authentication system is hard, and this article will walk
     you through that process. But depending on your needs, you may be able
     to solve your problem in a simpler manner, or via a community bundle:
 
diff --git a/security/custom_password_authenticator.rst b/security/custom_password_authenticator.rst
@@ -10,7 +10,7 @@ How to Create a Custom Form Password Authenticator
     flexible way to accomplish custom authentication tasks like this.
 
 Imagine you want to allow access to your website only between 2pm and 4pm
-UTC. In this entry, you'll learn how to do this for a login form (i.e. where
+UTC. In this article, you'll learn how to do this for a login form (i.e. where
 your user submits their username and password).
 
 The Password Authenticator
diff --git a/security/custom_provider.rst b/security/custom_provider.rst
@@ -10,7 +10,7 @@ the configured user provider to return a user object for a given username.
 Symfony then checks whether the password of this user is correct and generates
 a security token so the user stays authenticated during the current session.
 Out of the box, Symfony has four user providers: ``memory``, ``entity``,
-``ldap`` and ``chain``. In this entry you'll see how you can create your
+``ldap`` and ``chain``. In this article you'll see how you can create your
 own user provider, which could be useful if your users are accessed via a
 custom database, a file, or - as shown in this example - a web service.
 
@@ -294,7 +294,7 @@ is compared to the hashed password returned by your ``getPassword()`` method.
 
     If your external users have their passwords salted via a different method,
     then you'll need to do a bit more work so that Symfony properly encodes
-    the password. That is beyond the scope of this entry, but would include
+    the password. That is beyond the scope of this article, but would include
     sub-classing ``MessageDigestPasswordEncoder`` and overriding the
     ``mergePasswordAndSalt()`` method.
 
diff --git a/security/entity_provider.rst b/security/entity_provider.rst
@@ -36,7 +36,7 @@ and :ref:`user serialization to the session <security-serialize-equatable>`
 1) Create your User Entity
 --------------------------
 
-For this entry, suppose that you already have a ``User`` entity inside an
+For this article, suppose that you already have a ``User`` entity inside an
 ``AppBundle`` with the following fields: ``id``, ``username``, ``password``,
 ``email`` and ``isActive``::
 
diff --git a/service_container.rst b/service_container.rst
@@ -54,26 +54,25 @@ What other services are available? Find out by running:
 
 .. code-block:: terminal
 
-     $ php bin/console debug:container
-
-This is just a *small* sample of the output:
-
-=============================== =======================================================================
-Service ID                      Class name
-=============================== =======================================================================
-doctrine                        ``Doctrine\Bundle\DoctrineBundle\Registry``
-filesystem                      ``Symfony\Component\Filesystem\Filesystem``
-form.factory                    ``Symfony\Component\Form\FormFactory``
-logger                          ``Symfony\Bridge\Monolog\Logger``
-request_stack                   ``Symfony\Component\HttpFoundation\RequestStack``
-router                          ``Symfony\Bundle\FrameworkBundle\Routing\Router``
-security.authorization_checker  ``Symfony\Component\Security\Core\Authorization\AuthorizationChecker``
-security.password_encoder       ``Symfony\Component\Security\Core\Encoder\UserPasswordEncoder``
-session                         ``Symfony\Component\HttpFoundation\Session\Session``
-translator                      ``Symfony\Component\Translation\DataCollectorTranslator``
-twig                            ``Twig\Environment``
-validator                       ``Symfony\Component\Validator\Validator\ValidatorInterface``
-=============================== =======================================================================
+    $ php bin/console debug:container
+
+    # this is just a *small* sample of the output...
+    =============================== =======================================================================
+    Service ID                      Class name
+    =============================== =======================================================================
+    doctrine                        ``Doctrine\Bundle\DoctrineBundle\Registry``
+    filesystem                      ``Symfony\Component\Filesystem\Filesystem``
+    form.factory                    ``Symfony\Component\Form\FormFactory``
+    logger                          ``Symfony\Bridge\Monolog\Logger``
+    request_stack                   ``Symfony\Component\HttpFoundation\RequestStack``
+    router                          ``Symfony\Bundle\FrameworkBundle\Routing\Router``
+    security.authorization_checker  ``Symfony\Component\Security\Core\Authorization\AuthorizationChecker``
+    security.password_encoder       ``Symfony\Component\Security\Core\Encoder\UserPasswordEncoder``
+    session                         ``Symfony\Component\HttpFoundation\Session\Session``
+    translator                      ``Symfony\Component\Translation\DataCollectorTranslator``
+    twig                            ``Twig\Environment``
+    validator                       ``Symfony\Component\Validator\Validator\ValidatorInterface``
+    =============================== =======================================================================
 
 You can also use the unique "Service ID" to access a service directly::
 
diff --git a/setup/new_project_git.rst b/setup/new_project_git.rst
@@ -8,7 +8,7 @@ How to Create and Store a Symfony Project in Git
 
 .. tip::
 
-    Though this entry is specifically about Git, the same generic principles
+    Though this article is specifically about Git, the same generic principles
     will apply if you're storing your project in Subversion.
 
 Once you've read through :doc:`/page_creation` and become familiar with
diff --git a/setup/new_project_svn.rst b/setup/new_project_svn.rst
@@ -8,7 +8,7 @@ How to Create and Store a Symfony Project in Subversion
 
 .. tip::
 
-    This entry is specifically about Subversion, and based on principles found
+    This article is specifically about Subversion, and based on principles found
     in :doc:`/setup/new_project_git`.
 
 Once you've read through :doc:`/page_creation` and become familiar with
diff --git a/translation/debug.rst b/translation/debug.rst
