fix: small tweaks to the dropin

carlalexander · carlalexander · commit 3b88ced91e02 · 2021-09-27T10:24:43.000-04:00
diff --git a/stubs/activate-ymir-plugin.php b/stubs/activate-ymir-plugin.php
@@ -4,7 +4,7 @@ function activate_ymir_plugin() {
     if (defined('WP_INSTALLING') && WP_INSTALLING) {
         return;
     } elseif (!function_exists('get_plugins')) {
-        require_once ABSPATH . 'wp-admin/includes/plugin.php';
+        require_once ABSPATH.'wp-admin/includes/plugin.php';
     }
 
     // Important to not activate the plugin if it's already active. It's fine for normal sites, but
@@ -25,8 +25,12 @@ function activate_ymir_plugin() {
 /**
  * Ensures that the plugin is always the first one to be loaded per site.
  */
-function ensure_ymir_plugin_loaded_first(array $active_plugins): array
+function ensure_ymir_plugin_loaded_first($active_plugins)
 {
+    if (!is_array($active_plugins)) {
+        return $active_plugins;
+    }
+
     foreach ($active_plugins as $key => $basename) {
         if (1 === preg_match('/ymir\.php$/', $basename)) {
             array_splice($active_plugins, $key, 1);
@@ -36,13 +40,17 @@ function ensure_ymir_plugin_loaded_first(array $active_plugins): array
 
     return $active_plugins;
 }
-add_filter('pre_update_option_active_plugins', 'ensure_ymir_plugin_loaded_first', 9999);
+add_filter('pre_update_option_active_plugins', 'ensure_ymir_plugin_loaded_first', PHP_INT_MAX);
 
 /**
  * Ensures that the plugin is always the first one to be loaded for the network.
  */
-function ensure_ymir_plugin_loaded_first_on_network(array $active_plugins): array
+function ensure_ymir_plugin_loaded_first_on_network($active_plugins)
 {
+    if (!is_array($active_plugins)) {
+        return $active_plugins;
+    }
+
     $active_plugins = array_keys($active_plugins);
 
     foreach ($active_plugins as $index => $plugin) {
@@ -54,4 +62,4 @@ function ensure_ymir_plugin_loaded_first_on_network(array $active_plugins): arra
 
     return array_fill_keys($active_plugins, time());
 }
-add_filter('pre_update_site_option_active_sitewide_plugins', 'ensure_ymir_plugin_loaded_first_on_network', 9999);
+add_filter('pre_update_site_option_active_sitewide_plugins', 'ensure_ymir_plugin_loaded_first_on_network', PHP_INT_MAX);
