Changeset 11256 for trunk/tests/phpunit/testcases/core/class-bp-attachment.php

Timestamp:

11/28/2016 10:33:55 PM (8 years ago)

Author:

djpaul

Message:

Fix incorrect remove_action and remove_filter usage for WordPress 4.7.

remove_action and remove_filter formally accepted a fourth parameter until WP 4.7; it's only with the introduction of the WP_Hook class that the function signature changed. Prior to WP 4.7, the fourth parameter was unused, so it does no harm to remove it and tidy things up.

Fixes #7318

Props ketuchetan

File:

• trunk/tests/phpunit/testcases/core/class-bp-attachment.php (modified) (2 diffs)

trunk/tests/phpunit/testcases/core/class-bp-attachment.php

@@ -23 +23 @@
     public function tearDown() {
         parent::tearDown();
-        remove_filter( 'bp_attachment_upload_overrides',     array( $this, 'filter_overrides' ),       10, 1 );
-        remove_filter( 'upload_dir',                         array( $this, 'filter_upload_dir' ),      20, 1 );
+        remove_filter( 'bp_attachment_upload_overrides',     array( $this, 'filter_overrides' ),       10 );
+        remove_filter( 'upload_dir',                         array( $this, 'filter_upload_dir' ),      20 );
         add_filter( 'bp_attachments_cover_image_upload_dir', array( $this, 'filter_cover_image_dir' ), 10, 2 );
         $this->upload_results = array();
@@ -490 +490 @@
 
         // Remove the filter used to fake uploads
-        remove_filter( 'upload_dir', array( $this, 'filter_upload_dir' ), 20, 1 );
+        remove_filter( 'upload_dir', array( $this, 'filter_upload_dir' ), 20 );
 
         $this->assertSame( $attachment_class->original_upload_dir, wp_upload_dir() );