Merge pull request #7 from doctrine/master

Update from main repository

composer.json

@@ -13,10 +13,10 @@
     ],
     "require": {
         "php": ">=5.3.2",
-        "doctrine/common": "2.4.*"
+        "doctrine/common": ">=2.4,<2.6-dev"
     },
     "require-dev": {
-        "phpunit/phpunit": "4.0.*",
+        "phpunit/phpunit": "4.*",
         "symfony/console": "2.*"
     },
     "suggest": {

tests/Doctrine/Tests/DBAL/SQLParserUtilsTest.php

@@ -47,6 +47,7 @@ AND baz = "\"quote\" me on it? \\" OR baz = ?
 SQLDATA
                 , true, array(58, 104)
             ),
+            array('SELECT * FROM foo WHERE foo = ? AND bar = ?', true, array(1 => 42, 0 => 30)), // explicit keys
 
             // named
             array('SELECT :foo FROM :bar', false, array(7 => 'foo', 17 => 'bar')),
@@ -138,6 +139,15 @@ SQLDATA
                 array(),
                 array()
             ),
+            // Positional: explicit keys for params and types
+            array(
+                "SELECT * FROM Foo WHERE foo = ? AND bar = ? AND baz = ?",
+                array(1 => 'bar', 2 => 'baz', 0 => 1),
+                array(2 => \PDO::PARAM_STR, 1 => \PDO::PARAM_STR),
+                'SELECT * FROM Foo WHERE foo = ? AND bar = ? AND baz = ?',
+                array(1 => 'bar', 0 => 1, 2 => 'baz'),
+                array(1 => \PDO::PARAM_STR, 2 => \PDO::PARAM_STR)
+            ),
             //  Named parameters : Very simple with param int
             array(
                 "SELECT * FROM Foo WHERE foo = :foo",