Merge pull request #307 from alleyinteractive/install-loaded

Changing the loaded() action in installation manager to muplugins_loaded

CHANGELOG.md

@@ -5,6 +5,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## v0.5.1 - 2022-08-01
+
+* Fixing issue with testing installation callback.
+
 ## v0.5.0 - 2022-07-29
 
 - Prevent external requests during unit testing by @srtfisher in https://github.com/alleyinteractive/mantle-framework/pull/293

src/mantle/testing/autoload.php

@@ -11,6 +11,8 @@
 
 use function Mantle\Support\Helpers\tap;
 
+require_once __DIR__ . '/preload.php';
+
 /**
  * Retrieve an instance of the Installation Manager
  *
@@ -21,20 +23,18 @@
  * @return Installation_Manager
  */
 function manager(): Installation_Manager {
-	require_once __DIR__ . '/preload.php';
-
 	return Installation_Manager::instance();
 }
 
 /**
  * Install the Mantle Testing Framework
  *
- * @param callable $callback_after_preload Callback to invoke before WordPress is loaded.
+ * @param callable $callback Callback to invoke once the installation has begun.
  * @return Installation_Manager
  */
-function install( callable $callback_after_preload = null ): Installation_Manager {
+function install( callable $callback = null ): Installation_Manager {
 	return tap(
 		manager(),
-		fn ( Installation_Manager $manager ) => $manager->after( $callback_after_preload ),
+		fn ( Installation_Manager $manager ) => $manager->before( $callback ),
 	)->install();
 }

src/mantle/testing/class-installation-manager.php

@@ -65,13 +65,13 @@ public function after( ?callable $callback ) {
 	}
 
 	/**
-	 * Define a callback to be invoked after WordPress is loaded.
+	 * Define a callback to be invoked using the 'muplugins_loaded' hook.
 	 *
-	 * @param callable $callback Callback to invoke after WordPress is loaded.
+	 * @param callable $callback Callback to invoke on 'muplugins_loaded'.
 	 * @return static
 	 */
 	public function loaded( ?callable $callback ) {
-		return $this->on( 'wp_loaded', $callback );
+		return $this->on( 'muplugins_loaded', $callback );
 	}
 
 	/**

src/mantle/testkit/concerns/trait-installs-wordpress.php

@@ -33,7 +33,9 @@ public static function installs_wordpress_set_up_before_class(): void {
 		 */
 		$callback = function_exists( 'mantle_after_wordpress_install' ) ? 'mantle_after_wordpress_install' : null;
 
-		\Mantle\Testing\install( $callback );
+		\Mantle\Testing\manager()
+			->after( $callback )
+			->install();
 
 		$installed = true;
 	}