Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 7291b6e

Browse filesBrowse files
weaverryanweaverryan
committed
Merge branch '3.3' into 3.4
* 3.3: parameter name typo [#8603] Rewording [BrowserKit] Updated Project URI of Goutte Update index.rst Update redirection_map Delete progresshelper.rst Minor reword in autowiring introduction Changed the title of a Doctrine article to avoid confusion Reworded the introduction of event listeners article Little typo error Update flex.rst Asset Component and absolute paths Grouped assets example
2 parents 9cf40a7 + b501c41 commit 7291b6e
Copy full SHA for 7291b6e

File tree

11 files changed

+39
-33
lines changed
Filter options

11 files changed

+39
-33
lines changed

‎_build/redirection_map

Copy file name to clipboardExpand all lines: _build/redirection_map
+1Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -290,6 +290,7 @@
290290
/components/config/introduction /components/config
291291
/components/config/index /components/config
292292
/components/console/helpers/tablehelper /components/console/helpers/table
293+
/components/console/helpers/progresshelper /components/console/helpers/progressbar
293294
/components/console/introduction /components/console
294295
/components/console/index /components/console
295296
/components/debug/class_loader /components/debug

‎components/asset.rst

Copy file name to clipboardExpand all lines: components/asset.rst
+18-1Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,13 @@ any versioning::
6363

6464
$package = new Package(new EmptyVersionStrategy());
6565

66+
// Absolute path
6667
echo $package->getUrl('/image.png');
6768
// result: /image.png
69+
70+
// Relative path
71+
echo $package->getUrl('image.png');
72+
// result: image.png
6873

6974
Packages implement :class:`Symfony\\Component\\Asset\\PackageInterface`,
7075
which defines the following two methods:
@@ -105,8 +110,13 @@ suffix to any asset path::
105110

106111
$package = new Package(new StaticVersionStrategy('v1'));
107112

113+
// Absolute path
108114
echo $package->getUrl('/image.png');
109115
// result: /image.png?v1
116+
117+
// Relative path
118+
echo $package->getUrl('image.png');
119+
// result: image.png?v1
110120

111121
In case you want to modify the version format, pass a sprintf-compatible format
112122
string as the second argument of the ``StaticVersionStrategy`` constructor::
@@ -122,6 +132,9 @@ string as the second argument of the ``StaticVersionStrategy`` constructor::
122132

123133
echo $package->getUrl('/image.png');
124134
// result: /v1/image.png
135+
136+
echo $package->getUrl('image.png');
137+
// result: v1/image.png
125138

126139
Custom Version Strategies
127140
.........................
@@ -168,8 +181,12 @@ that path over and over again::
168181

169182
$package = new PathPackage('/static/images', new StaticVersionStrategy('v1'));
170183

171-
echo $package->getUrl('/logo.png');
184+
echo $package->getUrl('logo.png');
172185
// result: /static/images/logo.png?v1
186+
187+
// Base path is ignored when using absolute paths
188+
echo $package->getUrl('/logo.png');
189+
// result: /logo.png?v1
173190

174191
Request Context Aware Assets
175192
............................

‎components/browser_kit.rst

Copy file name to clipboardExpand all lines: components/browser_kit.rst
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -233,4 +233,4 @@ Learn more
233233
* :doc:`/components/dom_crawler`
234234

235235
.. _`Packagist`: https://packagist.org/packages/symfony/browser-kit
236-
.. _`Goutte`: https://github.com/fabpot/Goutte
236+
.. _`Goutte`: https://github.com/FriendsOfPHP/Goutte

‎components/console/helpers/index.rst

Copy file name to clipboardExpand all lines: components/console/helpers/index.rst
-1Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ The Console Helpers
1111
formatterhelper
1212
processhelper
1313
progressbar
14-
progresshelper
1514
questionhelper
1615
table
1716
debug_formatter

‎components/console/helpers/progresshelper.rst

Copy file name to clipboardExpand all lines: components/console/helpers/progresshelper.rst
-12Lines changed: 0 additions & 12 deletions
This file was deleted.

‎doctrine/event_listeners_subscribers.rst

Copy file name to clipboardExpand all lines: doctrine/event_listeners_subscribers.rst
+7-6Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,10 @@
22
single: Doctrine; Event listeners and subscribers
33

44
.. _doctrine-event-config:
5+
.. _how-to-register-event-listeners-and-subscribers:
56

6-
How to Register Event Listeners and Subscribers
7-
===============================================
7+
Doctrine Event Listeners and Subscribers
8+
========================================
89

910
Doctrine packages have a rich event system that fires events when almost anything
1011
happens inside the system. For you, this means that you can create arbitrary
@@ -188,15 +189,15 @@ For a full reference, see chapter `The Event System`_ in the Doctrine documentat
188189
Lazy loading for Event Listeners
189190
--------------------------------
190191

191-
One subtle difference between listeners and subscribers is that Symfony can load
192+
One subtle difference between listeners and subscribers is that Symfony can load
192193
entity listeners lazily. This means that your listener class will only be fetched
193194
from the service container (and thus be instantiated) once the event it is linked
194195
to actually fires.
195196

196-
Lazy loading might give you a slight performance improvement when your listener
197-
runs for events that rarely fire. Also, it can help you when you run into
197+
Lazy loading might give you a slight performance improvement when your listener
198+
runs for events that rarely fire. Also, it can help you when you run into
198199
*circular dependency issues* that may occur when your listener service in turn
199-
depends on the DBAL connection.
200+
depends on the DBAL connection.
200201

201202
To mark a listener service as lazily loaded, just add the ``lazy`` attribute
202203
to the tag like so:

‎event_dispatcher.rst

Copy file name to clipboardExpand all lines: event_dispatcher.rst
+4-4Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ During the execution of a Symfony application, lots of event notifications are
99
triggered. Your application can listen to these notifications and respond to
1010
them by executing any piece of code.
1111

12-
Internal events provided by Symfony itself are defined in the
13-
:class:`Symfony\\Component\\HttpKernel\\KernelEvents` class. Third-party bundles
14-
and libraries also trigger lots of events and your own application can trigger
15-
:doc:`custom events </components/event_dispatcher>`.
12+
Symfony triggers several :doc:`events related to the kernel </reference/events>`
13+
while processing the HTTP Request. Third-party bundles may also dispatch events, and
14+
you can even dispatch :doc:`custom events </components/event_dispatcher>` from your
15+
own code.
1616

1717
All the examples shown in this article use the same ``KernelEvents::EXCEPTION``
1818
event for consistency purposes. In your own application, you can use any event

‎security/form_login.rst

Copy file name to clipboardExpand all lines: security/form_login.rst
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ several ways.
3434
Changing the default Page
3535
~~~~~~~~~~~~~~~~~~~~~~~~~
3636

37-
Define the ``default_security_target`` option to change the page where the user
37+
Define the ``default_target_path`` option to change the page where the user
3838
is redirected to if no previous page was stored in the session. The value can be
3939
a relative/absolute URL or a Symfony route name:
4040

‎security/guard_authentication.rst

Copy file name to clipboardExpand all lines: security/guard_authentication.rst
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -508,7 +508,7 @@ and add the following logic::
508508

509509
use Symfony\Component\Security\Csrf\CsrfTokenManagerInterface;
510510
use Symfony\Component\Security\Csrf\CsrfToken;
511-
use Symfony\Component\Security\Core\Exception\InvalidCsrfTokenExceptionl
511+
use Symfony\Component\Security\Core\Exception\InvalidCsrfTokenException;
512512

513513
class ExampleFormAuthenticator extends AbstractFormLoginAuthenticator
514514
{

‎service_container/autowiring.rst

Copy file name to clipboardExpand all lines: service_container/autowiring.rst
+5-5Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
Defining Services Dependencies Automatically (Autowiring)
55
=========================================================
66

7-
Autowiring allows you to manage services in the container with minimal configuration.
8-
It reads the type-hints on your constructor (or other methods) and automatically
9-
passes you the correct services. Symfony's autowiring is designed to be predictable:
10-
if it is not absolutely clear which dependency should be passed, you'll see an
11-
actionable exception.
7+
Autowiring allows you to manage services in the container with minimal
8+
configuration. It reads the type-hints on your constructor (or other methods)
9+
and automatically passes the correct services to each method. Symfony's
10+
autowiring is designed to be predictable: if it is not absolutely clear which
11+
dependency should be passed, you'll see an actionable exception.
1212

1313
.. tip::
1414

‎setup/flex.rst

Copy file name to clipboardExpand all lines: setup/flex.rst
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ following directory structure, which is the same used by default in Symfony 4:
151151
└── vendor/
152152
153153
This means that installing the ``symfony/flex`` dependency in your application
154-
is not enough. You must also upgrade the directory structure to the one showed
154+
is not enough. You must also upgrade the directory structure to the one shown
155155
above. There's no automatic tool to make this upgrade, so you must follow these
156156
manual steps:
157157

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.