Skip to content

Commit 21e3426

Browse files
committed
Merge branch '7.1' into 7.2
* 7.1: [Notifier] Add a missing reference link Use Doctor RST 1.61.1 implement __isset() together with __get() Fix some merging issues Minor tweaks Add extra information on AsEventListener attribute usage [HttpCache] Remove SensioFrameworkExtraBundle reference [AssetMapper] Remove Cloudflare auto-minify links [Notifier] Change the structure of the table listing the notifiers [Reference] Replace param converter with value resolver
2 parents f6b6991 + 437307b commit 21e3426

File tree

8 files changed

+170
-75
lines changed

8 files changed

+170
-75
lines changed

.doctor-rst.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ rules:
2929
max: 2
3030
max_colons: ~
3131
no_app_console: ~
32+
no_attribute_redundant_parenthesis: ~
3233
no_blank_line_after_filepath_in_php_code_block: ~
3334
no_blank_line_after_filepath_in_twig_code_block: ~
3435
no_blank_line_after_filepath_in_xml_code_block: ~

.github/workflows/ci.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ jobs:
7373
key: ${{ runner.os }}-doctor-rst-${{ steps.extract_base_branch.outputs.branch }}
7474

7575
- name: "Run DOCtor-RST"
76-
uses: docker://oskarstark/doctor-rst:1.60.1
76+
uses: docker://oskarstark/doctor-rst:1.61.1
7777
with:
7878
args: --short --error-format=github --cache-file=/github/workspace/.cache/doctor-rst.cache
7979

components/property_access.rst

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -249,16 +249,21 @@ The ``getValue()`` method can also use the magic ``__get()`` method::
249249
{
250250
return $this->children[$id];
251251
}
252+
253+
public function __isset($id): bool
254+
{
255+
return true;
256+
}
252257
}
253258

254259
$person = new Person();
255260

256261
var_dump($propertyAccessor->getValue($person, 'Wouter')); // [...]
257262

258-
.. note::
263+
.. caution::
259264

260-
The ``__get()`` method support is enabled by default.
261-
See `Enable other Features`_ if you want to disable it.
265+
When implementing the magic ``__get()`` method, you also need to implement
266+
``__isset()``.
262267

263268
.. _components-property-access-magic-call:
264269

event_dispatcher.rst

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,10 @@ having to add any configuration in external files::
162162
}
163163
}
164164

165-
You can add multiple ``#[AsEventListener]`` attributes to configure different methods::
165+
You can add multiple ``#[AsEventListener]`` attributes to configure different methods.
166+
The ``method`` property is optional, and when not defined, it defaults to
167+
``on`` + uppercased event name. In the example below, the ``'foo'`` event listener
168+
doesn't explicitly define its method, so the ``onFoo()`` method will be called::
166169

167170
namespace App\EventListener;
168171

frontend/asset_mapper.rst

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -623,9 +623,7 @@ which will automatically do most of these things for you:
623623
- **Compress your assets**: Your web server should compress (e.g. using gzip)
624624
your assets (JavaScript, CSS, images) before sending them to the browser. This
625625
is automatically enabled in Caddy and can be activated in Nginx and Apache.
626-
In Cloudflare, assets are compressed by default and you can also
627-
enable `auto minify`_ to further compress your assets (e.g. removing
628-
whitespace and comments from JavaScript and CSS files).
626+
In Cloudflare, assets are compressed by default.
629627

630628
- **Set long-lived cache expiry**: Your web server should set a long-lived
631629
``Cache-Control`` HTTP header on your assets. Because the AssetMapper component includes a version
@@ -694,8 +692,8 @@ Does the AssetMapper Component Minify Assets?
694692
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
695693

696694
Nope! Minifying or compressing assets *is* important, but can be
697-
done by your web server or a service like Cloudflare. See
698-
:ref:`Optimization <optimization>` for more details.
695+
done by your web server. See :ref:`Optimization <optimization>` for
696+
more details.
699697

700698
Is the AssetMapper Component Production Ready? Is it Performant?
701699
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -1116,7 +1114,6 @@ command as part of your CI to be warned anytime a new vulnerability is found.
11161114
.. _class syntax: https://caniuse.com/es6-class
11171115
.. _UX React Documentation: https://symfony.com/bundles/ux-react/current/index.html
11181116
.. _UX Vue.js Documentation: https://symfony.com/bundles/ux-vue/current/index.html
1119-
.. _auto minify: https://developers.cloudflare.com/support/speed/optimization-file-size/using-cloudflare-auto-minify/
11201117
.. _Lighthouse: https://developers.google.com/web/tools/lighthouse
11211118
.. _Tailwind: https://tailwindcss.com/
11221119
.. _BabdevPagerfantaBundle: https://github.com/BabDev/PagerfantaBundle

http_cache/_expiration-and-validation.rst.inc

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,3 @@
55
both worlds. In other words, by using both expiration and validation, you
66
can instruct the cache to serve the cached content, while checking back
77
at some interval (the expiration) to verify that the content is still valid.
8-
9-
.. tip::
10-
11-
You can also define HTTP caching headers for expiration and validation by using
12-
annotations. See the `FrameworkExtraBundle documentation`_.
13-
14-
.. _`FrameworkExtraBundle documentation`: https://symfony.com/doc/current/bundles/SensioFrameworkExtraBundle/annotations/cache.html

notifier.rst

Lines changed: 151 additions & 55 deletions
Large diffs are not rendered by default.

reference/events.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ their priorities:
5656

5757
This event is dispatched after the controller has been resolved but before executing
5858
it. It's useful to initialize things later needed by the
59-
controller, such as `param converters`_, and even to change the controller
59+
controller, such as `value resolvers`_, and even to change the controller
6060
entirely::
6161

6262
use Symfony\Component\HttpKernel\Event\ControllerEvent;
@@ -297,4 +297,4 @@ their priorities:
297297
298298
$ php bin/console debug:event-dispatcher kernel.exception
299299
300-
.. _`param converters`: https://symfony.com/doc/master/bundles/SensioFrameworkExtraBundle/annotations/converters.html
300+
.. _`value resolvers`: https://symfony.com/doc/current/controller/value_resolver.html#managing-value-resolvers

0 commit comments

Comments
 (0)