RequestFactory::createHttpRequest() renamed to fromGlobals()

To be consistent with future ResponseFactory::fromGlobals()

Author: dg

readme.md

@@ -146,7 +146,7 @@ And then we let the factory generate a new `httpRequest` and we store it in a sy
 
 ```php
 // $container is a system container
-$container->addService('httpRequest', $requestFactory->createHttpRequest());
+$container->addService('httpRequest', $requestFactory->fromGlobals());
 ```
 
 

src/Bridges/HttpDI/HttpExtension.php

@@ -56,7 +56,7 @@ public function loadConfiguration()
 			->addSetup('setProxy', [$config->proxy]);
 
 		$builder->addDefinition($this->prefix('request'))
-			->setFactory('@Nette\Http\RequestFactory::createHttpRequest');
+			->setFactory('@Nette\Http\RequestFactory::fromGlobals');
 
 		$response = $builder->addDefinition($this->prefix('response'))
 			->setFactory(Nette\Http\Response::class);

src/Http/RequestFactory.php

@@ -60,7 +60,7 @@ public function setProxy($proxy)
 	/**
 	 * Returns new Request instance, using values from superglobals.
 	 */
-	public function createHttpRequest(): Request
+	public function fromGlobals(): Request
 	{
 		$url = new Url;
 		$this->getServer($url);
@@ -345,4 +345,11 @@ private function useNonstandardProxy(Url $url, &$remoteAddr, &$remoteHost): void
 			}
 		}
 	}
+
+
+	/** @deprecated */
+	public function createHttpRequest(): Request
+	{
+		return $this->fromGlobals();
+	}
 }

tests/Http/Request.files.phpt

@@ -100,7 +100,7 @@ $_FILES = [
 ];
 
 $factory = new Http\RequestFactory;
-$request = $factory->createHttpRequest();
+$request = $factory->fromGlobals();
 
 Assert::type(Nette\Http\FileUpload::class, $request->files['file1']);
 Assert::type(Nette\Http\FileUpload::class, $request->files['file2'][2]);

tests/Http/Request.files2.phpt

@@ -25,7 +25,7 @@ $_FILES = [
 ];
 
 $factory = new Http\RequestFactory;
-$request = $factory->createHttpRequest();
+$request = $factory->fromGlobals();
 
 Assert::type('array', $request->files['files']);
 Assert::count(1, $request->files['files']);

tests/Http/Request.invalidEncoding.phpt

