Skip to content

Commit 2e16762

Browse files
NyholmNyholm
committed
Revert "Connect on different ports"
This reverts commit 9337966.
1 parent 0a29fd6 commit 2e16762

File tree

6 files changed

+24
-30
lines changed

6 files changed

+24
-30
lines changed

‎tests/BaseTestCase.php

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@ class BaseTestCase extends TestCase
88
{
99
private $servers = [];
1010

11-
private $nextPort = 19999;
12-
1311
public function startServer($name)
1412
{
1513
$filename = __DIR__ . '/server/' . $name . '.php';
@@ -19,12 +17,8 @@ public function startServer($name)
1917
$this->fail('Could not connect to server');
2018
}
2119

22-
$port = $this->nextPort--;
23-
24-
$this->servers[$name] = proc_open('php '. $filename, [], $pipes, null, ['CPORT'=>$port]);
20+
$this->servers[$name] = proc_open('php '. $filename, [], $pipes);
2521
sleep(1);
26-
27-
return $port;
2822
}
2923

3024
public function stopServer($name)

‎tests/SocketHttpClientTest.php

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ public function createClient($options = array())
1717

1818
public function testTcpSocketDomain()
1919
{
20-
$port = $this->startServer('tcp-server');
21-
$client = $this->createClient(['remote_socket' => '127.0.0.1:'.$port]);
20+
$this->startServer('tcp-server');
21+
$client = $this->createClient(['remote_socket' => '127.0.0.1:19999']);
2222
$response = $client->get('/', []);
2323

2424
$this->assertInstanceOf('Psr\Http\Message\ResponseInterface', $response);
@@ -36,19 +36,19 @@ public function testNoRemote()
3636

3737
public function testRemoteInUri()
3838
{
39-
$port = $this->startServer('tcp-server');
39+
$this->startServer('tcp-server');
4040
$client = $this->createClient();
41-
$response = $client->get('http://127.0.0.1:'.$port.'/', []);
41+
$response = $client->get('http://127.0.0.1:19999/', []);
4242

4343
$this->assertInstanceOf('Psr\Http\Message\ResponseInterface', $response);
4444
$this->assertEquals(200, $response->getStatusCode());
4545
}
4646

4747
public function testRemoteInHostHeader()
4848
{
49-
$port = $port = $this->startServer('tcp-server');
49+
$this->startServer('tcp-server');
5050
$client = $this->createClient();
51-
$response = $client->get('/', ['Host' => '127.0.0.1:'.$port]);
51+
$response = $client->get('/', ['Host' => '127.0.0.1:19999']);
5252

5353
$this->assertInstanceOf('Psr\Http\Message\ResponseInterface', $response);
5454
$this->assertEquals(200, $response->getStatusCode());
@@ -59,14 +59,14 @@ public function testRemoteInHostHeader()
5959
*/
6060
public function testBrokenSocket()
6161
{
62-
$port = $this->startServer('tcp-bugous-server');
63-
$client = $this->createClient(['remote_socket' => '127.0.0.1:'.$port]);
62+
$this->startServer('tcp-bugous-server');
63+
$client = $this->createClient(['remote_socket' => '127.0.0.1:19999']);
6464
$client->get('/', []);
6565
}
6666

6767
public function testSslRemoteInUri()
6868
{
69-
$port = $this->startServer('tcp-ssl-server');
69+
$this->startServer('tcp-ssl-server');
7070
$client = $this->createClient([
7171
'stream_context_options' => [
7272
'ssl' => [
@@ -75,7 +75,7 @@ public function testSslRemoteInUri()
7575
]
7676
]
7777
]);
78-
$response = $client->get('https://127.0.0.1:'.$port.'/', []);
78+
$response = $client->get('https://127.0.0.1:19999/', []);
7979

8080
$this->assertInstanceOf('Psr\Http\Message\ResponseInterface', $response);
8181
$this->assertEquals(200, $response->getStatusCode());
@@ -99,16 +99,16 @@ public function testUnixSocketDomain()
9999
*/
100100
public function testNetworkExceptionOnConnectError()
101101
{
102-
$client = $this->createClient(['remote_socket' => '127.0.0.1:19999']);
102+
$client = $this->createClient(['remote_socket' => '127.0.0.1:19999']);
103103
$client->get('/', []);
104104
}
105105

106106
public function testSslConnection()
107107
{
108-
$port = $this->startServer('tcp-ssl-server');
108+
$this->startServer('tcp-ssl-server');
109109

110110
$client = $this->createClient([
111-
'remote_socket' => '127.0.0.1:'.$port,
111+
'remote_socket' => '127.0.0.1:19999',
112112
'ssl' => true,
113113
'stream_context_options' => [
114114
'ssl' => [
@@ -129,10 +129,10 @@ public function testSslConnectionWithClientCertificate()
129129
$this->markTestSkipped('Test can only run on php 5.6 and superior (for capturing peer certificate)');
130130
}
131131

132-
$port = $this->startServer('tcp-ssl-server-client');
132+
$this->startServer('tcp-ssl-server-client');
133133

134134
$client = $this->createClient([
135-
'remote_socket' => '127.0.0.1:'.$port,
135+
'remote_socket' => '127.0.0.1:19999',
136136
'ssl' => true,
137137
'stream_context_options' => [
138138
'ssl' => [
@@ -154,10 +154,10 @@ public function testInvalidSslConnectionWithClientCertificate()
154154
$this->markTestSkipped('Test can only run on php 5.6 and superior (for capturing peer certificate)');
155155
}
156156

157-
$port = $this->startServer('tcp-ssl-server-client');
157+
$this->startServer('tcp-ssl-server-client');
158158

159159
$client = $this->createClient([
160-
'remote_socket' => '127.0.0.1:'.$port,
160+
'remote_socket' => '127.0.0.1:19999',
161161
'ssl' => true,
162162
'stream_context_options' => [
163163
'ssl' => [
@@ -177,9 +177,9 @@ public function testInvalidSslConnectionWithClientCertificate()
177177
*/
178178
public function testNetworkExceptionOnSslError()
179179
{
180-
$port = $this->startServer('tcp-server');
180+
$this->startServer('tcp-server');
181181

182-
$client = $this->createClient(['remote_socket' => '127.0.0.1:'.$port, 'ssl' => true]);
182+
$client = $this->createClient(['remote_socket' => '127.0.0.1:19999', 'ssl' => true]);
183183
$client->get('/', []);
184184
}
185185

‎tests/server/tcp-bugous-server.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
require_once __DIR__."/../Semaphore.php";
44

5-
$socketServer = stream_socket_server('127.0.0.1:'.getenv('CPORT'));
5+
$socketServer = stream_socket_server('127.0.0.1:19999');
66
$client = stream_socket_accept($socketServer);
77

88
fclose($client);

‎tests/server/tcp-server.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
require_once __DIR__."/../Semaphore.php";
44

5-
$socketServer = stream_socket_server('127.0.0.1:'.getenv('CPORT'));
5+
$socketServer = stream_socket_server('127.0.0.1:19999');
66
$client = stream_socket_accept($socketServer);
77

88
fwrite($client, str_replace("\n", "\r\n", <<<EOR

‎tests/server/tcp-ssl-server-client.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
]
1111
]);
1212

13-
$socketServer = stream_socket_server('tcp://127.0.0.1:'.getenv('CPORT'), $errNo, $errStr, STREAM_SERVER_BIND|STREAM_SERVER_LISTEN, $context);
13+
$socketServer = stream_socket_server('tcp://127.0.0.1:19999', $errNo, $errStr, STREAM_SERVER_BIND|STREAM_SERVER_LISTEN, $context);
1414
stream_socket_enable_crypto($socketServer, false);
1515

1616
$client = stream_socket_accept($socketServer);

‎tests/server/tcp-ssl-server.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
]
99
]);
1010

11-
$socketServer = stream_socket_server('tcp://127.0.0.1:'.getenv('CPORT'), $errNo, $errStr, STREAM_SERVER_BIND|STREAM_SERVER_LISTEN, $context);
11+
$socketServer = stream_socket_server('tcp://127.0.0.1:19999', $errNo, $errStr, STREAM_SERVER_BIND|STREAM_SERVER_LISTEN, $context);
1212
stream_socket_enable_crypto($socketServer, false);
1313

1414
$client = stream_socket_accept($socketServer);

0 commit comments

Comments
 (0)