Merge branch '2.6' into 2.7

* 2.6:
  updated VENDORS for 2.5.10
  updated distribution bundle
  added back composer.lock
  updated composer.json
  Prevent doctrine/dbal 2.5 from installing
  updated year range in LICENSE
  Use getRootDir() rather than assuming __DIR__

Conflicts:
	composer.json

Author: fabpot

LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2004-2014 Fabien Potencier
+Copyright (c) 2004-2015 Fabien Potencier
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

app/AppKernel.php

@@ -31,6 +31,6 @@ public function registerBundles()
 
     public function registerContainerConfiguration(LoaderInterface $loader)
     {
-        $loader->load(__DIR__.'/config/config_'.$this->getEnvironment().'.yml');
+        $loader->load($this->getRootDir().'/config/config_'.$this->getEnvironment().'.yml');
     }
 }

composer.json

@@ -9,14 +9,15 @@
     "require": {
         "php": ">=5.3.3",
         "symfony/symfony": "2.7.x-dev",
-        "doctrine/orm": "~2.2,>=2.2.3",
+        "doctrine/orm": "~2.2,>=2.2.3,<2.5",
+        "doctrine/dbal": "<2.5",
         "doctrine/doctrine-bundle": "~1.2",
         "twig/extensions": "~1.0",
         "symfony/assetic-bundle": "~2.3",
         "symfony/swiftmailer-bundle": "~2.3",
         "symfony/monolog-bundle": "~2.4",
         "sensio/distribution-bundle": "~3.0,>=3.0.12",
-        "sensio/framework-extra-bundle": "~3.0",
+        "sensio/framework-extra-bundle": "~3.0,>=3.0.2",
         "incenteev/composer-parameter-handler": "~2.0"
     },
     "require-dev": {