Skip to content

Commit ddf9e8e

Browse files
dgdg
committed
RequestFactory::createHttpRequest() renamed to fromGlobals()
To be consistent with ResponseFactory::fromGlobals()
1 parent 78ba2b4 commit ddf9e8e

23 files changed

+85
-78
lines changed

‎readme.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ And then we let the factory generate a new `httpRequest` and we store it in a sy
146146

147147
```php
148148
// $container is a system container
149-
$container->addService('httpRequest', $requestFactory->createHttpRequest());
149+
$container->addService('httpRequest', $requestFactory->fromGlobals());
150150
```
151151

152152

‎src/Bridges/HttpDI/HttpExtension.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public function loadConfiguration()
5656
->addSetup('setProxy', [$config->proxy]);
5757

5858
$builder->addDefinition($this->prefix('request'))
59-
->setFactory('@Nette\Http\RequestFactory::createHttpRequest');
59+
->setFactory('@Nette\Http\RequestFactory::fromGlobals');
6060

6161
$response = $builder->addDefinition($this->prefix('response'))
6262
->setFactory(Nette\Http\Response::class);

‎src/Http/RequestFactory.php

+8-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public function setProxy($proxy)
6060
/**
6161
* Creates current HttpRequest object.
6262
*/
63-
public function createHttpRequest(): Request
63+
public function fromGlobals(): Request
6464
{
6565
$url = new Url;
6666
$this->getServer($url);
@@ -345,4 +345,11 @@ private function useNonstandardProxy(Url $url, &$remoteAddr, &$remoteHost): void
345345
}
346346
}
347347
}
348+
349+
350+
/** @deprecated */
351+
public function createHttpRequest(): Request
352+
{
353+
return $this->fromGlobals();
354+
}
348355
}

‎tests/Http/Request.files.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ $_FILES = [
100100
];
101101

102102
$factory = new Http\RequestFactory;
103-
$request = $factory->createHttpRequest();
103+
$request = $factory->fromGlobals();
104104

105105
Assert::type(Nette\Http\FileUpload::class, $request->files['file1']);
106106
Assert::type(Nette\Http\FileUpload::class, $request->files['file2'][2]);

‎tests/Http/Request.files2.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ $_FILES = [
2525
];
2626

2727
$factory = new Http\RequestFactory;
28-
$request = $factory->createHttpRequest();
28+
$request = $factory->fromGlobals();
2929

3030
Assert::type('array', $request->files['files']);
3131
Assert::count(1, $request->files['files']);

‎tests/Http/Request.invalidEncoding.phpt

