Refector openswoole (#7937)

TechEmpower · Mar 14, 2023 · 34b05d2 · 34b05d2
1 parent 05ae980
commit 34b05d2
Show file tree

Hide file tree

Showing 10 changed files with 501 additions and 488 deletions.
diff --git a/frameworks/PHP/openswoole/README.md b/frameworks/PHP/openswoole/README.md
@@ -1,102 +1,90 @@
-<h1>
-    <img width="200" height="120" align="center" alt="Open Swoole Logo" src="https://www.swoole.co.uk/images/swoole-logo.svg" />
-</h1>
+<p align="center"><a href="https://openswoole.com" target="_blank"><img src="https://openswoole.com/images/swoole-logo.svg#gh-light-mode-only" width="200" /></a></p>
 
-[![lib-openswoole](https://github.com/openswoole/swoole-src/workflows/lib-openswoole/badge.svg)](https://github.com/openswoole/swoole-src/actions?query=workflow%3Alib-openswoole)
-[![ext-openswoole](https://github.com/openswoole/swoole-src/workflows/ext-openswoole/badge.svg)](https://github.com/openswoole/swoole-src/actions?query=workflow%3Aext-openswoole)
-[![test-linux](https://github.com/openswoole/swoole-src/workflows/test-linux/badge.svg)](https://github.com/openswoole/swoole-src/actions?query=workflow%3Atest-linux)
-[![Coverity Scan Build Status](https://scan.coverity.com/projects/23970/badge.svg)](https://scan.coverity.com/projects/open-swoole-src)
-[![codecov](https://codecov.io/gh/openswoole/swoole-src/branch/master/graph/badge.svg)](https://codecov.io/gh/openswoole/swoole-src)
 
-**Open Swoole (since 2017) is a programmatic server for PHP with async IO, coroutines and fibers: secure, reliable, high performance**
+<p align="center"><a href="https://github.com/openswoole/ext-openswoole/actions?query=workflow%3Alib-openswoole"><img src="https://github.com/openswoole/ext-openswoole/workflows/lib-openswoole/badge.svg" alt="lib-openswoole" style="max-width: 100%;"></a>
+<a href="https://github.com/openswoole/ext-openswoole/actions?query=workflow%3Aext-openswoole"><img src="https://github.com/openswoole/ext-openswoole/workflows/ext-openswoole/badge.svg" alt="ext-openswoole" style="max-width: 100%;"></a>
+<a href="https://github.com/openswoole/ext-openswoole/actions?query=workflow%3Atest-linux"><img src="https://github.com/openswoole/ext-openswoole/workflows/test-linux/badge.svg" alt="test-linux" style="max-width: 100%;"></a>
+<a href="https://scan.coverity.com/projects/open-swoole-src" rel="nofollow"><img src="https://camo.githubusercontent.com/74ce2aa24f7fc272064e7afeec3712e0e548cda19202c4af7e42e7cacf2e7f6f/68747470733a2f2f7363616e2e636f7665726974792e636f6d2f70726f6a656374732f32333937302f62616467652e737667" alt="Coverity Scan Build Status" data-canonical-src="https://scan.coverity.com/projects/23970/badge.svg" style="max-width: 100%;"></a></p>
 
-## Documentation & Community
+## Open Swoole
 
-+ __Documentation__: <https://www.swoole.co.uk/docs>
+Open Swoole is a programmatic server for PHP with async IO, coroutines and fibers: secure, reliable, high performance
+
++ __Website__: <https://openswoole.com>
 + __Twitter__: <https://twitter.com/openswoole>
-+ __Join Slack Group__: <https://goo.gl/forms/wooTTDmhbu30x4qC3>
-+ __Join Discord Channel__: <https://discord.gg/5QC57RNPpw>
-+ __IDE Helper & API__: <https://github.com/openswoole/ide-helper>
++ __Slack__: <https://goo.gl/forms/wooTTDmhbu30x4qC3>
++ __Discord__: <https://discord.gg/5QC57RNPpw>
++ __IDE Helper__: <https://github.com/openswoole/ide-helper>
 
-## Installation
+## Documentation
 
-> As with any open source project, Open Swoole always provides the most reliable stability and the most powerful features in **the latest released version**. Please ensure as much as possible that you are using the latest version.
+Documentation for Open Swoole can be found on the [Open Swoole website](https://openswoole.com/docs).
 
-### Compiling requirements
+## Installation
 
-+ Linux, OS X or Cygwin, WSL
-+ PHP 7.2.0 or later (The higher the version, the better the performance.)
-+ GCC 4.8 or later
+> Open Swoole always provides the most reliable stability and the most powerful features in **the latest released version**. Please ensure as much as possible that you are using the latest version.
 
-### 1. Install with PECL (beginners)
+### 1. Install or upgrade Open Swoole from multiple distribution channels
 
-```shell
-pecl install openswoole
-```
+Please check [Open Swoole Installation Guide](https://openswoole.com/docs/get-started/installation) about how to install Open Swoole on Ubuntu/CentOS/Windows WSL from Docker, PECL or Binary releases channels.
 
-### 2. Install from source (recommended)
+### 2. Compile from source
 
-Please download the source packages from [Releases](https://github.com/openswoole/swoole-src/releases) or:
+#### Compiling requirements
 
-```shell
-git clone https://github.com/openswoole/swoole-src.git && \
-cd swoole-src
-git checkout v4.8.0
-```
++ Linux, OS X or Cygwin, WSL
++ PHP 7.4.0 or later (The higher the version, the better the performance.)
++ GCC 4.8 or later
 
-Compile and install at the source folder:
+Download the source packages from [Releases](https://github.com/openswoole/ext-openswoole/releases) or:
 
 ```shell
+git clone https://github.com/openswoole/ext-openswoole.git && \
+cd ext-openswoole
+git checkout v22.0.0
 phpize && \
 ./configure && \
 make && make install
 ```
 
-#### Enable extension in PHP
-
-After compiling and installing the openswoole extension, you have to add a new line `extension=openswoole.so` to `php.ini` to enable Open Swoole. It is recommended to be added after all the other extensions because openswoole may depend on extensions: sockets, mysqlnd, curl etc.
+You can find how to fix [Common Installation Errors](https://openswoole.com/docs/get-started/common-install-errors) if there are errors in the installation.
 
-#### Extra compile configurations
+#### Compile configurations
 
 > for example: `./configure --enable-openssl --enable-sockets`
 
 + `--enable-openssl` or `--with-openssl-dir=DIR`
 + `--enable-sockets`
 + `--enable-http2`
 + `--enable-mysqlnd` (need mysqlnd, it just for supporting `$mysql->escape` method)
-+ `--enable-swoole-json`
-+ `--enable-swoole-curl`
++ `--enable-hook-curl`
 + `--with-postgres[=DIR]`
 
-### Upgrade
+#### Enable Open Swoole extension
 
->  If you upgrade from source, don't forget to `make clean` before you upgrade your swoole
+After compiling and installing the openswoole extension, you have to add a new line `extension=openswoole.so` at the end of `php.ini` or create a ini file at `conf.d` folder to enable Open Swoole. It is recommended to be added after all the other extensions because openswoole may depend on extensions: sockets, mysqlnd, curl etc.
 
-1. `pecl upgrade openswoole`
-2. `cd swoole-src && git pull && make clean && make && sudo make install`
-3. if you have changed PHP version, please re-run `phpize clean && phpize` then try to compile
+## Frameworks & Components
 
-## Call for Contributors
+> PR are welcome if your framework is using openswoole
+ 
+ - [**Laravel Octane**](https://laravel.com/docs/9.x/octane) Laravel Octane supercharges your application's performance by serving your application using high-powered application servers.
+ - [**PHP Runtime**](https://github.com/php-runtime) make it easy to run any kind of PHP Application (Symfony, Laravel, PSR7, Native) with all kinds of Runtimes like OpenSwoole, Bref, Google Cloud Functions, Roadrunner and React PHP with minimal configuration.
+ - [**Mezzio Swoole**](https://docs.mezzio.dev/mezzio-swoole/) allows you to run Mezzio and [PSR-15](https://www.php-fig.org/psr/psr-15/) applications on Open Swoole.
+
+## For Contributors
 
 If you like to involve the maintenance of this repo, it is better to get started by submitting PR, you will be invited to the dev group once there are significant contributions. Or join Slack group firstly, the team will provide mentoring and internal support to help you get started.
 
-* [Report issues and feedback](https://github.com/openswoole/swoole-src/issues)
+* [Report issues and feedback](https://github.com/openswoole/ext-openswoole/issues)
 * Submit fixes, features via Pull Request
 
-This project exists thanks to all the historical [[Contributors](https://github.com/openswoole/swoole-src/graphs/contributors)].
+This project exists thanks to all the historical [[Contributors](https://github.com/openswoole/ext-openswoole/graphs/contributors)].
 
 ## Security issues
 
-Security issues should be reported privately, via email, to the Open Swoole develop team [[email protected]](mailto:[email protected]). You should receive a response within 24 hours. If for some reason you do not, please follow up via email to ensure we received your original message.
-
-## Frameworks & Components
-
-> PR are welcome if your framework is using openswoole
- 
- - [**Laravel Octane**](https://laravel.com/docs/8.x/octane) Laravel Octane supercharges your application's performance by serving your application using high-powered application servers.
- - [**PHP Runtime**](https://github.com/php-runtime) make it easy to run any kind of PHP Application (Symfony, Laravel, PSR7, Native) with all kinds of Runtimes like OpenSwoole, Bref, Google Cloud Functions, Roadrunner and React PHP with minimal configuration.
- - [**Mezzio Swoole**](https://docs.mezzio.dev/mezzio-swoole/) allows you to run Mezzio and [PSR-15](https://www.php-fig.org/psr/psr-15/) applications on Open Swoole.
+Security issues should be reported privately, via email, to the Open Swoole develop team [[email protected]](mailto:[email protected]). You should receive a response within 24 hours. If for some reason you do not, please follow up via email to ensure we received your original message.
 
 ## License
 
-Apache License Version 2.0 see http://www.apache.org/licenses/LICENSE-2.0.html
+Open Swoole is open-sourced software licensed under the [Apache 2.0 license](http://www.apache.org/licenses/LICENSE-2.0.html).
diff --git a/frameworks/PHP/openswoole/benchmark_config.json b/frameworks/PHP/openswoole/benchmark_config.json
@@ -14,34 +14,13 @@
       "database": "MySQL",
       "framework": "openswoole",
       "language": "PHP",
-      "flavor": "PHP8.1",
+      "flavor": "PHP8.2",
       "orm": "Raw",
       "platform": "openswoole",
       "webserver": "none",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "Open Swoole",
-      "notes": "",
-      "versus": "php"
-    },
-    "postgres": {
-      "db_url": "/db",
-      "query_url": "/db?queries=",
-      "fortune_url": "/fortunes",
-      "update_url": "/updates?queries=",
-      "port": 8080,
-      "approach": "Realistic",
-      "classification": "Platform",
-      "database": "Postgres",
-      "framework": "openswoole",
-      "language": "PHP",
-      "flavor": "PHP8",
-      "orm": "Raw",
-      "platform": "openswoole",
-      "webserver": "none",
-      "os": "Linux",
-      "database_os": "Linux",
-      "display_name": "Open Swoole Postgres",
+      "display_name": "openswoole",
       "notes": "",
       "versus": "php"
     },
@@ -56,13 +35,13 @@
       "database": "MySQL",
       "framework": "openswoole",
       "language": "PHP",
-      "flavor": "PHP8.1",
+      "flavor": "PHP8.2",
       "orm": "Raw",
       "platform": "openswoole",
       "webserver": "none",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "Open Swoole no-async",
+      "display_name": "openswoole no-async",
       "notes": "Without async db pool connection",
       "versus": "php"
     }

diff --git a/frameworks/PHP/openswoole/composer.json b/frameworks/PHP/openswoole/composer.json
@@ -0,0 +1,5 @@
+{
+	"require": {
+		"openswoole/core": "dev-master"
+	}
+}
diff --git a/frameworks/PHP/openswoole/openswoole-no-async.dockerfile b/frameworks/PHP/openswoole/openswoole-no-async.dockerfile
@@ -1,15 +1,21 @@
-FROM php:8.1-cli
+FROM php:8.2-cli
+
+RUN apt-get update && apt-get install -y git > /dev/null
+
+RUN docker-php-ext-install opcache pdo_mysql > /dev/null
 
 RUN pecl install openswoole > /dev/null && \
     docker-php-ext-enable openswoole
 
-RUN docker-php-ext-install opcache pdo_mysql > /dev/null
+COPY --from=composer:latest /usr/bin/composer /usr/local/bin/composer
+
+COPY php.ini /usr/local/etc/php/
 
 ADD ./ /openswoole
 WORKDIR /openswoole
 
-COPY php.ini /usr/local/etc/php/
+RUN composer install --optimize-autoloader --classmap-authoritative --no-dev --quiet
 
 EXPOSE 8080
 
-CMD php swoole-server-noasync.php
+CMD php /openswoole/openswoole-server-pdo.php
diff --git a/frameworks/PHP/openswoole/openswoole-postgres.dockerfile b/frameworks/PHP/openswoole/openswoole-postgres.dockerfile
@@ -1,22 +1,26 @@
-FROM php:8.1-cli
+FROM php:8.2-cli
+
+RUN apt-get update && apt-get install -y git > /dev/null
 
 RUN docker-php-ext-install opcache  > /dev/null
 
-ENV SWOOLE_VERSION 4.8.0
+ENV VERSION 22.0.0
 
 RUN     apt-get update && apt-get install -y libpq-dev \
-        && cd /tmp && curl -sSL "https://github.com/openswoole/swoole-src/archive/v${SWOOLE_VERSION}.tar.gz" | tar xzf - \
-        && cd swoole-src-${SWOOLE_VERSION} \
+        && cd /tmp && curl -sSL "https://github.com/openswoole/ext-openswoole/archive/v${VERSION}.tar.gz" | tar xzf - \
+        && cd ext-openswoole-${VERSION} \
         && phpize && ./configure --with-postgres > /dev/null && make > /dev/null && make install > /dev/null \
         && docker-php-ext-enable openswoole
 
-WORKDIR /openswoole
-
-COPY swoole-server.php swoole-server.php
-RUN sed -i "s|_postgres||g" swoole-server.php
+COPY --from=composer:latest /usr/bin/composer /usr/local/bin/composer
 
 COPY php.ini /usr/local/etc/php/
 
+ADD ./ /openswoole
+WORKDIR /openswoole
+
+RUN composer install --optimize-autoloader --classmap-authoritative --no-dev --quiet
+
 EXPOSE 8080
 
-CMD php swoole-server.php
+CMD php /openswoole/openswoole-server-postgres.php