Merge pull request #788 from lucatume/fix-issue-785

fix issue 785, pluggables

Author: lucatume

src/Module/WPLoader.php

@@ -1240,7 +1240,10 @@ private function isWordPressInstalled(): bool
      */
     private function includeAllPlugins(array $plugins, bool $isMultisite): void
     {
-        PreloadFilters::addFilter('plugins_loaded', function () use ($plugins, $isMultisite) {
+        $filter = function ($optionValue) use (&$filter, $plugins, $isMultisite) {
+            // Immediately remove this function from the filter to avoid infinite loops.
+            remove_filter('pre_option_active_plugins', $filter, PHP_INT_MIN);
+
             $activePlugins = $isMultisite ? get_site_option('active_sitewide_plugins') : get_option('active_plugins');
 
             if (!is_array($activePlugins)) {
@@ -1274,14 +1277,19 @@ private function includeAllPlugins(array $plugins, bool $isMultisite): void
                 }
             }
 
-
             // Update the active plugins to include all plugins, external or not.
             if ($isMultisite) {
                 update_site_option('active_sitewide_plugins', $activePlugins);
             } else {
                 update_option('active_plugins', array_values(array_unique($activePlugins)));
             }
-        }, -100000);
+
+            // Return the value unchanged.
+            return array_values(array_unique($activePlugins));
+        };
+
+        // Use the filter as an action to install (in a different process) and then activate the plugins.
+        PreloadFilters::addFilter('pre_option_active_plugins', $filter, PHP_INT_MIN);
     }
 
     /**

tests/_data/plugins/mu-plugin-1/plugin.php

@@ -21,3 +21,12 @@ public static function activate(): void
     }
 }
 register_activation_hook(__FILE__, [MUPlugin1::class, 'activate']);
+
+// Override the get_avatar pluggable function to verify the pluggable override works.
+if (!function_exists('get_avatar')) {
+    function get_avatar($id_or_email, $size = 96, $default_value = '', $alt = '', $args = null)
+    {
+        return "<img class='avatar' height=23 width=89 src='https://example.com/avatar.jpg'>";
+    }
+}
+

tests/wploadersuite/PluggablesTest.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace wploadersuite;
+
+use lucatume\WPBrowser\TestCase\WPTestCase;
+
+class PluggablesTest extends WPTestCase
+{
+    public function test_pluggable_function_is_loaded_from_plugin():void{
+        $this->assertEquals(
+        "<img class='avatar' height=23 width=89 src='https://example.com/avatar.jpg'>",
+            get_avatar('[email protected]')
+        );
+    }
+}