Merge remote-tracking branch '38439/bugfix/data-collection-typehint' into community_prs_march

Author: Indrani Sonawane

app/code/Magento/Eav/Test/Unit/Model/Entity/Collection/AbstractCollectionStub.php

@@ -16,7 +16,7 @@ class AbstractCollectionStub extends AbstractCollection
      * Retrieve item by id
      *
      * @param   mixed $id
-     * @return  DataObject
+     * @return  DataObject|null
      */
     public function getItemById($id)
     {

app/code/Magento/Eav/Test/Unit/Model/Entity/Collection/VersionControl/AbstractCollectionStub.php

@@ -19,7 +19,7 @@ class AbstractCollectionStub extends AbstractCollection
      * Retrieve item by id
      *
      * @param   mixed $id
-     * @return  DataObject
+     * @return  DataObject|null
      */
     public function getItemById($id)
     {

lib/internal/Magento/Framework/Data/Collection.php

@@ -77,7 +77,7 @@ class Collection implements
     /**
      * Pager page size
      *
-     * if page size is false, then we works with all items
+     * if page size is false, then we work with all items
      *
      * @var int|false
      */
@@ -161,8 +161,8 @@ public function addFilter($field, $value, $type = 'and')
      * - ["finset" => $valueInSet]
      * </pre>
      *
-     * If non matched - sequential parallel arrays are expected and OR conditions
-     * will be built using above mentioned structure.
+     * If non-matched - sequential parallel arrays are expected and OR conditions
+     * will be built using above-mentioned structure.
      *
      * Example:
      * <pre>
@@ -825,7 +825,7 @@ protected function _toOptionHash($valueField = 'id', $labelField = 'name')
      * Retrieve item by id
      *
      * @param string|int $idValue
-     * @return DataObject
+     * @return DataObject|null
      */
     public function getItemById($idValue)
     {