From cf7edc6640a0b8f0fdfb944e27b9b22056af350f Mon Sep 17 00:00:00 2001 From: Andrew Dunn Date: Thu, 27 Jun 2024 14:20:20 +1200 Subject: [PATCH 1/4] Update dependencies for CMS5 compatibility --- composer.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index 133be84..81b009a 100644 --- a/composer.json +++ b/composer.json @@ -10,9 +10,9 @@ ], "license": "BSD-3-Clause", "require": { - "silverstripe/framework": "^4.0", - "silverstripe/admin": "^1.0", - "silverstripe/taxonomy": "^2.0" + "silverstripe/framework": "^4.0 || ^5.0", + "silverstripe/admin": "^1.0 || ^2.0", + "silverstripe/taxonomy": "^2.0 || ^3.0 || ^4.0" }, "require-dev": { "phpunit/phpunit": "^5.7", From 245a5fcb5da0814d28e82ca6083d5e5b9d844ab4 Mon Sep 17 00:00:00 2001 From: Andrew Dunn Date: Mon, 1 Jul 2024 09:09:26 +1200 Subject: [PATCH 2/4] Ensure a DataList is returned, and not a map. --- src/Model/Question.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Model/Question.php b/src/Model/Question.php index 19565fd..2299920 100644 --- a/src/Model/Question.php +++ b/src/Model/Question.php @@ -189,7 +189,7 @@ public function getCMSFields() if ($flowField) { // Restrict the range to only Flows for this question's Pathfinder $flowField - ->setSource($this->Pathfinder()->Flows()->map()) + ->setSource($this->Pathfinder()->Flows()) ->setEmptyString('Use default Flow'); } From 2903baebbe44d5bc8c55eca4ff44f41f969f17c1 Mon Sep 17 00:00:00 2001 From: Andrew Dunn Date: Mon, 1 Jul 2024 16:35:07 +1200 Subject: [PATCH 3/4] Due to change in core code, make dependencies compatible for CMS 5 only --- composer.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index 81b009a..7cf8f60 100644 --- a/composer.json +++ b/composer.json @@ -10,9 +10,9 @@ ], "license": "BSD-3-Clause", "require": { - "silverstripe/framework": "^4.0 || ^5.0", - "silverstripe/admin": "^1.0 || ^2.0", - "silverstripe/taxonomy": "^2.0 || ^3.0 || ^4.0" + "silverstripe/framework": "^5.0", + "silverstripe/admin": "^2.0", + "silverstripe/taxonomy": "^4.0" }, "require-dev": { "phpunit/phpunit": "^5.7", From 0c895a4371f21ca85a89a5b41e54e7ac46e77cd3 Mon Sep 17 00:00:00 2001 From: Andrew Dunn Date: Mon, 1 Jul 2024 16:42:22 +1200 Subject: [PATCH 4/4] Update dependencies to cover all versions, since code change added to fix error in CMS 5 also appears to work in CMS 4 --- composer.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index 7cf8f60..81b009a 100644 --- a/composer.json +++ b/composer.json @@ -10,9 +10,9 @@ ], "license": "BSD-3-Clause", "require": { - "silverstripe/framework": "^5.0", - "silverstripe/admin": "^2.0", - "silverstripe/taxonomy": "^4.0" + "silverstripe/framework": "^4.0 || ^5.0", + "silverstripe/admin": "^1.0 || ^2.0", + "silverstripe/taxonomy": "^2.0 || ^3.0 || ^4.0" }, "require-dev": { "phpunit/phpunit": "^5.7",