Merge master into stable

1 files changed, 4 insertions, 2 deletions

diff --git a/_test/tests/inc/events_nested.test.php b/_test/tests/inc/events_nested.test.php
index fe5e395bb..3ed2fcf34 100644
--- a/_test/tests/inc/events_nested.test.php
+++ b/_test/tests/inc/events_nested.test.php
@@ -1,5 +1,7 @@
 <?php
 
+use dokuwiki\Extension\Event;
+
 /**
  * This tests if event handlers can trigger the same event again.
  * This is used by plugins that modify cache handling and use metadata
@@ -16,7 +18,7 @@ class events_nested_test extends DokuWikiTest {
                 $firstcount++;
                 if ($firstcount == 1) {
                     $param = array();
-                    trigger_event('NESTED_EVENT', $param);
+                    Event::createAndTrigger('NESTED_EVENT', $param);
                 }
             }
         );
@@ -28,7 +30,7 @@ class events_nested_test extends DokuWikiTest {
         );
 
         $param = array();
-        trigger_event('NESTED_EVENT', $param);
+        Event::createAndTrigger('NESTED_EVENT', $param);
 
         $this->assertEquals(2, $firstcount);
         $this->assertEquals(2, $secondcount);