Merge branch '3.4' into 4.1

* 3.4:
  Updated the doc link
  Update PHPUnit documentation link
  Move range to the comparison constraint types
  Update link to use latest docs
  Use SCSS instead of CSS for code block
  Removing calls to deprecated code
  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/http_foundation.rst

@@ -693,7 +693,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
 

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