From 53f935e5fa788e92d98e137ff5e52116650bd708 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20L=C3=BCck?= <christian@clue.engineering>
Date: Thu, 28 Sep 2023 19:29:35 +0200
Subject: [PATCH] Drop deprecated `Server` class, use `HttpServer` instead

---
 README.md            |  6 ------
 src/HttpServer.php   |  4 ----
 src/Server.php       | 18 ------------------
 tests/ServerTest.php | 15 ---------------
 4 files changed, 43 deletions(-)
 delete mode 100644 src/Server.php
 delete mode 100644 tests/ServerTest.php

diff --git a/README.md b/README.md
index 8867f798..8e3f29a2 100644
--- a/README.md
+++ b/README.md
@@ -740,8 +740,6 @@ See also the [Unix Domain Sockets (UDS) example](examples/14-client-unix-domain-
 
 ### HttpServer
 
-<a id="server"></a> <!-- legacy id -->
-
 The `React\Http\HttpServer` class is responsible for handling incoming connections and then
 processing each incoming HTTP request.
 
@@ -891,10 +889,6 @@ have full control over consuming the incoming HTTP request body and
 concurrency settings. See also [streaming incoming request](#streaming-incoming-request)
 below for more details.
 
-> Changelog v1.5.0: This class has been renamed to `HttpServer` from the
-  previous `Server` class in order to avoid any ambiguities.
-  The previous name has been deprecated and should not be used anymore.
-
 ### listen()
 
 The `listen(React\Socket\ServerInterface $socket): void` method can be used to
diff --git a/src/HttpServer.php b/src/HttpServer.php
index f2334733..cd0874cc 100644
--- a/src/HttpServer.php
+++ b/src/HttpServer.php
@@ -167,10 +167,6 @@
  * have full control over consuming the incoming HTTP request body and
  * concurrency settings. See also [streaming incoming request](#streaming-incoming-request)
  * below for more details.
- *
- * > Changelog v1.5.0: This class has been renamed to `HttpServer` from the
- *   previous `Server` class in order to avoid any ambiguities.
- *   The previous name has been deprecated and should not be used anymore.
  */
 final class HttpServer extends EventEmitter
 {
diff --git a/src/Server.php b/src/Server.php
deleted file mode 100644
index 9bb9cf7f..00000000
--- a/src/Server.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-namespace React\Http;
-
-// Deprecated `Server` is an alias for new `HttpServer` to ensure existing code continues to work as-is.
-\class_alias(__NAMESPACE__ . '\\HttpServer', __NAMESPACE__ . '\\Server', true);
-
-// Aid static analysis and IDE autocompletion about this deprecation,
-// but don't actually execute during runtime because `HttpServer` is final.
-if (!\class_exists(__NAMESPACE__ . '\\Server', false)) {
-    /**
-     * @deprecated 1.5.0 See HttpServer instead
-     * @see HttpServer
-     */
-    final class Server extends HttpServer
-    {
-    }
-}
diff --git a/tests/ServerTest.php b/tests/ServerTest.php
deleted file mode 100644
index 7f5c3b68..00000000
--- a/tests/ServerTest.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-
-namespace React\Tests\Http;
-
-use React\Http\Server;
-
-class ServerTest extends TestCase
-{
-    public function testDeprecatedServerIsInstanceOfNewHttpServer()
-    {
-        $http = new Server(function () { });
-
-        $this->assertInstanceOf('React\Http\HttpServer', $http);
-    }
-}