+2-2
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ $_FILES = [
6868
test(function () { // unfiltered data
6969
$factory = new Http\RequestFactory;
7070
$factory->setBinary();
71-
$request = $factory->createHttpRequest();
71+
$request = $factory->fromGlobals();
7272

7373
Assert::same($request->getQuery('invalid'), INVALID);
7474
Assert::same($request->getQuery('control'), CONTROL_CHARACTERS);
@@ -96,7 +96,7 @@ test(function () { // unfiltered data
9696

9797
test(function () { // filtered data
9898
$factory = new Http\RequestFactory;
99-
$request = $factory->createHttpRequest();
99+
$request = $factory->fromGlobals();
100100

101101
Assert::same('', $request->getQuery('invalid'));
102102
Assert::same('ABC', $request->getQuery('control'));

‎tests/Http/Request.request.phpt

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ test(function () {
2828
$factory = new Http\RequestFactory;
2929
$factory->urlFilters['path'] = ['#%20#' => ''];
3030
$factory->urlFilters['url'] = ['#[.,)]\z#' => ''];
31-
$request = $factory->createHttpRequest();
31+
$request = $factory->fromGlobals();
3232

3333
Assert::same('GET', $request->getMethod());
3434
Assert::true($request->isSecured());
@@ -59,7 +59,7 @@ test(function () {
5959
$factory = new Http\RequestFactory;
6060
$factory->urlFilters['path'] = [];
6161
$factory->urlFilters['url'] = [];
62-
$request = $factory->createHttpRequest();
62+
$request = $factory->fromGlobals();
6363

6464
Assert::same('https', $request->getUrl()->scheme);
6565
Assert::same('', $request->getUrl()->user);

‎tests/Http/RequestFactory.host.phpt

+6-6
Original file line numberDiff line numberDiff line change
@@ -17,39 +17,39 @@ $_SERVER = [
1717
'HTTP_HOST' => 'localhost',
1818
];
1919
$factory = new RequestFactory;
20-
Assert::same('http://localhost/', (string) $factory->createHttpRequest()->getUrl());
20+
Assert::same('http://localhost/', (string) $factory->fromGlobals()->getUrl());
2121

2222

2323
$_SERVER = [
2424
'HTTP_HOST' => 'www-x.nette.org',
2525
];
2626
$factory = new RequestFactory;
27-
Assert::same('http://www-x.nette.org/', (string) $factory->createHttpRequest()->getUrl());
27+
Assert::same('http://www-x.nette.org/', (string) $factory->fromGlobals()->getUrl());
2828

2929

3030
$_SERVER = [
3131
'HTTP_HOST' => '192.168.0.1:8080',
3232
];
3333
$factory = new RequestFactory;
34-
Assert::same('http://192.168.0.1:8080/', (string) $factory->createHttpRequest()->getUrl());
34+
Assert::same('http://192.168.0.1:8080/', (string) $factory->fromGlobals()->getUrl());
3535

3636

3737
$_SERVER = [
3838
'HTTP_HOST' => '[::1aF]:8080',
3939
];
4040
$factory = new RequestFactory;
41-
Assert::same('http://[::1af]:8080/', (string) $factory->createHttpRequest()->getUrl());
41+
Assert::same('http://[::1af]:8080/', (string) $factory->fromGlobals()->getUrl());
4242

4343

4444
$_SERVER = [
4545
'HTTP_HOST' => "a.cz\n",
4646
];
4747
$factory = new RequestFactory;
48-
Assert::same('http:/', (string) $factory->createHttpRequest()->getUrl());
48+
Assert::same('http:/', (string) $factory->fromGlobals()->getUrl());
4949

5050

5151
$_SERVER = [
5252
'HTTP_HOST' => 'AB',
5353
];
5454
$factory = new RequestFactory;
55-
Assert::same('http://ab/', (string) $factory->createHttpRequest()->getUrl());
55+
Assert::same('http://ab/', (string) $factory->fromGlobals()->getUrl());

‎tests/Http/RequestFactory.method.phpt

+3-3
Original file line numberDiff line numberDiff line change
@@ -18,20 +18,20 @@ $_SERVER = [
1818
'HTTP_X_HTTP_METHOD_OVERRIDE' => 'PATCH',
1919
];
2020
$factory = new RequestFactory;
21-
Assert::same('GET', $factory->createHttpRequest()->getMethod());
21+
Assert::same('GET', $factory->fromGlobals()->getMethod());
2222

2323

2424
$_SERVER = [
2525
'REQUEST_METHOD' => 'POST',
2626
'HTTP_X_HTTP_METHOD_OVERRIDE' => 'PATCH',
2727
];
2828
$factory = new RequestFactory;
29-
Assert::same('PATCH', $factory->createHttpRequest()->getMethod());
29+
Assert::same('PATCH', $factory->fromGlobals()->getMethod());
3030

3131

3232
$_SERVER = [
3333
'REQUEST_METHOD' => 'POST',
3434
'HTTP_X_HTTP_METHOD_OVERRIDE' => ' *',
3535
];
3636
$factory = new RequestFactory;
37-
Assert::same('POST', $factory->createHttpRequest()->getMethod());
37+
Assert::same('POST', $factory->fromGlobals()->getMethod());

‎tests/Http/RequestFactory.port.phpt

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ class RequestFactoryPortTest extends Tester\TestCase
2020
$_SERVER = $server;
2121

2222
$factory = new Nette\Http\RequestFactory;
23-
Assert::same($expectedPort, $factory->createHttpRequest()->getUrl()->getPort());
23+
Assert::same($expectedPort, $factory->fromGlobals()->getUrl()->getPort());
2424
}
2525

2626

@@ -61,7 +61,7 @@ class RequestFactoryPortTest extends Tester\TestCase
6161

6262
$factory = new Nette\Http\RequestFactory;
6363
$factory->setProxy(['10.0.0.1']);
64-
Assert::same($expectedPort, $factory->createHttpRequest()->getUrl()->getPort());
64+
Assert::same($expectedPort, $factory->fromGlobals()->getUrl()->getPort());
6565
}
6666

6767

‎tests/Http/RequestFactory.proxy.forwarded.phpt

+15-15
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,14 @@ test(function () {
2121

2222
$factory = new RequestFactory;
2323
$factory->setProxy('127.0.0.1');
24-
Assert::same('127.0.0.3', $factory->createHttpRequest()->getRemoteAddress());
25-
Assert::same('localhost', $factory->createHttpRequest()->getRemoteHost());
24+
Assert::same('127.0.0.3', $factory->fromGlobals()->getRemoteAddress());
25+
Assert::same('localhost', $factory->fromGlobals()->getRemoteHost());
2626

2727
$factory->setProxy('127.0.0.1/8');
28-
Assert::same('23.75.45.200', $factory->createHttpRequest()->getRemoteAddress());
29-
Assert::same('192.168.0.1', $factory->createHttpRequest()->getRemoteHost());
28+
Assert::same('23.75.45.200', $factory->fromGlobals()->getRemoteAddress());
29+
Assert::same('192.168.0.1', $factory->fromGlobals()->getRemoteHost());
3030

31-
$url = $factory->createHttpRequest()->getUrl();
31+
$url = $factory->fromGlobals()->getUrl();
3232
Assert::same('http', $url->getScheme());
3333
Assert::same('192.168.0.1', $url->getHost());
3434
});
@@ -43,10 +43,10 @@ test(function () {
4343
$factory = new RequestFactory;
4444

4545
$factory->setProxy('127.0.0.3');
46-
Assert::same('23.75.45.200', $factory->createHttpRequest()->getRemoteAddress());
47-
Assert::same('192.168.0.1', $factory->createHttpRequest()->getRemoteHost());
46+
Assert::same('23.75.45.200', $factory->fromGlobals()->getRemoteAddress());
47+
Assert::same('192.168.0.1', $factory->fromGlobals()->getRemoteHost());
4848

49-
$url = $factory->createHttpRequest()->getUrl();
49+
$url = $factory->fromGlobals()->getUrl();
5050
Assert::same(8080, $url->getPort());
5151
Assert::same('192.168.0.1', $url->getHost());
5252
});
@@ -62,10 +62,10 @@ test(function () {
6262
$factory = new RequestFactory;
6363

6464
$factory->setProxy('127.0.0.3');
65-
Assert::same('2001:db8:cafe::17', $factory->createHttpRequest()->getRemoteAddress());
66-
Assert::same('2001:db8:cafe::18', $factory->createHttpRequest()->getRemoteHost());
65+
Assert::same('2001:db8:cafe::17', $factory->fromGlobals()->getRemoteAddress());
66+
Assert::same('2001:db8:cafe::18', $factory->fromGlobals()->getRemoteHost());
6767

68-
$url = $factory->createHttpRequest()->getUrl();
68+
$url = $factory->fromGlobals()->getUrl();
6969
Assert::same('2001:db8:cafe::18', $url->getHost());
7070
});
7171

@@ -79,10 +79,10 @@ test(function () {
7979
$factory = new RequestFactory;
8080

8181
$factory->setProxy('127.0.0.3');
82-
Assert::same('2001:db8:cafe::17', $factory->createHttpRequest()->getRemoteAddress());
83-
Assert::same('2001:db8:cafe::18', $factory->createHttpRequest()->getRemoteHost());
82+
Assert::same('2001:db8:cafe::17', $factory->fromGlobals()->getRemoteAddress());
83+
Assert::same('2001:db8:cafe::18', $factory->fromGlobals()->getRemoteHost());
8484

85-
$url = $factory->createHttpRequest()->getUrl();
85+
$url = $factory->fromGlobals()->getUrl();
8686
Assert::same(47832, $url->getPort());
8787
Assert::same('2001:db8:cafe::18', $url->getHost());
8888
});
@@ -98,6 +98,6 @@ test(function () {
9898
$factory = new RequestFactory;
9999
$factory->setProxy('127.0.0.3');
100100

101-
$url = $factory->createHttpRequest()->getUrl();
101+
$url = $factory->fromGlobals()->getUrl();
102102
Assert::same('https', $url->getScheme());
103103
});

‎tests/Http/RequestFactory.proxy.x-forwarded.phpt

+10-10
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,14 @@ test(function () {
2323

2424
$factory = new RequestFactory;
2525
$factory->setProxy('127.0.0.1');
26-
Assert::same('127.0.0.3', $factory->createHttpRequest()->getRemoteAddress());
27-
Assert::same('localhost', $factory->createHttpRequest()->getRemoteHost());
26+
Assert::same('127.0.0.3', $factory->fromGlobals()->getRemoteAddress());
27+
Assert::same('localhost', $factory->fromGlobals()->getRemoteHost());
2828

2929
$factory->setProxy('127.0.0.1/8');
30-
Assert::same('23.75.45.200', $factory->createHttpRequest()->getRemoteAddress());
31-
Assert::same('otherhost', $factory->createHttpRequest()->getRemoteHost());
30+
Assert::same('23.75.45.200', $factory->fromGlobals()->getRemoteAddress());
31+
Assert::same('otherhost', $factory->fromGlobals()->getRemoteHost());
3232

33-
$url = $factory->createHttpRequest()->getUrl();
33+
$url = $factory->fromGlobals()->getUrl();
3434
Assert::same('otherhost', $url->getHost());
3535
});
3636

@@ -44,13 +44,13 @@ test(function () {
4444

4545
$factory = new RequestFactory;
4646
$factory->setProxy('10.0.0.0/24');
47-
Assert::same('172.16.0.1', $factory->createHttpRequest()->getRemoteAddress());
48-
Assert::same('real', $factory->createHttpRequest()->getRemoteHost());
47+
Assert::same('172.16.0.1', $factory->fromGlobals()->getRemoteAddress());
48+
Assert::same('real', $factory->fromGlobals()->getRemoteHost());
4949

5050
$factory->setProxy(['10.0.0.1', '10.0.0.2']);
51-
Assert::same('172.16.0.1', $factory->createHttpRequest()->getRemoteAddress());
52-
Assert::same('real', $factory->createHttpRequest()->getRemoteHost());
51+
Assert::same('172.16.0.1', $factory->fromGlobals()->getRemoteAddress());
52+
Assert::same('real', $factory->fromGlobals()->getRemoteHost());
5353

54-
$url = $factory->createHttpRequest()->getUrl();
54+
$url = $factory->fromGlobals()->getUrl();
5555
Assert::same('real', $url->getHost());
5656
});

‎tests/Http/RequestFactory.query.phpt

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ test(function () use ($factory) {
2121
'REQUEST_URI' => '/',
2222
];
2323

24-
Assert::same('http://nette.org/', (string) $factory->createHttpRequest()->getUrl());
24+
Assert::same('http://nette.org/', (string) $factory->fromGlobals()->getUrl());
2525
});
2626

2727

@@ -31,5 +31,5 @@ test(function () use ($factory) {
3131
'REQUEST_URI' => '/?a=b',
3232
];
3333

34-
Assert::same('http://nette.org/?a=b', (string) $factory->createHttpRequest()->getUrl());
34+
Assert::same('http://nette.org/?a=b', (string) $factory->fromGlobals()->getUrl());
3535
});

‎tests/Http/RequestFactory.scheme.phpt

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ class RequestFactorySchemeTest extends Tester\TestCase
2222
$_SERVER = $server;
2323

2424
$factory = new Nette\Http\RequestFactory;
25-
$url = $factory->createHttpRequest()->getUrl();
25+
$url = $factory->fromGlobals()->getUrl();
2626

2727
Assert::same($expectedScheme, $url->getScheme());
2828
Assert::same($expectedScheme === 'https' ? 443 : 80, $url->getPort());
@@ -60,7 +60,7 @@ class RequestFactorySchemeTest extends Tester\TestCase
6060

6161
$factory = new Nette\Http\RequestFactory;
6262
$factory->setProxy(['10.0.0.1']);
63-
$url = $factory->createHttpRequest()->getUrl();
63+
$url = $factory->fromGlobals()->getUrl();
6464

6565
Assert::same($expectedScheme, $url->getScheme());
6666
Assert::same($expectedPort, $url->getPort());

0 commit comments

Comments
 (0)