Fixed some issues reported by scrutinizer

src/ORM/Query.php

@@ -303,11 +303,11 @@ public function contain($associations = null, $override = false)
             $this->_dirty();
         }
 
-        $result = $loader->contain($associations);
         if ($associations === null) {
-            return $result;
+            return $loader->contain();
         }
 
+        $result = $loader->contain($associations);
         $this->_addAssociationsToTypeMap($this->repository(), $this->typeMap(), $result);
         return $this;
     }
@@ -324,7 +324,6 @@ public function contain($associations = null, $override = false)
      */
     protected function _addAssociationsToTypeMap($table, $typeMap, $associations)
     {
-        $typeMap = $this->typeMap();
         foreach ($associations as $name => $nested) {
             $association = $table->association($name);
             if (!$association) {
@@ -771,7 +770,10 @@ protected function _performCount()
      * The callback will receive as first argument a clone of this query and not this
      * query itself.
      *
-     * @param callable $counter The counter value
+     * If the first param is a null value, the built-in counter function will be called
+     * instead
+     *
+     * @param callable|null $counter The counter value
      * @return $this
      */
     public function counter($counter)