bumped version to 2.0

composer.json

@@ -18,28 +18,28 @@
     "require": {
         "php": ">=5.3.3",
         "pimple/pimple": "~1.0",
-        "symfony/event-dispatcher": ">=2.3,<2.6-dev",
-        "symfony/http-foundation": ">=2.3,<2.6-dev",
-        "symfony/http-kernel": ">=2.3,<2.6-dev",
-        "symfony/routing": ">=2.3,<2.6-dev"
+        "symfony/event-dispatcher": ">=2.4,<2.6-dev",
+        "symfony/http-foundation": ">=2.4,<2.6-dev",
+        "symfony/http-kernel": ">=2.4,<2.6-dev",
+        "symfony/routing": ">=2.4,<2.6-dev"
     },
     "require-dev": {
-        "symfony/security": ">=2.3,<2.6-dev",
-        "symfony/config": ">=2.3,<2.6-dev",
-        "symfony/locale": ">=2.3,<2.6-dev",
-        "symfony/form": ">=2.3,<2.6-dev",
-        "symfony/browser-kit": ">=2.3,<2.6-dev",
-        "symfony/css-selector": ">=2.3,<2.6-dev",
-        "symfony/debug": ">=2.3,<2.6-dev",
-        "symfony/dom-crawler": ">=2.3,<2.6-dev",
-        "symfony/finder": ">=2.3,<2.6-dev",
-        "symfony/monolog-bridge": ">=2.3,<2.6-dev",
-        "symfony/options-resolver": ">=2.3,<2.6-dev",
-        "symfony/process": ">=2.3,<2.6-dev",
-        "symfony/serializer": ">=2.3,<2.6-dev",
-        "symfony/translation": ">=2.3,<2.6-dev",
-        "symfony/twig-bridge": ">=2.3,<2.6-dev",
-        "symfony/validator": ">=2.3,<2.6-dev",
+        "symfony/security": ">=2.4,<2.6-dev",
+        "symfony/config": ">=2.4,<2.6-dev",
+        "symfony/locale": ">=2.4,<2.6-dev",
+        "symfony/form": ">=2.4,<2.6-dev",
+        "symfony/browser-kit": ">=2.4,<2.6-dev",
+        "symfony/css-selector": ">=2.4,<2.6-dev",
+        "symfony/debug": ">=2.4,<2.6-dev",
+        "symfony/dom-crawler": ">=2.4,<2.6-dev",
+        "symfony/finder": ">=2.4,<2.6-dev",
+        "symfony/monolog-bridge": ">=2.4,<2.6-dev",
+        "symfony/options-resolver": ">=2.4,<2.6-dev",
+        "symfony/process": ">=2.4,<2.6-dev",
+        "symfony/serializer": ">=2.4,<2.6-dev",
+        "symfony/translation": ">=2.4,<2.6-dev",
+        "symfony/twig-bridge": ">=2.4,<2.6-dev",
+        "symfony/validator": ">=2.4,<2.6-dev",
         "twig/twig": ">=1.8.0,<2.0-dev",
         "doctrine/dbal": "~2.2",
         "swiftmailer/swiftmailer": "5.*",
@@ -47,17 +47,17 @@
         "phpunit/phpunit": "~3.7"
     },
     "suggest": {
-        "symfony/browser-kit": ">=2.3,<2.6-dev",
-        "symfony/css-selector": ">=2.3,<2.6-dev",
-        "symfony/dom-crawler": ">=2.3,<2.6-dev",
-        "symfony/form": ">=2.3,<2.6-dev"
+        "symfony/browser-kit": ">=2.4,<2.6-dev",
+        "symfony/css-selector": ">=2.4,<2.6-dev",
+        "symfony/dom-crawler": ">=2.4,<2.6-dev",
+        "symfony/form": ">=2.4,<2.6-dev"
     },
     "autoload": {
         "psr-0": { "Silex": "src/" }
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "1.2.x-dev"
+            "dev-master": "2.0.x-dev"
         }
     }
 }

doc/changelog.rst

 Changelog
 =========
 
-1.2.0 (2014-03-29)
+2.0.0 (2013-XX-XX)
 ------------------
 
+* n/a
+
+1.2.0 (2014-03-29)
+
 * Allowed disabling the boot logic of MonologServiceProvider
 * Reverted "convert attributes on the request that actually exist"
 * [BC BREAK] Routes are now always added in the order of their registration (even for mounted routes)

doc/services.rst

@@ -230,9 +230,6 @@ don't want to mess with most of them.
   the ``MonologServiceProvider`` or define your own ``logger`` service that
   conforms to the PSR logger interface.
 
-  In versions of Silex before 1.1 this must be a
-  ``Symfony\Component\HttpKernel\Log\LoggerInterface``.
-
 .. note::
 
     All of these Silex core services are shared.

doc/usage.rst

@@ -25,7 +25,7 @@ If you want more flexibility, use Composer_ instead. Create a
 
     {
         "require": {
-            "silex/silex": "~1.1"
+            "silex/silex": "~2.0"
         }
     }
 

src/Silex/Application.php

@@ -42,7 +42,7 @@ use Silex\EventListener\StringToResponseListener;
  */
 class Application extends \Pimple implements HttpKernelInterface, TerminableInterface
 {
-    const VERSION = '1.2.0';
+    const VERSION = '2.0.0-DEV';
 
     const EARLY_EVENT = 512;
     const LATE_EVENT  = -512;