10000 Merge branch '2.8' into 3.3 · symfony/symfony-docs@29b97a7 · GitHub
[go: up one dir, main page]

Skip to content

Commit 29b97a7

Browse files
committed
Merge branch '2.8' into 3.3
* 2.8: Update event_listeners_subscribers.rst Update event_listeners_subscribers.rst add missing link target for Ansistrano fixing ref removing some deploy strategies + adding & reordering
2 parents 9be5f42 + 57d9d9f commit 29b97a7

File tree

2 files changed

+21
-17
lines changed

2 files changed

+21
-17
lines changed

deployment.rst

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

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

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

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

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

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

105108
Basic scripting
106109
You can of course use shell, `Ant`_ or any other build tool to script
@@ -241,11 +244,12 @@ kernel and return your project's root directory::
241244
.. _`Capistrano`: http://capistranorb.com/
242245
.. _`sf2debpkg`: https://github.com/liip/sf2debpkg
243246
.. _`Fabric`: http://www.fabfile.org/
247+
.. _`Ansistrano`: https://ansistrano.com/
244248
.. _`Magallanes`: https://github.com/andres-montanez/Magallanes
245249
.. _`Ant`: http://blog.sznapka.pl/deploying-symfony2-applications-with-ant
246-
.. _`bundles that add deployment features`: https://github.com/search?utf8=✓&q=topic%3Asymfony-bundle+topic%3Adeploy&type=Repositories&ref=searchresults
247250
.. _`Memcached`: http://memcached.org/
248251
.. _`Redis`: http://redis.io/
249252
.. _`Symfony plugin`: https://github.com/capistrano/symfony/
250253
.. _`Deployer`: http://deployer.org/
251254
.. _`Git Tagging`: https://git-scm.com/book/en/v2/Git-Basics-Tagging
255+
.. _`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) {

0 commit comments

Comments
 (0)
0