From f6792e5053f09713aac6f8131a1f4fbc9c38685a Mon Sep 17 00:00:00 2001 From: naomi Date: Mon, 16 May 2022 10:01:16 +0100 Subject: [PATCH] addConditionsToQuery adds "=" by default --- src/Utils.php | 3 +-- tests/src/Unit/UtilsTest.php | 7 ++++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Utils.php b/src/Utils.php index 6cfe828..6aecd74 100644 --- a/src/Utils.php +++ b/src/Utils.php @@ -21,10 +21,9 @@ class Utils { public function addConditionsToQuery(QueryInterface $query, array $conditions): void { foreach($conditions as $condition) { - if (sizeof($condition) != 3) throw new RuntimeException('Utils::addConditionsToQuery needs each condition to consist of 3 strings'); $field = $condition[0]; $value = $condition[1]; - $operator = $condition[2]; + $operator = isset($condition[2]) ? $condition[2] : "="; $query->condition($field, $value, $operator); } } diff --git a/tests/src/Unit/UtilsTest.php b/tests/src/Unit/UtilsTest.php index 01f8b29..5e51445 100644 --- a/tests/src/Unit/UtilsTest.php +++ b/tests/src/Unit/UtilsTest.php @@ -23,9 +23,10 @@ class UtilsTest extends UnitTestCase{ ->willReturn([$term_entity]); $this->assertEquals($this->utils->getTidByName('foo', 'bar'), 3); } - public function testAddConditionToQueryExceptsIfNotGivenArraysOf3Things():void { - $this->expectException(\RuntimeException::class); - $this->utils->addConditionsToQuery($this->query, [["1","2"], ["1"]]); + public function testAddConditionToQueryAddsEqualsIfNoOperatorProvided():void { + $this->query->expects($this->exactly(1))->method('condition')->with("1", "2", "="); + $this->utils->addConditionsToQuery($this->query, [["1","2"]]); + } public function testAddConditionToQueryAddsTheRightAmountOfConditions():void { $this->query->expects($this->exactly(4))->method('condition');