Merge branch '4.1'

* 4.1:
  Updated the doc link
  Update PHPUnit documentation link
  Move range to the comparison constraint types
  Update link to use latest docs
  Removed an unnecessary comment
  Added a tip about versioning when using Flex
  Use SCSS instead of CSS for code block
  Fix minor typo in the_big_picture.rst
  Removing calls to deprecated code
  [HttpFoundation] Small fixes on some examples
  Fixed Modifying Rendered Tables example
  Broken nginx XSendfile link

Author: javiereguiluz

components/asset.rst

@@ -355,7 +355,7 @@ they all have different base paths::
         'doc' => new PathPackage('/somewhere/deep/for/documents', $versionStrategy),
     );
 
-    $packages = new Packages($defaultPackage, $namedPackages)
+    $packages = new Packages($defaultPackage, $namedPackages);
 
 The ``Packages`` class allows to define a default package, which will be applied
 to assets that don't define the name of package to use. In addition, this

components/console/helpers/table.rst

@@ -353,18 +353,18 @@ The only requirement to append rows is that the table must be rendered inside a
             $section = $output->section();
             $table = new Table($section);
 
-            $table->addRow(['Row 1']);
+            $table->addRow(['Love']);
             $table->render();
 
-            $table->addRow(['Row 2']);
+            $table->appendRow(['Symfony']);
         }
     }
 
 This will display the following table in the terminal:
 
 .. code-block:: terminal
 
-    +-------+
-    | Row 1 |
-    | Row 2 |
-    +-------+
+    +---------+
+    | Love    |
+    | Symfony |
+    +---------+

components/http_foundation.rst

@@ -262,23 +262,23 @@ this complexity and defines some methods for the most common tasks::
     use Symfony\Component\HttpFoundation\HeaderUtils;
 
     // Splits an HTTP header by one or more separators
-    HeaderUtils::split('da, en-gb;q=0.8', ',;')
-    // => array(array('da'), array('en-gb'), array('q', '0.8'))
+    HeaderUtils::split('da, en-gb;q=0.8', ',;');
+    // => array(array('da'), array('en-gb','q=0.8'))
 
     // Combines an array of arrays into one associative array
-    HeaderUtils::combine(array(array('foo', 'abc'), array('bar')))
+    HeaderUtils::combine(array(array('foo', 'abc'), array('bar')));
     // => array('foo' => 'abc', 'bar' => true)
 
     // Joins an associative array into a string for use in an HTTP header
-    HeaderUtils::toString(array('foo' => 'abc', 'bar' => true, 'baz' => 'a b c'), ',')
+    HeaderUtils::toString(array('foo' => 'abc', 'bar' => true, 'baz' => 'a b c'), ',');
     // => 'foo=abc, bar, baz="a b c"'
 
     // Encodes a string as a quoted string, if necessary
-    HeaderUtils::quote('foo "bar"')
-    // => 'foo \"bar\"'
+    HeaderUtils::quote('foo "bar"');
+    // => '"foo \"bar\""'
 
     // Decodes a quoted string
-    HeaderUtils::unquote('foo \"bar\"')
+    HeaderUtils::unquote('"foo \"bar\""');
     // => 'foo "bar"'
 
 Accessing ``Accept-*`` Headers Data
