Return null explicitely in methods and PHPDoc.

library/Solarium/QueryType/Select/ResponseParser/Component/FacetSet.php

@@ -144,12 +144,14 @@ class FacetSet extends ResponseParserAbstract implements ComponentParserInterfac
      * @param  Query            $query
      * @param  QueryFacetField  $facet
      * @param  array            $data
-     * @return ResultFacetField
+     * @return ResultFacetField|null
      */
     protected function facetField($query, $facet, $data)
     {
         $key = $facet->getKey();
-        if (isset($data['facet_counts']['facet_fields'][$key])) {
+        if (!isset($data['facet_counts']['facet_fields'][$key])) {
+            return null;
+        }
 
         if ($query->getResponseWriter() == $query::WT_JSON) {
             $data['facet_counts']['facet_fields'][$key] = $this->convertToKeyValueArray($data['facet_counts']['facet_fields'][$key]);
@@ -157,24 +159,22 @@ class FacetSet extends ResponseParserAbstract implements ComponentParserInterfac
 
         return new ResultFacetField($data['facet_counts']['facet_fields'][$key]);
     }
-    }
 
     /**
      * Add a facet result for a facet query
      *
      * @param  QueryFacetQuery  $facet
      * @param  array            $data
-     * @return ResultFacetQuery
+     * @return ResultFacetQuery|null
      */
     protected function facetQuery($facet, $data)
     {
         $key = $facet->getKey();
-        if (isset($data['facet_counts']['facet_queries'][$key])) {
-
-            $value = $data['facet_counts']['facet_queries'][$key];
-
-            return new ResultFacetQuery($value);
+        if (!isset($data['facet_counts']['facet_queries'][$key])) {
+            return null;
         }
+
+        return new ResultFacetQuery($data['facet_counts']['facet_queries'][$key]);
     }
 
     /**
@@ -182,7 +182,7 @@ class FacetSet extends ResponseParserAbstract implements ComponentParserInterfac
      *
      * @param  QueryFacetMultiQuery  $facet
      * @param  array                 $data
-     * @return ResultFacetMultiQuery
+     * @return ResultFacetMultiQuery|null
      */
     protected function facetMultiQuery($facet, $data)
     {
@@ -195,9 +195,11 @@ class FacetSet extends ResponseParserAbstract implements ComponentParserInterfac
             }
         }
 
-        if (count($values) > 0) {
-            return new ResultFacetMultiQuery($values);
+        if (count($values) <= 0) {
+            return null;
         }
+
+        return new ResultFacetMultiQuery($values);
     }
 
     /**
@@ -206,12 +208,14 @@ class FacetSet extends ResponseParserAbstract implements ComponentParserInterfac
      * @param  Query            $query
      * @param  QueryFacetRange  $facet
      * @param  array            $data
-     * @return ResultFacetRange
+     * @return ResultFacetRange|null
      */
     protected function facetRange($query, $facet, $data)
     {
         $key = $facet->getKey();
-        if (isset($data['facet_counts']['facet_ranges'][$key])) {
+        if (!isset($data['facet_counts']['facet_ranges'][$key])) {
+            return null;
+        }
 
         $data = $data['facet_counts']['facet_ranges'][$key];
         $before = (isset($data['before'])) ? $data['before'] : null;
@@ -227,7 +231,6 @@ class FacetSet extends ResponseParserAbstract implements ComponentParserInterfac
 
         return new ResultFacetRange($data['counts'], $before, $after, $between, $start, $end, $gap);
     }
-    }
 
     /**
      * Add a facet result for a range facet
@@ -235,15 +238,16 @@ class FacetSet extends ResponseParserAbstract implements ComponentParserInterfac
      * @param  Query            $query
      * @param  QueryFacetPivot  $facet
      * @param  array            $data
-     * @return ResultFacetPivot
+     * @return ResultFacetPivot|null
      */
     protected function facetPivot($query, $facet, $data)
     {
         $key = implode(',', $facet->getFields());
-        if (isset($data['facet_counts']['facet_pivot'][$key])) {
-            $data = $data['facet_counts']['facet_pivot'][$key];
-            return new ResultFacetPivot($data);
+        if (!isset($data['facet_counts']['facet_pivot'][$key])) {
+            return null;
         }
+
+        return new ResultFacetPivot($data['facet_counts']['facet_pivot'][$key]);
     }
 
 }