Merge pull request #46 from Betalabs/pr

Fix for a PHP 7.2 compatibility issue which was caused by a behaviour change in count()
marcelgwerder · Dec 2, 2017 · 1743354 · 1743354
2 parents 05d85f2 + 619335c
commit 1743354
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -272,4 +272,4 @@ The envelope has the following structure:
 
   ]
 }
-```
+```
diff --git a/composer.json b/composer.json
@@ -26,4 +26,4 @@
         }
     },
     "minimum-stability": "stable"
-}
+}
diff --git a/src/Parser.php b/src/Parser.php
@@ -328,7 +328,7 @@ protected function parseFields($fieldsParam)
     protected function parseWith($withParam)
     {
         $fields = $this->query->columns;
-        $fieldsCount = count($fields);
+        $fieldsCount = count($fields ?: []);
         $baseModel = $this->builder->getModel();
 
         $withHistory = [];
@@ -449,7 +449,7 @@ protected function parseWith($withParam)
         $this->builder->with($withsArr);
 
         //Merge the base fields
-        if (count($fields) > 0) {
+        if (count($fields ?: []) > 0) {
             if (!is_array($this->query->columns)) {
                 $this->query->columns = [];
             }
-Original file line number
+Diff line change
@@ Expand Up / @@ -272,4 +272,4 @@ The envelope has the following structure: @@
       ]
     }
-    ```
+    ```