Browse files

Bumped the requirement to Symfony 2.1

  • Loading branch information...
1 parent b3dc5fa commit 7ca8e5d45316b5b8b08a5a263603d08b199804fb @stof stof committed Apr 12, 2012
Showing with 10 additions and 8 deletions.
  1. +1 −2 .travis.yml
  2. +5 −2 README.markdown
  3. +4 −4 composer.json
View
3 .travis.yml
@@ -5,8 +5,7 @@ php:
- 5.4
env:
- - SYMFONY_VERSION=v2.0.12
- - SYMFONY_VERSION=origin/2.0
+ - SYMFONY_VERSION=origin/master
before_script: php vendor/vendors.php
View
7 README.markdown
@@ -15,7 +15,8 @@ Features include:
**Note:** This bundle does *not* provide an authentication system but can
provide the user provider for the core [SecurityBundle](http://symfony.com/doc/current/book/security.html).
-**Caution:** This bundle is developed in sync with [symfony's repository](https://github.com/symfony/symfony)
+**Caution:** This bundle is developed in sync with [symfony's repository](https://github.com/symfony/symfony).
+For Symfony 2.0.x, you need to use the 1.2.0 release of the bundle (or lower)
[![Build Status](https://secure.travis-ci.org/FriendsOfSymfony/FOSUserBundle.png?branch=master)](http://travis-ci.org/FriendsOfSymfony/FOSUserBundle)
@@ -25,7 +26,9 @@ Documentation
The bulk of the documentation is stored in the `Resources/doc/index.md`
file in this bundle:
-[Read the Documentation](https://github.com/FriendsOfSymfony/FOSUserBundle/blob/master/Resources/doc/index.md)
+[Read the Documentation for master](https://github.com/FriendsOfSymfony/FOSUserBundle/blob/master/Resources/doc/index.md)
+
+[Read the Documentation for 1.2.0 (for Symfony 2.0.x)](https://github.com/FriendsOfSymfony/FOSUserBundle/blob/1.2.0/Resources/doc/index.md)
Installation
------------
View
8 composer.json
@@ -21,12 +21,12 @@
],
"require": {
"php": ">=5.3.2",
- "symfony/framework-bundle": "2.0.*",
- "symfony/security-bundle": "2.0.*"
+ "symfony/framework-bundle": "2.1.*",
+ "symfony/security-bundle": "2.1.*"
},
"suggest": {
- "symfony/doctrine-bundle": "2.0.*",
- "doctrine/mongodb-odm-bundle": "2.0.*",
+ "doctrine/doctrine-bundle": "*",
+ "doctrine/mongodb-odm-bundle": "*",
"doctrine/couchdb-odm-bundle": "*"
},
"autoload": {

0 comments on commit 7ca8e5d

Please sign in to comment.