updated deps to allow Symfony 2.2, removed the lock file from the repository (closes #505)

.gitignore

 /phpunit.xml
 /vendor
 /build
+/composer.lock
 

composer.json

@@ -17,33 +17,33 @@
     "require": {
         "php": ">=5.3.3",
         "pimple/pimple": "1.*",
-        "symfony/event-dispatcher": "2.1.*",
-        "symfony/http-foundation": "2.1.*",
-        "symfony/http-kernel": "2.1.*",
-        "symfony/routing": "2.1.*"
+        "symfony/event-dispatcher": ">=2.1,<2.3-dev",
+        "symfony/http-foundation": ">=2.1,<2.3-dev",
+        "symfony/http-kernel": ">=2.1,<2.3-dev",
+        "symfony/routing": ">=2.1,<2.3-dev"
     },
     "require-dev": {
-        "symfony/security": "2.1.*",
-        "symfony/config": "2.1.*",
-        "symfony/locale": "2.1.*",
-        "symfony/form": "2.1.*",
+        "symfony/security": ">=2.1,<2.3-dev",
+        "symfony/config": ">=2.1,<2.3-dev",
+        "symfony/locale": ">=2.1,<2.3-dev",
+        "symfony/form": ">=2.1,<2.3-dev",
         "monolog/monolog": ">=1.0.0,<1.2-dev",
-        "symfony/browser-kit": "2.1.*",
-        "symfony/css-selector": "2.1.*",
-        "symfony/finder": "2.1.*",
-        "symfony/monolog-bridge": "2.1.*",
-        "symfony/process": "2.1.*",
-        "symfony/translation": "2.1.*",
-        "symfony/twig-bridge": "2.1.*",
-        "symfony/validator": "2.1.*",
+        "symfony/browser-kit": ">=2.1,<2.3-dev",
+        "symfony/css-selector": ">=2.1,<2.3-dev",
+        "symfony/finder": ">=2.1,<2.3-dev",
+        "symfony/monolog-bridge": ">=2.1,<2.3-dev",
+        "symfony/process": ">=2.1,<2.3-dev",
+        "symfony/translation": ">=2.1,<2.3-dev",
+        "symfony/twig-bridge": ">=2.1,<2.3-dev",
+        "symfony/validator": ">=2.1,<2.3-dev",
         "twig/twig": ">=1.8.0,<2.0-dev",
         "doctrine/dbal": ">=2.2.0,<2.4.0-dev",
         "swiftmailer/swiftmailer": "4.2.*"
     },
     "suggest": {
-        "symfony/browser-kit": "2.1.*",
-        "symfony/css-selector": "2.1.*",
-        "symfony/dom-crawler": "2.1.*"
+        "symfony/browser-kit": ">=2.1,<2.3-dev",
+        "symfony/css-selector": ">=2.1,<2.3-dev",
+        "symfony/dom-crawler": ">=2.1,<2.3-dev"
     },
     "autoload": {
         "psr-0": { "Silex": "src/" }

doc/usage.rst

@@ -24,7 +24,6 @@ If you want more flexibility, use Composer instead. Create a
 .. code-block:: json
 
     {
-        "minimum-stability": "dev",
         "require": {
             "silex/silex": "1.0.*"
         }
@@ -37,6 +36,12 @@ And run Composer to install Silex and all its dependencies:
     $ curl -s http://getcomposer.org/installer | php
     $ php composer.phar install
 
+.. tip::
+
+    By default, Silex relies on the stable Symfony components. If you want to
+    use their master version instead, add ``"minimum-stability": "dev"`` in
+    your ``composer.json`` file.
+
 Upgrading
 ---------