@@ -68,7 +68,7 @@ $_FILES = [
 test(function () { // unfiltered data
 	$factory = new Http\RequestFactory;
 	$factory->setBinary();
-	$request = $factory->createHttpRequest();
+	$request = $factory->fromGlobals();
 
 	Assert::same($request->getQuery('invalid'), INVALID);
 	Assert::same($request->getQuery('control'), CONTROL_CHARACTERS);
@@ -96,7 +96,7 @@ test(function () { // unfiltered data
 
 test(function () { // filtered data
 	$factory = new Http\RequestFactory;
-	$request = $factory->createHttpRequest();
+	$request = $factory->fromGlobals();
 
 	Assert::same('', $request->getQuery('invalid'));
 	Assert::same('ABC', $request->getQuery('control'));

tests/Http/Request.request.phpt

@@ -28,7 +28,7 @@ test(function () {
 	$factory = new Http\RequestFactory;
 	$factory->urlFilters['path'] = ['#%20#' => ''];
 	$factory->urlFilters['url'] = ['#[.,)]\z#' => ''];
-	$request = $factory->createHttpRequest();
+	$request = $factory->fromGlobals();
 
 	Assert::same('GET', $request->getMethod());
 	Assert::true($request->isSecured());
@@ -59,7 +59,7 @@ test(function () {
 	$factory = new Http\RequestFactory;
 	$factory->urlFilters['path'] = [];
 	$factory->urlFilters['url'] = [];
-	$request = $factory->createHttpRequest();
+	$request = $factory->fromGlobals();
 
 	Assert::same('https', $request->getUrl()->scheme);
 	Assert::same('', $request->getUrl()->user);

tests/Http/RequestFactory.host.phpt

@@ -17,39 +17,39 @@ $_SERVER = [
 	'HTTP_HOST' => 'localhost',
 ];
 $factory = new RequestFactory;
-Assert::same('http://localhost/', (string) $factory->createHttpRequest()->getUrl());
+Assert::same('http://localhost/', (string) $factory->fromGlobals()->getUrl());
 
 
 $_SERVER = [
 	'HTTP_HOST' => 'www-x.nette.org',
 ];
 $factory = new RequestFactory;
-Assert::same('http://www-x.nette.org/', (string) $factory->createHttpRequest()->getUrl());
+Assert::same('http://www-x.nette.org/', (string) $factory->fromGlobals()->getUrl());
 
 
 $_SERVER = [
 	'HTTP_HOST' => '192.168.0.1:8080',
 ];
 $factory = new RequestFactory;
-Assert::same('http://192.168.0.1:8080/', (string) $factory->createHttpRequest()->getUrl());
+Assert::same('http://192.168.0.1:8080/', (string) $factory->fromGlobals()->getUrl());
 
 
 $_SERVER = [
 	'HTTP_HOST' => '[::1aF]:8080',
 ];
 $factory = new RequestFactory;
-Assert::same('http://[::1af]:8080/', (string) $factory->createHttpRequest()->getUrl());
+Assert::same('http://[::1af]:8080/', (string) $factory->fromGlobals()->getUrl());
 
 
 $_SERVER = [
 	'HTTP_HOST' => "a.cz\n",
 ];
 $factory = new RequestFactory;
-Assert::same('http:/', (string) $factory->createHttpRequest()->getUrl());
+Assert::same('http:/', (string) $factory->fromGlobals()->getUrl());
 
 
 $_SERVER = [
 	'HTTP_HOST' => 'AB',
 ];
 $factory = new RequestFactory;
-Assert::same('http://ab/', (string) $factory->createHttpRequest()->getUrl());
+Assert::same('http://ab/', (string) $factory->fromGlobals()->getUrl());

tests/Http/RequestFactory.method.phpt

@@ -18,20 +18,20 @@ $_SERVER = [
 	'HTTP_X_HTTP_METHOD_OVERRIDE' => 'PATCH',
 ];
 $factory = new RequestFactory;
-Assert::same('GET', $factory->createHttpRequest()->getMethod());
+Assert::same('GET', $factory->fromGlobals()->getMethod());
 
 
 $_SERVER = [
 	'REQUEST_METHOD' => 'POST',
 	'HTTP_X_HTTP_METHOD_OVERRIDE' => 'PATCH',
 ];
 $factory = new RequestFactory;
-Assert::same('PATCH', $factory->createHttpRequest()->getMethod());
+Assert::same('PATCH', $factory->fromGlobals()->getMethod());
 
 
 $_SERVER = [
 	'REQUEST_METHOD' => 'POST',
 	'HTTP_X_HTTP_METHOD_OVERRIDE' => ' *',
 ];
 $factory = new RequestFactory;
-Assert::same('POST', $factory->createHttpRequest()->getMethod());
+Assert::same('POST', $factory->fromGlobals()->getMethod());

tests/Http/RequestFactory.port.phpt

@@ -20,7 +20,7 @@ class RequestFactoryPortTest extends Tester\TestCase
 		$_SERVER = $server;
 
 		$factory = new Nette\Http\RequestFactory;
-		Assert::same($expectedPort, $factory->createHttpRequest()->getUrl()->getPort());
+		Assert::same($expectedPort, $factory->fromGlobals()->getUrl()->getPort());
 	}
 
 
@@ -61,7 +61,7 @@ class RequestFactoryPortTest extends Tester\TestCase
 
 		$factory = new Nette\Http\RequestFactory;
 		$factory->setProxy(['10.0.0.1']);
-		Assert::same($expectedPort, $factory->createHttpRequest()->getUrl()->getPort());
+		Assert::same($expectedPort, $factory->fromGlobals()->getUrl()->getPort());
 	}