merge code

swoole · Dec 2, 2024 · 1cf769d · 1cf769d
2 parents 8a1446c + d902eca
commit 1cf769d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/docs/extensions.md b/docs/extensions.md
@@ -42,13 +42,13 @@
 | gd             | ✅     | ✅     | ✅               | ✅               |
 | opcache        | ✅     | ✅     | ✅               | ✅               |
 | swoole         | ✅     | ✅     | ✅               | ✅               |
-| mongodb        | ✅     | ❌     | ❌               | ✅               |
-| ssh2           | ✅     | ✅     | ❌               | ❌               |
-| apcu           | ✅     | ✅     | ❌               | ❌               |
-| ds             | ✅     | ✅     | ✅               | ❌               |
+| mongodb        | ✅     | ✅     | ❌               | ✅               |
+| ssh2           | ✅     | ✅     | ❌               | ✅               |
+| apcu           | ✅     | ✅     | ❌               | ✅               |
+| ds             | ✅     | ✅     | ✅               | ✅               |
 | inotify        | ✅     | ❌     | ❌               | ❌               |
 | protobuf       | ❌     | ❌     | ❌               | ❌               |
-| uuid           | ✅     | ✅     | ❌               | ❌               |
+| uuid           | ✅     | ✅     | ❌               | ✅               |
 | mailparse      | ✅     | ✅     | ❌               | ❌               |
 | gettext        | ✅     | ❌     | ❌               | ❌               |
 | xslwriter      | ✅     | ✅     | ❌               | ✅               |

diff --git a/sapi/src/builder/enabled_extensions.php b/sapi/src/builder/enabled_extensions.php
@@ -40,9 +40,13 @@
     //'gettext',
     'uuid',
     //'phpy'
+<<<<<<< HEAD
     'xslwriter',
     'apcu',
     'ds',
     'ssh2',
     'pgsql'
+=======
+    'xlswriter'
+>>>>>>> experiment-feature
 ];