Skip to content

Commit 6c54c78

Browse files
committed
Merge branch '3.4' into 4.0
* 3.4: Update event_listeners_subscribers.rst Update event_listeners_subscribers.rst add missing link target for Ansistrano Corrected a spelling error. Update Custom UsernamePasswordToken Authenticator fixing ref removing some deploy strategies + adding & reordering Removing limit_metadata_writes Removing use_strict_mode docs, as this feature is deprecated in 3.4
2 parents 32e5bfc + 60695e5 commit 6c54c78

File tree

7 files changed

+33
-107
lines changed

7 files changed

+33
-107
lines changed

_build/redirection_map

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@
200200
/cookbook/psr7 /components/psr7
201201
/cookbook/request/index /request
202202
/cookbook/request/load_balancer_reverse_proxy /deployment/proxies
203-
/cookbook/request/mime_type /reference/configuration/framework#formats
203+
/cookbook/request/mime_type /reference/configuration/framework
204204
/cookbook/routing/conditions /routing/conditions
205205
/cookbook/routing/custom_route_loader /routing/custom_route_loader
206206
/cookbook/routing/debug /routing/debug
@@ -250,7 +250,8 @@
250250
/cookbook/service_container/shared /service_container/shared
251251
/cookbook/session/avoid_session_start /session/avoid_session_start
252252
/cookbook/session/index /session
253-
/cookbook/session/limit_metadata_writes /session/limit_metadata_writes
253+
/cookbook/session/limit_metadata_writes /reference/configuration/framework
254+
/session/limit_metadata_writes /reference/configuration/framework
254255
/cookbook/session/locale_sticky_session /session/locale_sticky_session
255256
/cookbook/session/php_bridge /session/php_bridge
256257
/cookbook/session/proxy_examples /session/proxy_examples

deployment.rst

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -77,13 +77,15 @@ Using Build Scripts and other Tools
7777
There are also tools to help ease the pain of deployment. Some of them have been
7878
specifically tailored to the requirements of Symfony.
7979

80-
`Capistrano`_ with `Symfony plugin`_
81-
`Capistrano`_ is a remote server automation and deployment tool written in Ruby.
82-
`Symfony plugin`_ is a plugin to ease Symfony related tasks, inspired by `Capifony`_
83-
(which works only with Capistrano 2).
80+
`EasyDeployBundle`_
81+
A Symfony bundle that adds easy deploy tools to your application.
8482

85-
`sf2debpkg`_
86-
Helps you build a native Debian package for your Symfony project.
83+
`Deployer`_
84+
This is another native PHP rewrite of Capistrano, with some ready recipes for
85+
Symfony.
86+
87+
`Ansistrano`_
88+
An Ansible role that allows you to configure a powerful deploy via YAML files.
8789

8890
`Magallanes`_
8991
This Capistrano-like deployment tool is built in PHP, and may be easier
@@ -93,13 +95,14 @@ specifically tailored to the requirements of Symfony.
9395
This Python-based library provides a basic suite of operations for executing
9496
local or remote shell commands and uploading/downloading files.
9597

96-
`Deployer`_
97-
This is another native PHP rewrite of Capistrano, with some ready recipes for
98-
Symfony.
98+
`Capistrano`_ with `Symfony plugin`_
99+
`Capistrano`_ is a remote server automation and deployment tool written in Ruby.
100+
`Symfony plugin`_ is a plugin to ease Symfony related tasks, inspired by `Capifony`_
101+
(which works only with Capistrano 2).
102+
103+
`sf2debpkg`_
104+
Helps you build a native Debian package for your Symfony project.
99105

100-
Bundles
101-
There are some `bundles that add deployment features`_ directly into your
102-
Symfony console.
103106

104107
Basic scripting
105108
You can of course use shell, `Ant`_ or any other build tool to script
@@ -246,9 +249,9 @@ Learn More
246249
.. _`Capistrano`: http://capistranorb.com/
247250
.. _`sf2debpkg`: https://github.com/liip/sf2debpkg
248251
.. _`Fabric`: http://www.fabfile.org/
252+
.. _`Ansistrano`: https://ansistrano.com/
249253
.. _`Magallanes`: https://github.com/andres-montanez/Magallanes
250254
.. _`Ant`: http://blog.sznapka.pl/deploying-symfony2-applications-with-ant
251-
.. _`bundles that add deployment features`: https://github.com/search?utf8=✓&q=topic%3Asymfony-bundle+topic%3Adeploy&type=Repositories&ref=searchresults
252255
.. _`Memcached`: http://memcached.org/
253256
.. _`Redis`: http://redis.io/
254257
.. _`Symfony plugin`: https://github.com/capistrano/symfony/
@@ -258,3 +261,4 @@ Learn More
258261
.. _`platform.sh`: https://docs.platform.sh/frameworks/symfony.html
259262
.. _`Azure`: https://azure.microsoft.com/en-us/develop/php/
260263
.. _`fortrabbit`: https://help.fortrabbit.com/install-symfony
264+
.. _`EasyDeployBundle`: https://github.com/EasyCorp/easy-deploy-bundle