@@ -708,7 +708,7 @@ Learn More
     /http_cache/*
 
 .. _Packagist: https://packagist.org/packages/symfony/http-foundation
-.. _Nginx: http://wiki.nginx.org/XSendfile
+.. _Nginx: https://www.nginx.com/resources/wiki/start/topics/examples/xsendfile/
 .. _Apache: https://tn123.org/mod_xsendfile/
 .. _`JSON Hijacking`: http://haacked.com/archive/2009/06/25/json-hijacking.aspx
 .. _OWASP guidelines: https://www.owasp.org/index.php/OWASP_AJAX_Security_Guidelines#Always_return_JSON_with_an_Object_on_the_outside

doctrine/event_listeners_subscribers.rst

@@ -95,21 +95,22 @@ a ``postPersist()`` method, which will be called when the event is dispatched::
     // src/EventListener/SearchIndexer.php
     namespace App\EventListener;
 
-    use Doctrine\ORM\Event\LifecycleEventArgs;
+    // for Doctrine < 2.4: use Doctrine\ORM\Event\LifecycleEventArgs;
+    use Doctrine\Common\Persistence\Event\LifecycleEventArgs;
     use App\Entity\Product;
 
     class SearchIndexer
     {
         public function postPersist(LifecycleEventArgs $args)
         {
-            $entity = $args->getEntity();
+            $entity = $args->getObject();
 
             // only act on some "Product" entity
             if (!$entity instanceof Product) {
                 return;
             }
 
-            $entityManager = $args->getEntityManager();
+            $entityManager = $args->getObjectManager();
             // ... do something with the Product
         }
     }
@@ -166,11 +167,11 @@ interface and have an event method for each event it subscribes to::
 
         public function index(LifecycleEventArgs $args)
         {
-            $entity = $args->getEntity();
+            $entity = $args->getObject();
 
             // perhaps you only want to act on some "Product" entity
             if ($entity instanceof Product) {
-                $entityManager = $args->getEntityManager();
+                $entityManager = $args->getObjectManager();
                 // ... do something with the Product
             }
         }

frontend.rst

@@ -103,7 +103,7 @@ Other Front-End Articles
 .. _`Webpack Encore`: https://www.npmjs.com/package/@symfony/webpack-encore
 .. _`Webpack`: https://webpack.js.org/
 .. _`Webpacker`: https://github.com/rails/webpacker
-.. _`Mix`: https://laravel.com/docs/5.4/mix
+.. _`Mix`: https://laravel.com/docs/mix
 .. _`Symfony`: http://symfony.com/
 .. _`Full API`: https://github.com/symfony/webpack-encore/blob/master/index.js
 .. _`Webpack Encore screencast series`: https://knpuniversity.com/screencast/webpack-encore

frontend/encore/bootstrap.rst

@@ -16,7 +16,7 @@ Now that ``bootstrap`` lives in your ``node_modules/`` directory, you can
 import it from any Sass or JavaScript file. For example, if you already have
 a ``global.scss`` file, import it from there:
 
-.. code-block:: css
+.. code-block:: scss
 
     // assets/css/global.scss
 

frontend/encore/versioning.rst

@@ -44,11 +44,10 @@ in your ``script`` and ``link`` tags. If you're using Symfony, just activate the
 
 .. code-block:: yaml
 
-    # config/packages/framework.yaml
+    # this file is added automatically when installing Encore with Symfony Flex
+    # config/packages/assets.yaml
     framework:
-        # ...
         assets:
-            # feature is supported in Symfony 3.3 and higher
             json_manifest_path: '%kernel.project_dir%/public/build/manifest.json'
 
 That's it! Just be sure to wrap each path in the Twig ``asset()`` function

quick_tour/the_big_picture.rst

@@ -59,7 +59,7 @@ Try your new app by going to ``http://localhost:8000`` in a browser!
 Fundamentals: Route, Controller, Response
 -----------------------------------------
 
-Our project only has about 15 files, but it's ready to become an sleek API, a robust
+Our project only has about 15 files, but it's ready to become a sleek API, a robust
 web app, or a microservice. Symfony starts small, but scales with you.
 
 But before we go too far, let's dig into the fundamentals by building our first page.

reference/constraints.rst

@@ -20,8 +20,6 @@ Validation Constraints Reference
    constraints/Ip
    constraints/Uuid
 
-   constraints/Range
-
    constraints/EqualTo
    constraints/NotEqualTo
    constraints/IdenticalTo
@@ -30,6 +28,7 @@ Validation Constraints Reference
    constraints/LessThanOrEqual
    constraints/GreaterThan
    constraints/GreaterThanOrEqual
+   constraints/Range
 
    constraints/Date
    constraints/DateTime

reference/constraints/map.rst.inc

@@ -22,11 +22,6 @@ String Constraints
 * :doc:`Ip </reference/constraints/Ip>`
 * :doc:`Uuid</reference/constraints/Uuid>`
 
-Number Constraints
-~~~~~~~~~~~~~~~~~~
-
-* :doc:`Range </reference/constraints/Range>`
-
 Comparison Constraints
 ~~~~~~~~~~~~~~~~~~~~~~
 
@@ -38,6 +33,7 @@ Comparison Constraints
 * :doc:`LessThanOrEqual </reference/constraints/LessThanOrEqual>`
 * :doc:`GreaterThan </reference/constraints/GreaterThan>`
 * :doc:`GreaterThanOrEqual </reference/constraints/GreaterThanOrEqual>`
+* :doc:`Range </reference/constraints/Range>`
 
 Date Constraints
 ~~~~~~~~~~~~~~~~

testing.rst

@@ -1038,7 +1038,7 @@ Learn more
 * :doc:`/components/css_selector`
 
 .. _`PHPUnit`: https://phpunit.de/
-.. _`documentation`: https://phpunit.de/manual/current/en/
+.. _`documentation`: https://phpunit.readthedocs.io/
 .. _`PHPUnit Bridge component`: https://symfony.com/components/PHPUnit%20Bridge
 .. _`$_SERVER`: https://php.net/manual/en/reserved.variables.server.php
 .. _`data providers`: https://phpunit.de/manual/current/en/writing-tests-for-phpunit.html#writing-tests-for-phpunit.data-providers