Merge pull request #400 from doctrine/2.2.x

Merge 2.2.x up into 3.0.x

UPGRADE.md

@@ -108,3 +108,12 @@ You can find a list of major changes to public API below.
 |             1.0.x              |                   3.0.x                    |
 |-------------------------------:|:-------------------------------------------|
 | `matching(Criteria $criteria)` | `matching(Criteria $criteria): Collection` |
+
+# Upgrade to 1.7
+
+## Deprecated null first result
+
+Passing null as `$firstResult` to
+`Doctrine\Common\Collections\Criteria::__construct()` and to
+`Doctrine\Common\Collections\Criteria::setFirstResult()` is deprecated.
+Use `0` instead.

docs/en/expressions.rst

@@ -76,6 +76,8 @@ orderBy
 Sets the ordering of the result of this Criteria.
 
 .. code-block:: php
+    use Doctrine\Common\Collections\Order;
+
     $criteria->orderBy(['name' => Order::Ascending]);
 
 setFirstResult