Changeset 12792

Timestamp:

11/19/2020 12:48:25 PM (4 years ago)

Author:

imath

Message:

Groups: Avoid a PHP 8.0 deprecated notice about optional function arg.

The BP_Groups_Invitation_Manager->run_acceptance_action() method was wrongly using one optional arguments before a required one. As PHP 8.0 no longer accepts this practice, all arguments of the method will be required.

See #8392 (branch 6.0)

Location:

branches/6.0

Files:

• src/bp-core/classes/class-bp-invitation-manager.php (modified) (1 diff)
• src/bp-groups/classes/class-bp-groups-invitation-manager.php (modified) (1 diff)
• tests/phpunit/assets/invitations-extensions.php (modified) (1 diff)

branches/6.0/src/bp-core/classes/class-bp-invitation-manager.php

@@ -612 +612 @@
      * @return bool True on success, false on failure.
      */
-    abstract public function run_acceptance_action( $type = 'invite', $r  );
+    abstract public function run_acceptance_action( $type, $r  );
 
     /**

branches/6.0/src/bp-groups/classes/class-bp-groups-invitation-manager.php

@@ -68 +68 @@
      * @return bool True on success, false on failure.
      */
-    public function run_acceptance_action( $type = 'invite', $r  ) {
+    public function run_acceptance_action( $type, $r ) {
+        if ( ! $type || ! in_array( $type, array( 'request', 'invite' ), true ) ) {
+            return false;
+        }
+
         // If the user is already a member (because BP at one point allowed two invitations to
         // slip through), return early.

branches/6.0/tests/phpunit/assets/invitations-extensions.php

@@ -13 +13 @@
     }
 
-    public function run_acceptance_action( $type = 'invite', $r  ) {
+    public function run_acceptance_action( $type, $r  ) {
         return true;
     }