Fix incorrect method call and ignored return value

malmo-monei · malmo-monei · commit 898c83d6865b · 2025-07-01T14:45:39.000+02:00
diff --git a/src/Services/ApiKeyService.php b/src/Services/ApiKeyService.php
@@ -90,8 +90,7 @@ function ( $default_params ) {
                     if (empty($currentMode)) {
                         update_option('monei_apikey_mode', 'test'); // Default to test if both exist
                     }
-                    $this->cleanup_legacy_keys($default_params);
-                    return $default_params;
+                    return $this->cleanup_legacy_keys($default_params);
                 }
 
                 // Scenario 2 & 3: Partial new keys exist - try to complete them
@@ -146,15 +145,21 @@ function ( $default_params ) {
 
                 // Clean up legacy keys if we did any migration
                 if ($needsMigration) {
-                    $this->cleanup_legacy_keys($default_params);
+                    $default_params = $this->cleanup_legacy_keys($default_params);
                 }
 
                 return $default_params;
 			},
 			10
 		);
 	}
-    function cleanup_legacy_keys($settings_array) {
+    /**
+     * Clean up legacy API keys from both standalone options and settings array.
+    *
+    * @param array $settings_array The settings array to clean
+    * @return array The cleaned settings array
+    */
+    private function cleanup_legacy_keys($settings_array) {
         // Remove legacy standalone options
         delete_option('monei_apikey');
         delete_option('monei_accountid');

Original file line number	Diff line number	Diff line change
`@@ -90,8 +90,7 @@ function ( $default_params ) {`
`90`	`90`	`if (empty($currentMode)) {`
`91`	`91`	`update_option('monei_apikey_mode', 'test'); // Default to test if both exist`
`92`	`92`	`}`
`93`		`- $this->cleanup_legacy_keys($default_params);`
`94`		`- return $default_params;`
	`93`	`+ return $this->cleanup_legacy_keys($default_params);`
`95`	`94`	`}`
`96`	`95`
`97`	`96`	`// Scenario 2 & 3: Partial new keys exist - try to complete them`
`@@ -146,15 +145,21 @@ function ( $default_params ) {`
`146`	`145`
`147`	`146`	`// Clean up legacy keys if we did any migration`
`148`	`147`	`if ($needsMigration) {`
`149`		`- $this->cleanup_legacy_keys($default_params);`
	`148`	`+ $default_params = $this->cleanup_legacy_keys($default_params);`
`150`	`149`	`}`
`151`	`150`
`152`	`151`	`return $default_params;`
`153`	`152`	`},`
`154`	`153`	`10`
`155`	`154`	`);`
`156`	`155`	`}`
`157`		`- function cleanup_legacy_keys($settings_array) {`
	`156`	`+ /**`
	`157`	`+ * Clean up legacy API keys from both standalone options and settings array.`
	`158`	`+ *`
	`159`	`+ * @param array $settings_array The settings array to clean`
	`160`	`+ * @return array The cleaned settings array`
	`161`	`+ */`
	`162`	`+ private function cleanup_legacy_keys($settings_array) {`
`158`	`163`	`// Remove legacy standalone options`
`159`	`164`	`delete_option('monei_apikey');`
`160`	`165`	`delete_option('monei_accountid');`