Changeset 3358117

Timestamp:

09/08/2025 06:24:59 PM (5 months ago)

Author:

moon0326

Message:

Release v1.0.22

Location:

wp-openapi/trunk

Files:

• readme.txt (modified) (1 diff)
• src/SchemaGenerator.php (modified) (2 diffs)
• src/Spec/Operation.php (modified) (1 diff)
• src/Util.php (modified) (1 diff)
• vendor/composer/installed.php (modified) (2 diffs)
• wp-openapi.php (modified) (1 diff)

wp-openapi/trunk/readme.txt

@@ -5 +5 @@
 Tested up to: 6.7.2
 Requires PHP: 7.1
-Stable tag: 1.0.21
+Stable tag: 1.0.22
 License: GPLv3
 License URI: https://www.gnu.org/licenses/gpl-3.0.html

wp-openapi/trunk/src/SchemaGenerator.php

@@ -73 +73 @@
                     $schema = call_user_func( $options['schema'] );
                     if ( isset( $schema['title'] ) ) {
-                        $schemaTitle                                   = $schema['title'];
+                        $title = Util::normalizeSchemaTitle( $schema['title'] );
+                        $schemaTitle                                   = $title;
                         $base['components']['schemas'][ $schemaTitle ] = $schema;
                     }
@@ -152 +153 @@
         }
 
+        // Manually fix these endpoints from WooCommerce.
+        $fixList = [
+            'install_async_schema',
+            'install_and_activate_schema',
+            'count_low_in_stock_items'
+        ];
+
+        // Hate this fix, but we don't have control over other plugins.
+        foreach ($fixList as $schemaKey) {
+            if (isset($base['components']['schemas'][$schemaKey]) && isset($base['components']['schemas'][$schemaKey]['properties']['properties'])) {
+                $base['components']['schemas'][$schemaKey]['properties'] = $base['components']['schemas'][$schemaKey]['properties']['properties'];  
+                foreach ($base['components']['schemas'][$schemaKey]['properties'] as $key => $property) {
+                    if (is_string($property)) {
+                        $base['components']['schemas'][$schemaKey]['properties'][$key] = array('type' => Util::normalzieInvalidType($property));
+                    }
+                }
+            }
+        }
+
         return $base;
     }

wp-openapi/trunk/src/Spec/Operation.php

@@ -183 +183 @@
                     }
                 }
+
+                // Loop through again make sure it's not an empty array.
+                foreach ($properties as $key => $property) {
+                    if (is_array($property) && count($property) === 0) {
+                        $properties[$key] = new \stdClass();
+                    }
+                    foreach ($property as $propKey => $propValue) {
+                        if ($propKey === 'items' && is_string($propValue)) {
+                            $properties[$key]['items'] = array('type' => Util::normalzieInvalidType($propValue));
+                        }
+                    }
+                }
+
+
                 return $properties;
             });

wp-openapi/trunk/src/Util.php

@@ -70 +70 @@
         return $enum;
     }
+
+    public static function normalizeSchemaTitle( $title ) {
+        // Remove invalid characters for schema titles.
+        // Only allow alphanumeric characters and underscores.
+        $title = preg_replace( '/[^a-zA-Z0-9_]/', '_', $title );
+        // Ensure the title starts with an alphabetic character or underscore.
+        if ( ! preg_match( '/^[a-zA-Z_]/', $title ) ) {
+            $title = '_' . $title;
+        }
+
+
+        return strtolower( $title );
+    }
 }

wp-openapi/trunk/vendor/composer/installed.php

@@ -4 +4 @@
         'pretty_version' => 'dev-main',
         'version' => 'dev-main',
-        'reference' => 'a3c9ca1226d1e30a10ce9268ca8d91e72f855570',
+        'reference' => '08ebd2d7eca722986a50dc7da97d0277bb53b3ba',
         'type' => 'library',
         'install_path' => __DIR__ . '/../../',
@@ -14 +14 @@
             'pretty_version' => 'dev-main',
             'version' => 'dev-main',
-            'reference' => 'a3c9ca1226d1e30a10ce9268ca8d91e72f855570',
+            'reference' => '08ebd2d7eca722986a50dc7da97d0277bb53b3ba',
             'type' => 'library',
             'install_path' => __DIR__ . '/../../',

wp-openapi/trunk/wp-openapi.php

@@ -10 +10 @@
  * Plugin Name: WP OpenAPI
  * Plugin URI: https://github.com/moon0326/wp-openapi
- * Version:     1.0.21
+ * Version:     1.0.22
  * Author:      Moon K
  * Author URI: https://github.com/moon0326