Phan: Fix errant extra params in function calls (#41263)

* Remove extra param on remove_filter/remove_action

There's no arg count when removing.

* Remove extra param from rest_ensure_response

That function doesn't allow a status code to be passed. Presumably we could override the WP_REST_Response status and force 200, but passing it through has worked so far, so keeping it that way.

* Remove other stray args

In most cases, these appear to be due to refactors.

* Another stray arg

* Suppress things that confuse Phan

* Fix get_avatar_url calls

* arrayHasKey → assertArrayHasKey

* Fix misplaced parentheses

* Tighten types

We're using `WP_Option`, which allows an extra param in its `get()`.

* Add missing sprintf

* Add unused param to allow dynamic method call

* Add changelogs

* Use same behaviour as trunk

* Fix assertion

* Add param to Storage::get and use that type as before

* Inform Phan of type rather than suppressing error

* Update errant types

* Update Phan baselines

* More changelogs

Committed via a GitHub action: https://github.com/Automattic/jetpack/actions/runs/13079055733

Upstream-Ref: Automattic/jetpack@4b2a4a9

Author: tbradsha

CHANGELOG.md

@@ -14,6 +14,7 @@ This is an alpha version! The changes listed here are not final.
 - Updated package dependencies.
 
 ### Fixed
+- Code: Remove extra params on function calls.
 - Small fix to welcome wizard
 
 ## [6.5.1] - 2025-01-22

admin/settings/companies.page.php

@@ -75,7 +75,7 @@
 <?php
 if ( isset( $sbupdated ) ) {
 	if ( $sbupdated ) {
-		echo zeroBSCRM_UI2_messageHTML( 'success', __( 'Settings Updated', 'zero-bs-crm', '' ) );
+		echo zeroBSCRM_UI2_messageHTML( 'success', __( 'Settings Updated', 'zero-bs-crm' ) ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
 	}
 }
 ?>

includes/ZeroBSCRM.AJAX.php

@@ -1108,7 +1108,7 @@ function ZeroBSCRM_accept_quote() {
 		) {
 			zeroBSCRM_sendJSONError( array( 'access' => 1 ), 403 );
 		}
-	} elseif ( ! zeroBSCRM_quotes_getFromHash( $quoteHash, -1 )['success'] ) {
+	} elseif ( ! zeroBSCRM_quotes_getFromHash( $quoteHash )['success'] ) { // phpcs:ignore WordPress.NamingConventions.ValidVariableName.VariableNotSnakeCase
 		zeroBSCRM_sendJSONError( array( 'hash' => 1 ), 403 );
 	}
 
@@ -4013,7 +4013,7 @@ function zeroBSCRM_AJAX_enactListViewBulkAction() {
 								foreach ( $legitIDs as $id ) {
 
 									// } Update quote as unaccepted (should verify this worked...)
-									zeroBS_markQuoteUnAccepted( $id, zeroBS_getCurrentUserUsername() );
+									zeroBS_markQuoteUnAccepted( $id );
 
 									++$unaccepted;
 

includes/ZeroBSCRM.DAL3.Obj.Contacts.php

@@ -3571,11 +3571,11 @@ public function deleteContact($args=array()){
 										)
 									);
 
-                } unset($trans);
+					} unset( $trans );
 
-                // delete events
-                $events = zeroBS_getEventsByCustomerID($id,false,1000000,0,false);
-                foreach ($events as $event){
+					// delete events
+					$events = zeroBS_getEventsByCustomerID( $id, false, 1000000, 0 );
+					foreach ( $events as $event ) {
 
 									// delete post
 									$zbs->DAL->events->deleteEvent( // phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase

includes/ZeroBSCRM.GeneralFuncs.php

@@ -604,19 +604,13 @@ function zeroBSCRM_expandArchive($filepath,$expandTo){
 
 					if (file_exists($filepath) && file_exists($expandTo)){
 
-							$archive = new PclZip($filepath);
-
-							if ($archive->extract(PCLZIP_OPT_PATH, $expandTo) == 0) {
-							    
-							    return false;
-
-							} else {
-							    
-							    return true;
-
-							}
-
-
+					$archive = new PclZip( $filepath );
+					// @phan-suppress-next-line PhanParamTooMany -- PclZip functions use func_get_args.
+					if ( $archive->extract( PCLZIP_OPT_PATH, $expandTo ) === 0 ) { // phpcs:ignore WordPress.NamingConventions.ValidVariableName.VariableNotSnakeCase
+						return false;
+					} else {
+						return true;
+					}
 					}
 
 				} catch (Exception $ex){
@@ -1707,7 +1701,7 @@ function jpcrm_get_mimetype( $file_path ) {
 		$credentials = request_filesystem_credentials( site_url() );
 		wp_filesystem( $credentials );
 	}
-	$lines = $wp_filesystem->get_contents_array( $file_path, 8 );
+	$lines = $wp_filesystem->get_contents_array( $file_path );
 	if ( $lines === false ) {
 		return 'application/octet-stream';
 	}

includes/ZeroBSCRM.MetaBoxes3.Tasks.php

@@ -533,7 +533,7 @@ function zeroBSCRM_task_addEdit( $taskID = -1 ) {
 
 	$html .= zeroBSCRM_task_ui_clear();
 
-	$html .= zeroBSCRM_task_ui_for( $taskObject, $taskID );
+	$html .= zeroBSCRM_task_ui_for( $taskObject ); // phpcs:ignore WordPress.NamingConventions.ValidVariableName.VariableNotSnakeCase
 
 	$html .= zeroBSCRM_task_ui_clear();
 

modules/woo-sync/includes/class-woo-sync.php

@@ -2226,7 +2226,7 @@ private function migrate_52(){
 				$new_sync_site = $this->add_sync_site( $data );
 
 			    // verify
-			    if ( is_array( $new_sync_site ) && !empty( $new_sync_site['site_key'] ) && $this->get_active_sync_site( $new_sync_site['site_key'], true ) ){
+			    if ( is_array( $new_sync_site ) && !empty( $new_sync_site['site_key'] ) && $this->get_active_sync_site( $new_sync_site['site_key'] ) ){
 
 			    	// backup and remove old settings
 			    	update_option( 'jpcrm_woosync_52_mig_backup', $settings, false );