Changeset 11923 for trunk/tests/phpunit/includes/loader.php

Timestamp:

04/01/2018 11:30:48 PM (8 years ago)

Author:

r-a-y

Message:

Groups: Conditionally load action and screen functions.

This commit conditionally loads action and screen function code for the
Groups component, utilizing the 'bp_late_include' hook introduced in
r11884.

Previously, we loaded these functions at all times, which is unnecessary
when a user is not on a BuddyPress groups page. Now, we only load this code
when needed.

See #7218.

File:

• trunk/tests/phpunit/includes/loader.php (modified) (1 diff)

trunk/tests/phpunit/includes/loader.php

@@ -19 +19 @@
 
 /**
- * Load up activity action and screen code.
+ * Load up component action and screen code.
  *
  * In BuddyPress, this is loaded conditionally, but PHPUnit needs all files
  * loaded at the same time to prevent weird load order issues.
  */
-add_action( 'bp_activity_includes', function() {
-    $dirs = array(
-        buddypress()->plugin_dir . 'bp-activity/actions/',
-        buddypress()->plugin_dir . 'bp-activity/screens/',
-    );
+$components = array( 'activity', 'groups' );
+foreach ( $components as $component ) {
+    add_action( "bp_{$component}_includes", function() use ( $component ) {
+        $dirs = array(
+            buddypress()->plugin_dir . 'bp-' . $component . '/actions/',
+            buddypress()->plugin_dir . 'bp-' . $component . '/screens/',
+        );
 
-    foreach ( $dirs as $dir ) {
-        foreach ( glob( $dir . "*.php" ) as $file ) {
-            require $file;
+        foreach ( $dirs as $dir ) {
+            foreach ( glob( $dir . "*.php" ) as $file ) {
+                require $file;
+            }
         }
-    }
-} );
+    } );
+}