added Form::initialize() for standalone forms

nette · Feb 11, 2021 · 17bfaf9 · 17bfaf9
1 parent 0a977a1
commit 17bfaf9
Show file tree

Hide file tree

Showing 21 changed files with 50 additions and 3 deletions.
diff --git a/src/Forms/Form.php b/src/Forms/Form.php
@@ -103,6 +103,9 @@ class Form extends Container implements Nette\HtmlStringable
 	/** @var bool */
 	protected $crossOrigin = false;
 
+	/** @var Nette\Http\IRequest */
+	private static $defaultHttpRequest;
+
 	/** @var mixed or null meaning: not detected yet */
 	private $submittedBy;
 
@@ -666,6 +669,21 @@ public function getToggles(): array
 	/********************* backend ****************d*g**/
 
 
+	/**
+	 * Initialize standalone forms.
+	 */
+	public static function initialize(bool $reinit = false): void
+	{
+		if ($reinit) {
+			self::$defaultHttpRequest = null;
+		} elseif (!self::$defaultHttpRequest) {
+			$factory = new Nette\Http\RequestFactory;
+			self::$defaultHttpRequest = $factory->fromGlobals();
+			Nette\Http\Helpers::initCookie(self::$defaultHttpRequest, new Nette\Http\Response);
+		}
+	}
+
+
 	/** @internal */
 	public function setHttpRequest(Nette\Http\IRequest $request)
 	{
@@ -676,9 +694,8 @@ public function setHttpRequest(Nette\Http\IRequest $request)
 	private function getHttpRequest(): Nette\Http\IRequest
 	{
 		if (!$this->httpRequest) {
-			$factory = new Nette\Http\RequestFactory;
-			$this->httpRequest = $factory->createHttpRequest();
-			Nette\Http\Helpers::initCookie($this->httpRequest, new Nette\Http\Response);
+			self::initialize();
+			$this->httpRequest = self::$defaultHttpRequest;
 		}
 		return $this->httpRequest;
 	}

diff --git a/tests/Forms/Container.values.ArrayHash.phpt b/tests/Forms/Container.values.ArrayHash.phpt
@@ -24,6 +24,8 @@ $_POST = [
 
 function createForm(): Form
 {
+	Form::initialize(true);
+
 	$form = new Form;
 	$form->addText('title');
 

diff --git a/tests/Forms/Container.values.array.phpt b/tests/Forms/Container.values.array.phpt
@@ -24,6 +24,8 @@ $_POST = [
 
 function createForm(): Form
 {
+	Form::initialize(true);
+
 	$form = new Form;
 	$form->addText('title');
 

diff --git a/tests/Forms/Container.values.mapping.phpt b/tests/Forms/Container.values.mapping.phpt
@@ -64,6 +64,8 @@ $_POST = [
 
 function createForm(): Form
 {
+	Form::initialize(true);
+
 	$form = new Form;
 	$form->addText('title');
 

diff --git a/tests/Forms/Controls.BaseControl.phpt b/tests/Forms/Controls.BaseControl.phpt
@@ -14,6 +14,11 @@ use Tester\Assert;
 require __DIR__ . '/../bootstrap.php';
 
 
+before(function () {
+	Form::initialize(true);
+});
+
+
 test('error handling', function () {
 	$form = new Form;
 	$input = $form->addText('text')

diff --git a/tests/Forms/Controls.Button.loadData.phpt b/tests/Forms/Controls.Button.loadData.phpt
@@ -17,6 +17,7 @@ before(function () {
 	$_SERVER['REQUEST_METHOD'] = 'POST';
 	$_POST = $_FILES = [];
 	$_COOKIE[Nette\Http\Helpers::STRICT_COOKIE_NAME] = '1';
+	Form::initialize(true);
 });
 
 

diff --git a/tests/Forms/Controls.Checkbox.loadData.phpt b/tests/Forms/Controls.Checkbox.loadData.phpt
@@ -17,6 +17,7 @@ before(function () {
 	$_SERVER['REQUEST_METHOD'] = 'POST';
 	$_POST = $_FILES = [];
 	$_COOKIE[Nette\Http\Helpers::STRICT_COOKIE_NAME] = '1';
+	Form::initialize(true);
 });
 
 

diff --git a/tests/Forms/Controls.CheckboxList.loadData.phpt b/tests/Forms/Controls.CheckboxList.loadData.phpt
@@ -19,6 +19,7 @@ before(function () {
 	$_SERVER['REQUEST_METHOD'] = 'POST';
 	$_POST = $_FILES = [];
 	$_COOKIE[Nette\Http\Helpers::STRICT_COOKIE_NAME] = '1';
+	Form::initialize(true);
 });
 
 

diff --git a/tests/Forms/Controls.ChoiceControl.loadData.phpt b/tests/Forms/Controls.ChoiceControl.loadData.phpt
@@ -23,6 +23,7 @@ before(function () {
 	$_SERVER['REQUEST_METHOD'] = 'POST';
 	$_POST = $_FILES = [];
 	$_COOKIE[Nette\Http\Helpers::STRICT_COOKIE_NAME] = '1';
+	Form::initialize(true);
 });
 
 

diff --git a/tests/Forms/Controls.HiddenField.loadData.phpt b/tests/Forms/Controls.HiddenField.loadData.phpt
@@ -17,6 +17,7 @@ before(function () {
 	$_SERVER['REQUEST_METHOD'] = 'POST';
 	$_POST = $_FILES = [];
 	$_COOKIE[Nette\Http\Helpers::STRICT_COOKIE_NAME] = '1';
+	Form::initialize(true);
 });
 
 

diff --git a/tests/Forms/Controls.ImageButton.loadData.phpt b/tests/Forms/Controls.ImageButton.loadData.phpt
@@ -17,6 +17,7 @@ before(function () {
 	$_SERVER['REQUEST_METHOD'] = 'POST';
 	$_POST = $_FILES = [];
 	$_COOKIE[Nette\Http\Helpers::STRICT_COOKIE_NAME] = '1';
+	Form::initialize(true);
 });
 
 

diff --git a/tests/Forms/Controls.MultiChoiceControl.loadData.phpt b/tests/Forms/Controls.MultiChoiceControl.loadData.phpt
@@ -24,6 +24,7 @@ before(function () {
 	$_SERVER['REQUEST_METHOD'] = 'POST';
 	$_POST = $_FILES = [];
 	$_COOKIE[Nette\Http\Helpers::STRICT_COOKIE_NAME] = '1';
+	Form::initialize(true);
 });
 
 

diff --git a/tests/Forms/Controls.MultiSelectBox.loadData.phpt b/tests/Forms/Controls.MultiSelectBox.loadData.phpt
@@ -19,6 +19,7 @@ before(function () {
 	$_SERVER['REQUEST_METHOD'] = 'POST';
 	$_POST = $_FILES = [];
 	$_COOKIE[Nette\Http\Helpers::STRICT_COOKIE_NAME] = '1';
+	Form::initialize(true);
 });
 
 

diff --git a/tests/Forms/Controls.RadioList.loadData.phpt b/tests/Forms/Controls.RadioList.loadData.phpt
@@ -18,6 +18,7 @@ before(function () {
 	$_SERVER['REQUEST_METHOD'] = 'POST';
 	$_POST = $_FILES = [];
 	$_COOKIE[Nette\Http\Helpers::STRICT_COOKIE_NAME] = '1';
+	Form::initialize(true);
 });
 
 

diff --git a/tests/Forms/Controls.SelectBox.isOk.phpt b/tests/Forms/Controls.SelectBox.isOk.phpt
@@ -44,6 +44,7 @@ Assert::false($select->isOk());
 // error message is processed via Rules
 $_SERVER['REQUEST_METHOD'] = 'POST';
 $_COOKIE[Nette\Http\Helpers::STRICT_COOKIE_NAME] = '1';
+Form::initialize(true);
 Validator::$messages[Nette\Forms\Controls\SelectBox::VALID] = 'SelectBox "%label" must be filled.';
 $form = new Form;
 $form->addSelect('foo', 'Foo', ['bar' => 'Bar']);

diff --git a/tests/Forms/Controls.SelectBox.loadData.phpt b/tests/Forms/Controls.SelectBox.loadData.phpt
@@ -18,6 +18,7 @@ before(function () {
 	$_SERVER['REQUEST_METHOD'] = 'POST';
 	$_POST = $_FILES = [];
 	$_COOKIE[Nette\Http\Helpers::STRICT_COOKIE_NAME] = '1';
+	Form::initialize(true);
 });
 
 

diff --git a/tests/Forms/Controls.TextBase.loadData.phpt b/tests/Forms/Controls.TextBase.loadData.phpt
@@ -17,6 +17,7 @@ before(function () {
 	$_SERVER['REQUEST_METHOD'] = 'POST';
 	$_POST = $_FILES = [];
 	$_COOKIE[Nette\Http\Helpers::STRICT_COOKIE_NAME] = '1';
+	Form::initialize(true);
 });
 
 

diff --git a/tests/Forms/Forms.crossOrigin.phpt b/tests/Forms/Forms.crossOrigin.phpt
@@ -16,6 +16,7 @@ require __DIR__ . '/../bootstrap.php';
 before(function () {
 	$_SERVER['REQUEST_METHOD'] = 'POST';
 	$_GET = $_POST = $_FILES = $_COOKIE = [];
+	Form::initialize(true);
 });
 
 

diff --git a/tests/Forms/Forms.getHttpData.get.phpt b/tests/Forms/Forms.getHttpData.get.phpt
@@ -16,6 +16,7 @@ require __DIR__ . '/../bootstrap.php';
 before(function () {
 	$_SERVER['REQUEST_METHOD'] = 'GET';
 	$_GET = $_POST = $_FILES = [];
+	Form::initialize(true);
 });
 
 

diff --git a/tests/Forms/Forms.getHttpData.post.phpt b/tests/Forms/Forms.getHttpData.post.phpt
@@ -18,6 +18,7 @@ before(function () {
 	$_SERVER['REQUEST_METHOD'] = 'POST';
 	$_COOKIE[Nette\Http\Helpers::STRICT_COOKIE_NAME] = '1';
 	$_GET = $_POST = $_FILES = [];
+	Form::initialize(true);
 });
 
 
@@ -76,7 +77,10 @@ test('', function () {
 	$input = $form->addSubmit('send', 'Send');
 	Assert::false($input->isSubmittedBy());
 	Assert::false(Validator::validateSubmitted($input));
+});
+
 
+test('', function () {
 	$_POST = ['send' => ''];
 	$form = new Form;
 	$input = $form->addSubmit('send', 'Send');

diff --git a/tests/Forms/Forms.submittedBy.phpt b/tests/Forms/Forms.submittedBy.phpt
@@ -17,6 +17,7 @@ before(function () {
 	$_SERVER['REQUEST_METHOD'] = 'POST';
 	$_COOKIE[Nette\Http\Helpers::STRICT_COOKIE_NAME] = '1';
 	$_GET = $_POST = $_FILES = [];
+	Form::initialize(true);
 });