From c593c153a16a900ca1d92188b38352503703dbda Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Wed, 4 Apr 2018 15:47:18 +0200
Subject: [PATCH] fix error on exports test

Since php 7.2, the count function does not accept NULL values. This led to error if
the WHERE clause of query where empty.
---
 Test/Export/AbstractAggregatorTest.php | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/Test/Export/AbstractAggregatorTest.php b/Test/Export/AbstractAggregatorTest.php
index c03fecfc6..a1f0cf60a 100644
--- a/Test/Export/AbstractAggregatorTest.php
+++ b/Test/Export/AbstractAggregatorTest.php
@@ -210,19 +210,28 @@ abstract class AbstractAggregatorTest extends KernelTestCase
     public function testAlterQuery(QueryBuilder $query, $data)
     {
         // retains informations about query
-        $nbOfFrom   = count($query->getDQLPart('from'));
-        $nbOfWhere  = count($query->getDQLPart('where'));
-        $nbOfSelect = count($query->getDQLPart('select'));
+        $nbOfFrom   = $query->getDQLPart('from') !== null ? 
+            count($query->getDQLPart('from')) : 0;
+        $nbOfWhere  = $query->getDQLPart('where') !== null ? 
+            count($query->getDQLPart('where')) : 0;
+        $nbOfSelect = $query->getDQLPart('select') !== null ?
+            count($query->getDQLPart('select')) : 0;
         
         $this->getAggregator()->alterQuery($query, $data);
         
-        $this->assertGreaterThanOrEqual($nbOfFrom, count($query->getDQLPart('from')),
+        $this->assertGreaterThanOrEqual(
+            $nbOfFrom, 
+            $query->getDQLPart('from') !== null ? count($query->getDQLPart('from')) : 0,
             "Test that there are equal or more 'from' clause after that the filter has 
                 altered the query");
-        $this->assertGreaterThanOrEqual($nbOfWhere, count($query->getDQLPart('where')),
+        $this->assertGreaterThanOrEqual(
+            $nbOfWhere, 
+            $query->getDQLPart('where') !== null ? count($query->getDQLPart('where')) : 0,
             "Test that there are equal or more 'where' clause after that the filter has"
             . "altered the query");
-        $this->assertGreaterThanOrEqual($nbOfSelect, count($query->getDQLPart('select')),
+        $this->assertGreaterThanOrEqual(
+            $nbOfSelect, 
+            $query->getDQLPart('select') !== null ? count($query->getDQLPart('select')) : 0,
             "Test that the filter has no altered the 'select' part of the query");
         
     }