Merge branch '1.2.x'

* 1.2.x:
  Update changelog for 1.2.2 release
  Fix wrong syntax for dateToString operator
  Hello 2016

CHANGELOG-1.2.md

@@ -4,6 +4,11 @@ CHANGELOG for 1.2.x
 This changelog references the relevant changes (bug and security fixes) done
 in 1.2.x patch versions.
 
+1.2.2 (2016-03-19)
+------------------
+
+ * [#250](https://github.com/doctrine/mongodb/pull/250): Fix wrong syntax for dateToString operator
+
 1.2.1 (2015-11-24)
 ------------------
 

LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2006-2012 Doctrine Project
+Copyright (c) 2006-2016 Doctrine Project
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

lib/Doctrine/MongoDB/Aggregation/Expr.php

@@ -316,7 +316,7 @@ private function ensureArray($expression)
      */
     public function dateToString($format, $expression)
     {
-        return $this->operator('$dateToString', array($format, $expression));
+        return $this->operator('$dateToString', array('format' => $format, 'date' => $expression));
     }
 
     /**

tests/Doctrine/MongoDB/Tests/Aggregation/ExprTest.php

@@ -113,7 +113,7 @@ public function testDateToString()
         $expr = new Expr();
 
         $this->assertSame($expr, $expr->dateToString('%Y-%m-%d', '$dateField'));
-        $this->assertSame(array('$dateToString' => array('%Y-%m-%d', '$dateField')), $expr->getExpression());
+        $this->assertSame(array('$dateToString' => array('format' => '%Y-%m-%d', 'date' => '$dateField')), $expr->getExpression());
     }
 
     public function testDayOfMonth()