feat: new precognitive guards

Author: tobimori

classes/Guards/AkismetGuard.php

@@ -3,7 +3,6 @@
 namespace tobimori\DreamForm\Guards;
 
 use Kirby\Cms\App;
-use Kirby\Data\Json;
 use Kirby\Http\Remote;
 use Kirby\Toolkit\A;
 use tobimori\DreamForm\DreamForm;
@@ -13,13 +12,6 @@ class AkismetGuard extends Guard
 {
 	public const TYPE = 'akismet';
 
-	/**
-	 * Akismet guard doesn't trigger pre-validation checks
-	 */
-	public function run(): void
-	{
-	}
-
 	/**
 	 * Returns the content to be sent to Akismet
 	 */

classes/Guards/CsrfGuard.php

@@ -28,7 +28,7 @@ public function csrf(): string
 	/**
 	 * Validate the CSRF token
 	 */
-	public function run(): void
+	public function precognitiveRun(): void
 	{
 		$token = $this->csrf();
 		$submitted = SubmissionPage::valueFromBody('dreamform-csrf');

classes/Guards/Guard.php

@@ -23,6 +23,21 @@ public function postValidation(SubmissionPage	$submission): void
 	{
 	}
 
+	/**
+	 * Run the guard
+	 */
+	public function run(): void
+	{
+		$this->precognitiveRun();
+	}
+
+	/**
+	 * Precognitive run
+	 */
+	public function precognitiveRun(): void
+	{
+	}
+
 	/**
 	 * Reports the submission as spam to a third-party service
 	 */

classes/Guards/HoneypotGuard.php

@@ -23,7 +23,7 @@ public function fieldName(): string
 		return 'dreamform-guard';
 	}
 
-	public function run(): void
+	public function precognitiveRun(): void
 	{
 		$value = SubmissionPage::valueFromBody($this->fieldName());
 

classes/Guards/LicenseGuard.php

@@ -9,7 +9,7 @@ class LicenseGuard extends Guard
 {
 	public const TYPE = 'license';
 
-	public function run(): void
+	public function precognitiveRun(): void
 	{
 		$license = License::fromDisk();
 		if (!$license->isValid() && !App::instance()->system()->isLocal() && !App::instance()->user()?->isAdmin()) {

classes/Models/FormPage.php

@@ -271,16 +271,20 @@ public function submit(bool $precognition = false): SubmissionPage
 					->applyHook('before');
 			}
 
-			$submission = $submission->collectMetadata()
-				->handleGuards()
-				->handleFields();
+			$submission = $submission->collectMetadata();
 
 			if (!$precognition) {
 				$submission = $submission
+					->handleGuards()
+					->handleFields()
 					->handleGuards(postValidation: true)
 					->handleActions()
 					->finalize()
 					->handleAfterSubmitFields();
+			} else {
+				$submission = $submission
+					->handlePrecognitiveGuards()
+					->handleFields();
 			}
 		} catch (Exception $e) {
 			// PerformerExceptions stop the workflow early, and not save the submission

classes/Models/SubmissionHandling.php

@@ -32,6 +32,19 @@ public function applyHook(string $type = 'before'): SubmissionPage
 		);
 	}
 
+	/**
+	 * Handles the form submission precognitive guards
+	 * @internal
+	 */
+	public function handlePrecognitiveGuards(): SubmissionPage
+	{
+		foreach ($this->form()->guards() as $guard) {
+			$guard->precognitiveRun();
+		}
+
+		return $this;
+	}
+
 	/**
 	 * Handles the form submission guards
 	 * @internal

composer.json

@@ -15,6 +15,7 @@
 			"tobimori\\DreamForm\\": "classes"
 		}
 	},
+	"minimum-stability": "RC",
 	"require": {
 		"php": ">=8.3.0",
 		"getkirby/composer-installer": "^1.2.1"
@@ -31,5 +32,8 @@
 	},
 	"extra": {
 		"kirby-cms-path": false
+	},
+	"require-dev": {
+		"getkirby/cms": "^5"
 	}
 }