Merge branch 'refs/heads/main' into craft5

composer.json

@@ -31,6 +31,7 @@
             "src/helpers/Craft.php",
             "src/helpers/Http.php",
             "src/helpers/Model.php",
+            "src/helpers/Queue.php",
             "src/helpers/Test.php"
         ]
     },

src/helpers/Queue.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace markhuot\craftpest\helpers\queue;
+
+use Craft;
+
+if (! function_exists('queue')) {
+    function queue($callback = null): mixed
+    {
+        $result = null;
+
+        if ($callback) {
+            $result = $callback();
+        }
+
+        Craft::$app->queue->run();
+
+        return $result;
+    }
+}

src/test/CleanupRequestState.php

@@ -0,0 +1,33 @@
+<?php
+
+namespace markhuot\craftpest\test;
+
+use Craft;
+use markhuot\craftpest\web\Application;
+
+trait CleanupRequestState
+{
+    /**
+     * Cleanup any request state that may be left over from previous tests.
+     *
+     * This is normally cleaned up (and run) after a request goes through Craft's router.
+     * However, if a test isn't interacting with the route and is just calling actions or
+     * running queues then the after request callbacks won't be cleared.
+     */
+    public function tearDownCleanupRequestState(): void
+    {
+        $app = Craft::$app;
+
+        if ($app instanceof Application) {
+            $reflect = new \ReflectionClass($app);
+            while ($reflect && ! $reflect->hasProperty('afterRequestCallbacks')) {
+                $reflect = $reflect->getParentClass();
+            }
+
+            if ($reflect) {
+                $property = $reflect->getProperty('afterRequestCallbacks');
+                $property->setValue($app, []);
+            }
+        }
+    }
+}

src/test/TestCase.php

@@ -14,6 +14,7 @@ class TestCase extends \PHPUnit\Framework\TestCase
 {
     use ActingAs,
         Benchmark,
+        CleanupRequestState,
         CookieState,
         DatabaseAssertions,
         Dd,

tests/RequestStateTest.php

@@ -0,0 +1,17 @@
+<?php
+
+test('sets request state', function () {
+    Craft::$app->onAfterRequest(fn () => throw new Exception('An after request callback was not cleared.'));
+
+    expect(true)->toBeTrue();
+});
+
+test('expects request state to be empty', function () {
+    $app = Craft::$app;
+    $reflect = new ReflectionClass($app);
+    while ($reflect && ! $reflect->hasProperty('afterRequestCallbacks')) {
+        $reflect = $reflect->getParentClass();
+    }
+
+    expect($reflect->getProperty('afterRequestCallbacks')->getValue($app))->toBeEmpty();
+})->depends('sets request state');