Skip to content

Commit 5287c07

Browse files
committed
Merge branch '2.8' into 3.4
* 2.8: Updated the doc link Update PHPUnit documentation link Move range to the comparison constraint types Removing calls to deprecated code Broken nginx XSendfile link
2 parents 77e9124 + e2050c5 commit 5287c07

File tree

6 files changed

+11
-15
lines changed

6 files changed

+11
-15
lines changed

components/asset.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -355,7 +355,7 @@ they all have different base paths::
355355
'doc' => new PathPackage('/somewhere/deep/for/documents', $versionStrategy),
356356
);
357357

358-
$packages = new Packages($defaultPackage, $namedPackages)
358+
$packages = new Packages($defaultPackage, $namedPackages);
359359

360360
The ``Packages`` class allows to define a default package, which will be applied
361361
to assets that don't define the name of package to use. In addition, this

components/http_foundation.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -644,7 +644,7 @@ Learn More
644644
/http_cache/*
645645

646646
.. _Packagist: https://packagist.org/packages/symfony/http-foundation
647-
.. _Nginx: http://wiki.nginx.org/XSendfile
647+
.. _Nginx: https://www.nginx.com/resources/wiki/start/topics/examples/xsendfile/
648648
.. _Apache: https://tn123.org/mod_xsendfile/
649649
.. _`JSON Hijacking`: http://haacked.com/archive/2009/06/25/json-hijacking.aspx
650650
.. _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

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -95,21 +95,22 @@ a ``postPersist()`` method, which will be called when the event is dispatched::
9595
// src/AppBundle/EventListener/SearchIndexer.php
9696
namespace AppBundle\EventListener;
9797

98-
use Doctrine\ORM\Event\LifecycleEventArgs;
98+
// for Doctrine < 2.4: use Doctrine\ORM\Event\LifecycleEventArgs;
99+
use Doctrine\Common\Persistence\Event\LifecycleEventArgs;
99100
use AppBundle\Entity\Product;
100101

101102
class SearchIndexer
102103
{
103104
public function postPersist(LifecycleEventArgs $args)
104105
{
105-
$entity = $args->getEntity();
106+
$entity = $args->getObject();
106107

107108
// only act on some "Product" entity
108109
if (!$entity instanceof Product) {
109110
return;
110111
}
111112

112-
$entityManager = $args->getEntityManager();
113+
$entityManager = $args->getObjectManager();
113114
// ... do something with the Product
114115
}
115116
}
@@ -166,11 +167,11 @@ interface and have an event method for each event it subscribes to::
166167

167168
public function index(LifecycleEventArgs $args)
168169
{
169-
$entity = $args->getEntity();
170+
$entity = $args->getObject();
170171

171172
// perhaps you only want to act on some "Product" entity
172173
if ($entity instanceof Product) {
173-
$entityManager = $args->getEntityManager();
174+
$entityManager = $args->getObjectManager();
174175
// ... do something with the Product
175176
}
176177
}

reference/constraints.rst

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@ Validation Constraints Reference
2020
constraints/Ip
2121
constraints/Uuid
2222

23-
constraints/Range
24-
2523
constraints/EqualTo
2624
constraints/NotEqualTo
2725
constraints/IdenticalTo
@@ -30,6 +28,7 @@ Validation Constraints Reference
3028
constraints/LessThanOrEqual
3129
constraints/GreaterThan
3230
constraints/GreaterThanOrEqual
31+
constraints/Range
3332

3433
constraints/Date
3534
constraints/DateTime

reference/constraints/map.rst.inc

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,6 @@ String Constraints
2222
* :doc:`Ip </reference/constraints/Ip>`
2323
* :doc:`Uuid</reference/constraints/Uuid>`
2424

25-
Number Constraints
26-
~~~~~~~~~~~~~~~~~~
27-
28-
* :doc:`Range </reference/constraints/Range>`
29-
3025
Comparison Constraints
3126
~~~~~~~~~~~~~~~~~~~~~~
3227

@@ -38,6 +33,7 @@ Comparison Constraints
3833
* :doc:`LessThanOrEqual </reference/constraints/LessThanOrEqual>`
3934
* :doc:`GreaterThan </reference/constraints/GreaterThan>`
4035
* :doc:`GreaterThanOrEqual </reference/constraints/GreaterThanOrEqual>`
36+
* :doc:`Range </reference/constraints/Range>`
4137

4238
Date Constraints
4339
~~~~~~~~~~~~~~~~

testing.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -974,7 +974,7 @@ Learn more
974974
* :doc:`/components/css_selector`
975975

976976
.. _`PHPUnit`: https://phpunit.de/
977-
.. _`documentation`: https://phpunit.de/manual/current/en/
977+
.. _`documentation`: https://phpunit.readthedocs.io/
978978
.. _`PHPUnit Bridge component`: https://symfony.com/components/PHPUnit%20Bridge
979979
.. _`$_SERVER`: https://php.net/manual/en/reserved.variables.server.php
980980
.. _`data providers`: https://phpunit.de/manual/current/en/writing-tests-for-phpunit.html#writing-tests-for-phpunit.data-providers

0 commit comments

Comments
 (0)