Merge pull request #105 from humanmade/eager-bootstrap

Eager bootstrapping of the plugin
humanmade · Jul 31, 2020 · 771b2e1 · 771b2e1
2 parents a7bb0d3 + 2471886
commit 771b2e1
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/inc/namespace.php b/inc/namespace.php
@@ -143,10 +143,8 @@ function maybe_populate_site_option() {
 		return;
 	}
 
-	$cavalcade_db_version = get_option( 'cavalcade_db_version' );
-
-	$set_site_meta = function ( $site_meta ) use ( $cavalcade_db_version ) {
-		$site_meta['cavalcade_db_version'] = $cavalcade_db_version;
+	$set_site_meta = function ( $site_meta ) {
+		$site_meta['cavalcade_db_version'] = get_option( 'cavalcade_db_version' );
 		return $site_meta;
 	};
 

diff --git a/plugin.php b/plugin.php
@@ -19,7 +19,7 @@
 require __DIR__ . '/inc/connector/namespace.php';
 require __DIR__ . '/inc/upgrade/namespace.php';
 
-add_action( 'plugins_loaded', __NAMESPACE__ . '\\bootstrap' );
+bootstrap();
 
 // Register cache groups as early as possible, as some plugins may use cron functions before plugins_loaded
 if ( function_exists( 'wp_cache_add_global_groups' ) ) {

diff --git a/tests/bootstrap.php b/tests/bootstrap.php
@@ -2,6 +2,8 @@
 /**
  * Bootstrap the plugin unit testing environment.
  *
+ * phpcs:disable PSR1.Files.SideEffects
+ *
  * @package WordPress
 */
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,6 +2,8 @@ @@
     /**
      * Bootstrap the plugin unit testing environment.
      *
+     * phpcs:disable PSR1.Files.SideEffects
+     *
      * @package WordPress
     */
@@ Expand Down @@