Skip to content

Commit e654f59

Browse files
clueclue
committed
Rename Server to HttpServer to avoid class name collisions
1 parent b008fb8 commit e654f59

25 files changed

+264
-273
lines changed

‎README.md‎

Lines changed: 67 additions & 61 deletions
Large diffs are not rendered by default.

‎examples/51-server-hello-world.php‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,10 @@
22

33
use Psr\Http\Message\ServerRequestInterface;
44
use React\Http\Message\Response;
5-
use React\Http\Server;
65

76
require __DIR__ . '/../vendor/autoload.php';
87

9-
$server = new Server(function (ServerRequestInterface $request) {
8+
$http = new React\Http\HttpServer(function (ServerRequestInterface $request) {
109
return new Response(
1110
200,
1211
array(
@@ -16,7 +15,7 @@
1615
);
1716
});
1817

19-
$socket = new \React\Socket\Server(isset($argv[1]) ? $argv[1] : '0.0.0.0:0');
20-
$server->listen($socket);
18+
$socket = new React\Socket\Server(isset($argv[1]) ? $argv[1] : '0.0.0.0:0');
19+
$http->listen($socket);
2120

2221
echo 'Listening on ' . str_replace('tcp:', 'http:', $socket->getAddress()) . PHP_EOL;

‎examples/52-server-count-visitors.php‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,11 @@
22

33
use Psr\Http\Message\ServerRequestInterface;
44
use React\Http\Message\Response;
5-
use React\Http\Server;
65

76
require __DIR__ . '/../vendor/autoload.php';
87

98
$counter = 0;
10-
$server = new Server(function (ServerRequestInterface $request) use (&$counter) {
9+
$http = new React\Http\HttpServer(function (ServerRequestInterface $request) use (&$counter) {
1110
return new Response(
1211
200,
1312
array(
@@ -17,7 +16,7 @@
1716
);
1817
});
1918

20-
$socket = new \React\Socket\Server(isset($argv[1]) ? $argv[1] : '0.0.0.0:0');
21-
$server->listen($socket);
19+
$socket = new React\Socket\Server(isset($argv[1]) ? $argv[1] : '0.0.0.0:0');
20+
$http->listen($socket);
2221

2322
echo 'Listening on ' . str_replace('tcp:', 'http:', $socket->getAddress()) . PHP_EOL;

‎examples/53-server-whatsmyip.php‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,10 @@
22

33
use Psr\Http\Message\ServerRequestInterface;
44
use React\Http\Message\Response;
5-
use React\Http\Server;
65

76
require __DIR__ . '/../vendor/autoload.php';
87

9-
$server = new Server(function (ServerRequestInterface $request) {
8+
$http = new React\Http\HttpServer(function (ServerRequestInterface $request) {
109
$body = "Your IP is: " . $request->getServerParams()['REMOTE_ADDR'];
1110

1211
return new Response(
@@ -18,7 +17,7 @@
1817
);
1918
});
2019

21-
$socket = new \React\Socket\Server(isset($argv[1]) ? $argv[1] : '0.0.0.0:0');
22-
$server->listen($socket);
20+
$socket = new React\Socket\Server(isset($argv[1]) ? $argv[1] : '0.0.0.0:0');
21+
$http->listen($socket);
2322

2423
echo 'Listening on ' . str_replace('tcp:', 'http:', $socket->getAddress()) . PHP_EOL;

‎examples/54-server-query-parameter.php‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,10 @@
22

33
use Psr\Http\Message\ServerRequestInterface;
44
use React\Http\Message\Response;
5-
use React\Http\Server;
65

76
require __DIR__ . '/../vendor/autoload.php';
87

9-
$server = new Server(function (ServerRequestInterface $request) {
8+
$http = new React\Http\HttpServer(function (ServerRequestInterface $request) {
109
$queryParams = $request->getQueryParams();
1110

1211
$body = 'The query parameter "foo" is not set. Click the following link ';
@@ -25,7 +24,7 @@
2524
);
2625
});
2726

28-
$socket = new \React\Socket\Server(isset($argv[1]) ? $argv[1] : '0.0.0.0:0');
29-
$server->listen($socket);
27+
$socket = new React\Socket\Server(isset($argv[1]) ? $argv[1] : '0.0.0.0:0');
28+
$http->listen($socket);
3029

3130
echo 'Listening on ' . str_replace('tcp:', 'http:', $socket->getAddress()) . PHP_EOL;

‎examples/55-server-cookie-handling.php‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,10 @@
22

33
use Psr\Http\Message\ServerRequestInterface;
44
use React\Http\Message\Response;
5-
use React\Http\Server;
65

76
require __DIR__ . '/../vendor/autoload.php';
87

9-
$server = new Server(function (ServerRequestInterface $request) {
8+
$http = new React\Http\HttpServer(function (ServerRequestInterface $request) {
109
$key = 'react\php';
1110

1211
if (isset($request->getCookieParams()[$key])) {
@@ -31,7 +30,7 @@
3130
);
3231
});
3332

34-
$socket = new \React\Socket\Server(isset($argv[1]) ? $argv[1] : '0.0.0.0:0');
35-
$server->listen($socket);
33+
$socket = new React\Socket\Server(isset($argv[1]) ? $argv[1] : '0.0.0.0:0');
34+
$http->listen($socket);
3635

3736
echo 'Listening on ' . str_replace('tcp:', 'http:', $socket->getAddress()) . PHP_EOL;

‎examples/56-server-sleep.php‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,11 @@
33
use Psr\Http\Message\ServerRequestInterface;
44
use React\EventLoop\Loop;
55
use React\Http\Message\Response;
6-
use React\Http\Server;
76
use React\Promise\Promise;
87

98
require __DIR__ . '/../vendor/autoload.php';
109

11-
$server = new Server(function (ServerRequestInterface $request) {
10+
$http = new React\Http\HttpServer(function (ServerRequestInterface $request) {
1211
return new Promise(function ($resolve, $reject) {
1312
Loop::addTimer(1.5, function() use ($resolve) {
1413
$response = new Response(
@@ -23,7 +22,7 @@
2322
});
2423
});
2524

26-
$socket = new \React\Socket\Server(isset($argv[1]) ? $argv[1] : '0.0.0.0:0');
27-
$server->listen($socket);
25+
$socket = new React\Socket\Server(isset($argv[1]) ? $argv[1] : '0.0.0.0:0');
26+
$http->listen($socket);
2827

2928
echo 'Listening on ' . str_replace('tcp:', 'http:', $socket->getAddress()) . PHP_EOL;

‎examples/57-server-error-handling.php‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,12 @@
22

33
use Psr\Http\Message\ServerRequestInterface;
44
use React\Http\Message\Response;
5-
use React\Http\Server;
65
use React\Promise\Promise;
76

87
require __DIR__ . '/../vendor/autoload.php';
98

109
$count = 0;
11-
$server = new Server(function (ServerRequestInterface $request) use (&$count) {
10+
$http = new React\Http\HttpServer(function (ServerRequestInterface $request) use (&$count) {
1211
return new Promise(function ($resolve, $reject) use (&$count) {
1312
$count++;
1413

@@ -28,7 +27,7 @@
2827
});
2928
});
3029

31-
$socket = new \React\Socket\Server(isset($argv[1]) ? $argv[1] : '0.0.0.0:0');
32-
$server->listen($socket);
30+
$socket = new React\Socket\Server(isset($argv[1]) ? $argv[1] : '0.0.0.0:0');
31+
$http->listen($socket);
3332

3433
echo 'Listening on ' . str_replace('tcp:', 'http:', $socket->getAddress()) . PHP_EOL;

‎examples/58-server-stream-response.php‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,11 @@
33
use Psr\Http\Message\ServerRequestInterface;
44
use React\EventLoop\Loop;
55
use React\Http\Message\Response;
6-
use React\Http\Server;
76
use React\Stream\ThroughStream;
87

98
require __DIR__ . '/../vendor/autoload.php';
109

11-
$server = new Server(function (ServerRequestInterface $request) {
10+
$http = new React\Http\HttpServer(function (ServerRequestInterface $request) {
1211
if ($request->getMethod() !== 'GET' || $request->getUri()->getPath() !== '/') {
1312
return new Response(404);
1413
}
@@ -39,7 +38,7 @@
3938
);
4039
});
4140

42-
$socket = new \React\Socket\Server(isset($argv[1]) ? $argv[1] : '0.0.0.0:0');
43-
$server->listen($socket);
41+
$socket = new React\Socket\Server(isset($argv[1]) ? $argv[1] : '0.0.0.0:0');
42+
$http->listen($socket);
4443

4544
echo 'Listening on ' . str_replace('tcp:', 'http:', $socket->getAddress()) . PHP_EOL;

‎examples/59-server-json-api.php‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,10 @@
88

99
use Psr\Http\Message\ServerRequestInterface;
1010
use React\Http\Message\Response;
11-
use React\Http\Server;
1211

1312
require __DIR__ . '/../vendor/autoload.php';
1413

15-
$server = new Server(function (ServerRequestInterface $request) {
14+
$http = new React\Http\HttpServer(function (ServerRequestInterface $request) {
1615
if ($request->getHeaderLine('Content-Type') !== 'application/json') {
1716
return new Response(
1817
415, // Unsupported Media Type
@@ -53,7 +52,7 @@
5352
);
5453
});
5554

56-
$socket = new \React\Socket\Server(isset($argv[1]) ? $argv[1] : '0.0.0.0:0');
57-
$server->listen($socket);
55+
$socket = new React\Socket\Server(isset($argv[1]) ? $argv[1] : '0.0.0.0:0');
56+
$http->listen($socket);
5857

5958
echo 'Listening on ' . str_replace('tcp:', 'http:', $socket->getAddress()) . PHP_EOL;

0 commit comments

Comments
 (0)