Merge pull request #144 from mairo744/feature/remove-open-swoole

feat!: drop Open Swoole support and require Swoole extension only

Author: Xerkus

README.md

@@ -20,7 +20,7 @@
 >
 > You trust us enough to use our software. We ask that you trust us to say the truth on this. We need your help. Go out and protest this unnecessary war. Stop the bloodshed. Say "stop the war!"
 
-This library provides support for [Swoole](https://github.com/swoole/swoole-src) or [Open Swoole](https://www.swoole.co.uk/) for [Mezzio](https://docs.mezzio.dev/) applications.
+This library provides the support of [Swoole](https://github.com/swoole/swoole-src) into an [Mezzio](https://docs.mezzio.dev/) application.
 This means you can execute your Mezzio application using Swoole directly from the command line.
 
 ## Installation

composer.json

@@ -6,7 +6,6 @@
         "laminas",
         "mezzio",
         "components",
-        "openswoole",
         "swoole",
         "psr-7",
         "psr-14",
@@ -36,6 +35,9 @@
     },
     "require": {
         "php": "~8.2.0 || ~8.3.0 || ~8.4.0",
+        "ext-intl": "*",
+        "ext-swoole": "^6.0",
+        "ext-zlib": "*",
         "dflydev/fig-cookies": "^2.0.1 || ^3.0",
         "laminas/laminas-cli": "^1.8",
         "laminas/laminas-diactoros": "^2.25.2 || ^3.0",
@@ -60,9 +62,7 @@
         "vimeo/psalm": "^5.19"
     },
     "suggest": {
-        "ext-inotify": "To use inotify based file watcher. Required for hot code reloading.",
-        "ext-openswoole": "The package requires at least one of Open Swoole or Swoole",
-        "ext-swoole": "The package requires at least one of Open Swoole or Swoole"
+        "ext-inotify": "To use inotify based file watcher. Required for hot code reloading."
     },
     "autoload": {
         "psr-4": {

composer.lock

@@ -1,21 +1,17 @@
 # Swoole
 
-[Open Swoole](https://www.swoole.co.uk/) is a PECL extension for developing asynchronous applications in PHP.
+[Swoole](https://wiki.swoole.com/) is a PECL extension for developing asynchronous applications in PHP.
 It enables PHP developers to write high-performance, scalable, concurrent TCP, UDP, Unix socket, HTTP, or Websocket services without requiring in-depth knowledge about non-blocking I/O programming or the low-level Linux kernel.
 
 ## Install swoole
 
-You can install the Open Swoole extension on Linux or Mac environments using the following commands:
+You can install the Swoole extension on Linux or Mac environments using the following commands:
 
 ```bash
-$ pecl install openswoole
+$ pecl install swoole
 ```
 
-For more information on the extension, [visit its package details on PECL](https://pecl.php.net/package/openswoole).
-
-> ### Legacy Swoole compatibility
->
-> Since version 3.4.0, mezzio-swoole can work with either the original [Swoole](https://github.com/swoole/swoole-src) extension or the new community Open Swoole extension, as each defines the same classes, interfaces, and constants consumed by mezzio-swoole.
+For more information on the extension, [visit its package details on PECL](https://pecl.php.net/package/swoole).
 
 ## Install mezzio-swoole
 
@@ -27,7 +23,7 @@ $ composer require mezzio/mezzio-swoole
 
 ## Swoole with Mezzio
 
-mezzio-swoole enables an Mezzio application to be executed with the [Open Swoole](https://www.swoole.co.uk/) or original [Swoole](https://github.com/swoole/swoole-src) extensions.
+mezzio-swoole enables an Mezzio application to be executed with the [Swoole](https://github.com/swoole/swoole-src) extension.
 This means you can run the application from the command line, **without requiring a web server**.
 
 You can run the application using the following command:

docs/book/v4/intro.md

@@ -2,7 +2,7 @@
 <phpunit
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
-    bootstrap="test/bootstrap.php"
+    bootstrap="vendor/autoload.php"
     cacheDirectory=".phpunit.cache"
     displayDetailsOnIncompleteTests="true"
     displayDetailsOnSkippedTests="true"

phpunit.xml.dist

@@ -37,7 +37,6 @@
 use Mezzio\Swoole\Event\WorkerStartEvent;
 use Mezzio\Swoole\Event\WorkerStartListener;
 use Mezzio\Swoole\Event\WorkerStartListenerFactory;
-use Mezzio\Swoole\Exception\ExtensionNotLoadedException;
 use Mezzio\Swoole\HotCodeReload\FileWatcher\InotifyFileWatcher;
 use Mezzio\Swoole\HotCodeReload\FileWatcherInterface;
 use Mezzio\Swoole\Log\AccessLogFactory;
@@ -53,7 +52,6 @@
 use Psr\Http\Message\ServerRequestInterface;
 use Swoole\Http\Server as SwooleHttpServer;
 
-use function extension_loaded;
 use function getcwd;
 
 use const PHP_SAPI;
@@ -69,14 +67,6 @@ class ConfigProvider
 {
     public function __invoke(): array
     {
-        if (! extension_loaded('swoole') && ! extension_loaded('openswoole')) {
-            throw new ExtensionNotLoadedException(
-                'One of either the Swoole (https://github.com/swoole/swoole-src) or'
-                . ' Open Swoole (https://www.swoole.co.uk) extensions must be loaded'
-                . ' to use mezzio/mezzio-swoole'
-            );
-        }
-
         $config = PHP_SAPI === 'cli'
             ? ['dependencies' => $this->getDependencies()]
             : [];

src/ConfigProvider.php

@@ -14,7 +14,6 @@
 use Psr\Http\Message\ResponseInterface;
 use Swoole\Http\Response as SwooleHttpResponse;
 
-use function extension_loaded;
 use function implode;
 use function substr;
 
@@ -40,10 +39,6 @@ public function __construct(private SwooleHttpResponse $swooleResponse)
      */
     public function emit(ResponseInterface $response): bool
     {
-        if (! extension_loaded('swoole') && ! extension_loaded('openswoole')) {
-            return false;
-        }
-
         if (PHP_SAPI !== 'cli') {
             return false;
         }

src/SwooleEmitter.php

@@ -15,7 +15,6 @@
 use RuntimeException;
 use Swoole\Http\Request as SwooleHttpRequest;
 
-use function extension_loaded;
 use function strlen;
 use function substr;
 
@@ -36,10 +35,6 @@ class SwooleStreamTest extends TestCase
 
     protected function setUp(): void
     {
-        if (! extension_loaded('swoole')) {
-            $this->markTestSkipped('The Swoole extension is not available');
-        }
-
         $this->request = $this->createMock(SwooleHttpRequest::class);
         $this->request
             ->method('rawContent')