Skip to content
This repository was archived by the owner on Nov 27, 2020. It is now read-only.

Commit 5f65d60

Browse files
committed
Merge branch '2.3'
* 2.3: updated versions in the README file Remove +x mode on file updated doc links Fix deprecated function bind fixed typo updated composer.json updated VENDORS for 2.1.10
2 parents 55602ae + c5d8475 commit 5f65d60

File tree

4 files changed

+14
-14
lines changed

4 files changed

+14
-14
lines changed

README.md

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -156,16 +156,16 @@ released under the MIT or BSD license.
156156

157157
Enjoy!
158158

159-
[1]: http://symfony.com/doc/2.1/book/installation.html
159+
[1]: http://symfony.com/doc/2.3/book/installation.html
160160
[2]: http://getcomposer.org/
161161
[3]: http://symfony.com/download
162-
[4]: http://symfony.com/doc/2.1/quick_tour/the_big_picture.html
163-
[5]: http://symfony.com/doc/2.1/index.html
164-
[6]: http://symfony.com/doc/2.1/bundles/SensioFrameworkExtraBundle/index.html
165-
[7]: http://symfony.com/doc/2.1/book/doctrine.html
166-
[8]: http://symfony.com/doc/2.1/book/templating.html
167-
[9]: http://symfony.com/doc/2.1/book/security.html
168-
[10]: http://symfony.com/doc/2.1/cookbook/email.html
169-
[11]: http://symfony.com/doc/2.1/cookbook/logging/monolog.html
170-
[12]: http://symfony.com/doc/2.1/cookbook/assetic/asset_management.html
171-
[13]: http://symfony.com/doc/2.1/bundles/SensioGeneratorBundle/index.html
162+
[4]: http://symfony.com/doc/2.3/quick_tour/the_big_picture.html
163+
[5]: http://symfony.com/doc/2.3/index.html
164+
[6]: http://symfony.com/doc/2.3/bundles/SensioFrameworkExtraBundle/index.html
165+
[7]: http://symfony.com/doc/2.3/book/doctrine.html
166+
[8]: http://symfony.com/doc/2.3/book/templating.html
167+
[9]: http://symfony.com/doc/2.3/book/security.html
168+
[10]: http://symfony.com/doc/2.3/cookbook/email.html
169+
[11]: http://symfony.com/doc/2.3/cookbook/logging/monolog.html
170+
[12]: http://symfony.com/doc/2.3/cookbook/assetic/asset_management.html
171+
[13]: http://symfony.com/doc/2.3/bundles/SensioGeneratorBundle/index.html

app/logs/.gitkeep

100755100644
File mode changed.

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"doctrine/orm": ">=2.2.3,<2.4-dev",
1313
"doctrine/doctrine-bundle": "1.2.*",
1414
"twig/extensions": "1.0.*",
15-
"symfony/assetic-bundle": "2.1.*",
15+
"symfony/assetic-bundle": "2.3.*",
1616
"symfony/swiftmailer-bundle": "2.3.*",
1717
"symfony/monolog-bundle": "2.3.*",
1818
"sensio/distribution-bundle": "2.3.*",
@@ -39,7 +39,7 @@
3939
"config": {
4040
"bin-dir": "bin"
4141
},
42-
"minimum-stability": "dev",
42+
"minimum-stability": "RC",
4343
"extra": {
4444
"symfony-app-dir": "app",
4545
"symfony-web-dir": "web",

src/Acme/DemoBundle/Controller/DemoController.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public function contactAction()
4040

4141
$request = $this->get('request');
4242
if ($request->isMethod('POST')) {
43-
$form->bind($request);
43+
$form->submit($request);
4444
if ($form->isValid()) {
4545
$mailer = $this->get('mailer');
4646
// .. setup a message and send it

0 commit comments

Comments
 (0)