Fix PHPstan and get in line with new usage of add_option

Emilia-Capital · Sep 6, 2024 · 14fa0e6 · 14fa0e6
1 parent 9a420c1
commit 14fa0e6
Show file tree

Hide file tree

Showing 3 changed files with 77 additions and 46 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/phpstan.neon.dist b/phpstan.neon.dist
@@ -5,4 +5,5 @@ parameters:
   excludePaths:
     - vendor
     - tests
-  checkGenericClassInNonGenericObjectType: false
+  ignoreErrors:
+    - identifier: missingType.generics
diff --git a/src/class-rest.php b/src/class-rest.php
@@ -168,7 +168,7 @@ public function update_option_autoload( $request ) {
 		$option_name  = $request['option_name'];
 		$autoload     = $request['autoload'];
 		$option_value = get_option( $option_name );
-
+		
 		if ( ! in_array( $autoload, [ 'yes', 'on', 'no', 'off','auto', 'auto-on', 'auto-off' ], true ) ) {
 			return new \WP_Error( 'invalid_autoload_value', 'Invalid autoload value', [ 'status' => 400 ] );
 		}
@@ -178,7 +178,12 @@ public function update_option_autoload( $request ) {
 		}
 
 		delete_option( $option_name );
-		$succeeded = add_option( $option_name, $option_value, '', $autoload );
+		$autoload_values = \wp_autoload_values_to_autoload();
+		$bool_autoload   = false;
+		if ( in_array( $autoload, $autoload_values, true ) ) {
+			$bool_autoload = true;
+		}
+		$succeeded = add_option( $option_name, $option_value, '', $bool_autoload );
 
 		if ( ! $succeeded ) {
 			return new \WP_Error( 'update_failed', 'Updating the option failed', [ 'status' => 400 ] );
@@ -210,7 +215,7 @@ public function delete_option( $request ) {
 	 */
 	public function create_option_false( $request ) {
 		$option_name = $request['option_name'];
-		if ( add_option( $option_name, false, '', 'no' ) ) {
+		if ( add_option( $option_name, false, '', false ) ) {
 			return new \WP_REST_Response( [ 'success' => true ], 200 );
 		}
 		return new \WP_Error( 'option_not_created', 'Option could not be created', [ 'status' => 400 ] );