Merge branch 'DDC-968'

lib/Doctrine/ORM/AbstractQuery.php

@@ -458,6 +458,16 @@ abstract class AbstractQuery
         return isset($this->_hints[$name]) ? $this->_hints[$name] : false;
     }
 
+    /**
+     * Return the key value map of query hints that are currently set.
+     * 
+     * @return array
+     */
+    public function getHints()
+    {
+        return $this->_hints;
+    }
+
     /**
      * Executes the query and returns an IterableResult that can be used to incrementally
      * iterate over the result.

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

@@ -86,4 +86,17 @@ class QueryTest extends \Doctrine\Tests\OrmTestCase
 
         $this->assertSame($q2, $q);
     }
+
+    /**
+     * @group DDC-968
+     */
+    public function testHints()
+    {
+        $q = $this->_em->createQuery("select a from Doctrine\Tests\Models\CMS\CmsArticle a");
+        $q->setHint('foo', 'bar')->setHint('bar', 'baz');
+
+        $this->assertEquals('bar', $q->getHint('foo'));
+        $this->assertEquals('baz', $q->getHint('bar'));
+        $this->assertEquals(array('foo' => 'bar', 'bar' => 'baz'), $q->getHints());
+    }
 }