Merge branch 'master' of github.com:doctrine/doctrine2

.gitignore

@@ -5,5 +5,5 @@ reports/
 dist/
 download/
 lib/api/
-lib/Doctrine/Common/
-lib/Doctrine/DBAL/
+lib/Doctrine/Common
+lib/Doctrine/DBAL

lib/Doctrine/ORM/Query/Expr.php

@@ -470,9 +470,13 @@ public function concat($x, $y)
      * @param integer $len Length of crop. May accept negative values.
      * @return Expr\Func
      */
-    public function substring($x, $from, $len)
+    public function substring($x, $from, $len = null)
     {
-        return new Expr\Func('SUBSTRING', array($x, $from, $len));
+        $args = array($x, $from);
+        if (null !== $len) {
+            $args[] = $len;
+        }
+        return new Expr\Func('SUBSTRING', $args);
     }
 
     /**

tests/Doctrine/Tests/ORM/Query/ExprTest.php

@@ -185,6 +185,15 @@ public function testSubstringExpr()
         $this->assertEquals('SUBSTRING(a.title, 0, 25)', (string) $this->_expr->substring('a.title', 0, 25));
     }
 
+    /**
+     * @group regression
+     * @group DDC-612
+     */
+    public function testSubstringExprAcceptsTwoArguments()
+    {
+        $this->assertEquals('SUBSTRING(a.title, 0)', (string) $this->_expr->substring('a.title', 5));
+    }
+
     public function testLowerExpr()
     {
         $this->assertEquals('LOWER(u.first_name)', (string) $this->_expr->lower('u.first_name'));