8000 Merge branch '3.4' into 4.1 · symfony/symfony-docs@bb1b55a · GitHub
[go: up one dir, main page]
Skip to content
8000

Commit bb1b55a

Browse files
javiereguiluzjaviereguiluz
committed
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
2 parents 1ab5a02 + 5287c07 commit bb1b55a

File tree

8 files changed

+13
-17
lines changed

8 files changed

+13
-17
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
@@ -693,7 +693,7 @@ Learn More
693693
/http_cache/*
694694

695695
.. _Packagist: https://packagist.org/packages/symfony/http-foundation
696-
.. _Nginx: http://wiki.nginx.org/XSendfile
696+
.. _Nginx: https://www.nginx.com/resources/wiki/start/topics/examples/xsendfile/
697697
.. _Apache: https://tn123.org/mod_xsendfile/
698698
.. _`JSON Hijacking`: http://haacked.com/archive/2009/06/25/json-hijacking.aspx
699699
.. _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/EventListener/SearchIndexer.php
9696
namespace App\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 App\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
}

‎frontend.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ Other Front-End Articles
103103
.. _`Webpack Encore`: https://www.npmjs.com/package/@symfony/webpack-encore
104104
.. _`Webpack`: https://webpack.js.org/
105105
.. _`Webpacker`: https://github.com/rails/webpacker
106-
.. _`Mix`: https://laravel.com/docs/5.4/mix
106+
.. _`Mix`: https://laravel.com/docs/mix
107107
.. _`Symfony`: http://symfony.com/
108108
.. _`Full API`: https://github.com/symfony/webpack-encore/blob/master/index.js
109109
.. _`Webpack Encore screencast series`: https://knpuniversity.com/screencast/webpack-encore

‎frontend/encore/bootstrap.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ Now that ``bootstrap`` lives in your ``node_modules/`` directory, you can
1616
import it from any Sass or JavaScript file. For example, if you already have
1717
a ``global.scss`` file, import it from there:
1818

19-
.. code-block:: css
19+
.. code-block:: scss
2020
2121
// assets/css/global.scss
2222

‎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 change 7396 d: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1038,7 +1038,7 @@ Learn more
10381038
* :doc:`/components/css_selector`
10391039

10401040
.. _`PHPUnit`: https://phpunit.de/
1041-
.. _`documentation`: https://phpunit.de/manual/current/en/
1041+
.. _`documentation`: https://phpunit.readthedocs.io/
10421042
.. _`PHPUnit Bridge component`: https://symfony.com/components/PHPUnit%20Bridge
10431043
.. _`$_SERVER`: https://php.net/manual/en/reserved.variables.server.php
10441044
.. _`data providers`: https://phpunit.de/manual/current/en/writing-tests-for-phpunit.html#writing-tests-for-phpunit.data-providers

0 commit comments

Comments
 (0)
0