From 9ab08d10516aa0d5350ff9727992ddccd8d90922 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Cmlindenhofer=E2=80=9D?= Date: Tue, 14 Nov 2023 10:42:21 +0100 Subject: [PATCH 1/2] copy Bugfix from here https://github.com/tractorcow-farm/silverstripe-fluent/pull/793 to Version 6.0 --- src/Extension/FluentExtension.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Extension/FluentExtension.php b/src/Extension/FluentExtension.php index 69b2cc57..7aa7f354 100644 --- a/src/Extension/FluentExtension.php +++ b/src/Extension/FluentExtension.php @@ -583,6 +583,10 @@ public function augmentSQL(SQLSelect $query, DataQuery $dataQuery = null) // Apply substitutions $localisedPredicate = str_replace($conditionSearch, $conditionReplace, $predicate); + if (empty($localisedPredicate)) { + continue; + } + $where[$index] = [ $localisedPredicate => $parameters ]; From f18bc716ff94f1f7b55eb4bd7b5ac7d9a388fb76 Mon Sep 17 00:00:00 2001 From: Damian Mooyman Date: Wed, 15 Nov 2023 12:13:18 +1300 Subject: [PATCH 2/2] fix: allow plugins --- composer.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index f0bd5a00..30aa48ff 100644 --- a/composer.json +++ b/composer.json @@ -64,5 +64,10 @@ "lint-clean": "phpcbf src/ tests/php/" }, "prefer-stable": true, - "minimum-stability": "dev" + "minimum-stability": "dev", + "config": { + "allow-plugins": { + "composer/installers": true + } + } }