Skip to content

Commit

Permalink
Updated Symfony to RC1.
Browse files Browse the repository at this point in the history
  • Loading branch information
robinvdvleuten committed Aug 26, 2012
1 parent 1e9470d commit 77602e0
Show file tree
Hide file tree
Showing 5 changed files with 55 additions and 49 deletions.
6 changes: 3 additions & 3 deletions README.md
Expand Up @@ -161,14 +161,14 @@ Enjoy!
[2]: http://getcomposer.org/
[3]: http://symfony.com/download
[4]: http://symfony.com/doc/2.1/quick_tour/the_big_picture.html
[5]: http://symfony.com/doc/2.1/
[5]: http://symfony.com/doc/2.1/index.html
[6]: http://symfony.com/doc/2.1/bundles/SensioFrameworkExtraBundle/index.html
[7]: http://symfony.com/doc/2.1/book/doctrine.html
[8]: http://symfony.com/doc/2.1/book/templating.html
[9]: http://symfony.com/doc/2.1/book/security.html
[10]: http://symfony.com/doc/2.1/cookbook/email.html
[11]: http://symfony.com/doc/2.1/cookbook/logging/monolog.html
[12]: http://symfony.com/doc/2.1/cookbook/assetic/asset_management.html
[13]: http://jmsyst.com/bundles/JMSSecurityExtraBundle/1.1
[14]: http://jmsyst.com/bundles/JMSDiExtraBundle/1.0
[13]: http://jmsyst.com/bundles/JMSSecurityExtraBundle/master
[14]: http://jmsyst.com/bundles/JMSDiExtraBundle/master
[15]: http://symfony.com/doc/2.1/bundles/SensioGeneratorBundle/index.html
4 changes: 2 additions & 2 deletions UPGRADE.md
Expand Up @@ -71,13 +71,13 @@ class instead:
// ...
}

You might want to add the new `strict_parameters` parameter to
You might want to add the new `strict_requirements` parameter to
`framework.router` (it avoids fatal errors in the production environment when
a link cannot be generated):

framework:
router:
strict_parameters: %kernel.debug%
strict_requirements: %kernel.debug%

The `default_locale` parameter is now a setting of the main `framework`
configuration (it was under the `framework.session` in 2.0):
Expand Down
2 changes: 1 addition & 1 deletion app/config/config.yml
Expand Up @@ -8,7 +8,7 @@ framework:
secret: %secret%
router:
resource: "%kernel.root_dir%/config/routing.yml"
strict_parameters: %kernel.debug%
strict_requirements: %kernel.debug%
form: true
csrf_protection: true
validation: { enable_annotations: true }
Expand Down
6 changes: 3 additions & 3 deletions composer.json
Expand Up @@ -7,7 +7,7 @@
"require": {
"php": ">=5.3.3",
"symfony/symfony": "2.1.*",
"doctrine/orm": "2.2.*",
"doctrine/orm": ">=2.2.3,<2.4-dev",
"doctrine/doctrine-bundle": "dev-master",
"twig/extensions": "dev-master",
"symfony/assetic-bundle": "dev-master",
Expand All @@ -16,8 +16,8 @@
"sensio/distribution-bundle": "dev-master",
"sensio/framework-extra-bundle": "dev-master",
"sensio/generator-bundle": "dev-master",
"jms/security-extra-bundle": "1.1.*",
"jms/di-extra-bundle": "1.0.*"
"jms/security-extra-bundle": "1.2.*",
"jms/di-extra-bundle": "1.1.*"
},
"scripts": {
"post-install-cmd": [
Expand Down
86 changes: 46 additions & 40 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 77602e0

Please sign in to comment.