Merge branch '2.2'

* 2.2: (30 commits)
  [HttpFoundation] Added support for partial ranges in the BinaryFileResponse.
  [HttpFoundation] Fixed byte ranges in the BinaryFileResponse.
  updated required versions when depending on the HttpFoundation component
  updated required versions when depending on the HttpKernel component
  updated required versions when depending on the Config component
  updated required versions when depending on the Form component
  updated required versions when depending on the DependencyInjection component
  updated required versions when depending on the Validator component
  updated required versions when depending on the Translation component
  updated required versions when depending on the Routing component
  updated required versions when depending on the EventDispatcher component
  updated required versions when depending on the OptionsResolver component
  updated required versions when depending on the PropertyAccess component
  updated required versions when depending on the Security component
  updated required versions when depending on the Templating component
  updated required versions when depending on the Stopwatch component
  updated required versions when depending on the Process component
  updated required versions when depending on the Finder component
  updated required versions when depending on the Dom Crawler component
  use ~2.0 when depending on the Dom Crawler component
  ...

2 files changed, 11 insertions, 11 deletions

diff --git a/Acl/Resources/bin/generateSql.php b/Acl/Resources/bin/generateSql.php
index d65874b..4a5ca05 100644
--- a/Acl/Resources/bin/generateSql.php
+++ b/Acl/Resources/bin/generateSql.php
@@ -9,14 +9,14 @@
  * file that was distributed with this source code.
  */
 
-require_once __DIR__.'/../../../../ClassLoader/UniversalClassLoader.php';
+require_once __DIR__.'/../../../../ClassLoader/ClassLoader.php';
 
-use Symfony\Component\ClassLoader\UniversalClassLoader;
+use Symfony\Component\ClassLoader\ClassLoader;
 use Symfony\Component\Finder\Finder;
 use Symfony\Component\Security\Acl\Dbal\Schema;
 
-$loader = new UniversalClassLoader();
-$loader->registerNamespaces(array(
+$loader = new ClassLoader();
+$loader->addPrefixes(array(
     'Symfony'                    => __DIR__.'/../../../../../..',
     'Doctrine\\Common'           => __DIR__.'/../../../../../../../vendor/doctrine-common/lib',
     'Doctrine\\DBAL\\Migrations' => __DIR__.'/../../../../../../../vendor/doctrine-migrations/lib',
diff --git a/composer.json b/composer.json
index 1e3f001..64db231 100644
--- a/composer.json
+++ b/composer.json
@@ -17,15 +17,15 @@
     ],
     "require": {
         "php": ">=5.3.3",
-        "symfony/event-dispatcher": "2.2.*",
-        "symfony/http-foundation": "2.2.*",
-        "symfony/http-kernel": "2.2.*"
+        "symfony/event-dispatcher": "~2.1",
+        "symfony/http-foundation": ">=2.1,<2.3-dev",
+        "symfony/http-kernel": ">=2.1,<=2.3-dev"
     },
     "require-dev": {
-        "symfony/form": "2.2.*",
-        "symfony/routing": "2.2.*",
-        "symfony/validator": "2.2.*",
-        "doctrine/common": "~2.2",
+        "symfony/form": "~2.0",
+        "symfony/routing": ">=2.2,<2.3-dev",
+        "symfony/validator": ">=2.2,<2.3-dev",
+        "doctrine/common": ">=2.2,<2.4-dev",
         "doctrine/dbal": "~2.2",
         "psr/log": "~1.0"
     },