doctrine/event_listeners_subscribers.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -102,14 +102,14 @@ a ``postPersist()`` method, which will be called when the event is dispatched::
102102
{
103103
public function postPersist(LifecycleEventArgs $args)
104104
{
105-
$object = $args->getObject();
105+
$entity = $args->getEntity();
106106

107107
// only act on some "Product" entity
108-
if (!$object instanceof Product) {
108+
if (!$entity instanceof Product) {
109109
return;
110110
}
111111

112-
$objectManager = $args->getObjectManager();
112+
$entityManager = $args->getEntityManager();
113113
// ... do something with the Product
114114
}
115115
}
@@ -166,7 +166,7 @@ interface and have an event method for each event it subscribes to::
166166

167167
public function index(LifecycleEventArgs $args)
168168
{
169-
$entity = $args->getObject();
169+
$entity = $args->getEntity();
170170

171171
// perhaps you only want to act on some "Product" entity
172172
if ($entity instanceof Product) {

reference/configuration/framework.rst

Lines changed: 7 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@ Configuration
6666
* `gc_divisor`_
6767
* `gc_probability`_
6868
* `gc_maxlifetime`_
69-
* `use_strict_mode`_
7069
* `save_path`_
7170
* `metadata_update_threshold`_
7271
* `assets`_
@@ -798,17 +797,6 @@ This determines the number of seconds after which data will be seen as "garbage"
798797
and potentially cleaned up. Garbage collection may occur during session
799798
start and depends on `gc_divisor`_ and `gc_probability`_.
800799

801-
use_strict_mode
802-
...............
803-
804-
**type**: ``boolean`` **default**: ``false``
805-
806-
This specifies whether the session module will use the strict session id mode.
807-
If this mode is enabled, the module does not accept uninitialized session IDs.
808-
If an uninitialized session ID is sent from browser, a new session ID is sent
809-
to browser. Applications are protected from session fixation via session
810-
adoption with strict mode.
811-
812800
save_path
813801
.........
814802

@@ -855,18 +843,19 @@ setting the value to ``null``:
855843
),
856844
));
857845
846+
.. _reference-session-metadata-update-threshold:
847+
858848
metadata_update_threshold
859849
.........................
860850

861851
**type**: ``integer`` **default**: ``0``
862852

863-
This is how many seconds to wait between two session metadata updates. It will
864-
also prevent the session handler to write if the session has not changed.
865-
866-
.. seealso::
853+
This is how many seconds to wait between updating/writing the session metadata. This
854+
can be useful if, for some reason, you want to limit the frequency at which the
855+
session persists.
867856

868-
You can see an example of the usage of this in
869-
:doc:`/session/limit_metadata_writes`.
857+
Starting in Symfony 3.4, session data is *only* written when the session data has
858+
changed. Previously, you needed to set this option to avoid that behavior.
870859

871860
assets
872861
~~~~~~

security/custom_password_authenticator.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ the user::
6161
// (so don't put any un-trusted messages / error strings here)
6262
throw new CustomUserMessageAuthenticationException(
6363
'You can only log in between 2 and 4!',
64+
array(), // Message Data
6465
412 // HTTP 412 Precondition Failed
6566
);
6667
}

session/limit_metadata_writes.rst

Lines changed: 0 additions & 69 deletions
This file was deleted.

workflow/state-machines.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ machine.
1414
Example of a State Machine
1515
--------------------------
1616

17-
A pull request starts in an intial "start" state, a state for e.g. running
17+
A pull request starts in an initial "start" state, a state for e.g. running
1818
tests on Travis. When this is finished, the pull request is in the "review"
1919
state, where contributors can require changes, reject or accept the
2020
pull request. At any time, you can also "update" the pull request, which

0 commit comments

Comments
 (0)