used first-class callables

dg · dg · commit 56284a8fdf9b · 2026-01-04T06:16:12.000+01:00
diff --git a/best-practices/cs/creating-editing-form.texy b/best-practices/cs/creating-editing-form.texy
@@ -29,11 +29,11 @@ class RecordPresenter extends Nette\Application\UI\Presenter
 
 		// ... přidáme políčka formuláře ...
 
-		$form->onSuccess[] = [$this, 'recordFormSucceeded'];
+		$form->onSuccess[] = $this->recordFormSucceeded(...);
 		return $form;
 	}
 
-	public function recordFormSucceeded(Form $form, array $data): void
+	private function recordFormSucceeded(Form $form, array $data): void
 	{
 		$this->facade->add($data); // přidání záznamu do databáze
 		$this->flashMessage('Successfully added');
@@ -91,11 +91,11 @@ class RecordPresenter extends Nette\Application\UI\Presenter
 		// ... přidáme políčka formuláře ...
 
 		$form->setDefaults($this->record); // nastavení výchozích hodnot
-		$form->onSuccess[] = [$this, 'recordFormSucceeded'];
+		$form->onSuccess[] = $this->recordFormSucceeded(...);
 		return $form;
 	}
 
-	public function recordFormSucceeded(Form $form, array $data): void
+	private function recordFormSucceeded(Form $form, array $data): void
 	{
 		$this->facade->update($this->record->id, $data); // aktualizace záznamu
 		$this->flashMessage('Successfully updated');
@@ -153,7 +153,7 @@ class RecordPresenter extends Nette\Application\UI\Presenter
 	public function actionAdd(): void
 	{
 		$form = $this->getComponent('recordForm');
-		$form->onSuccess[] = [$this, 'addingFormSucceeded'];
+		$form->onSuccess[] = $this->addingFormSucceeded(...);
 	}
 
 	public function actionEdit(int $id): void
@@ -168,7 +168,7 @@ class RecordPresenter extends Nette\Application\UI\Presenter
 
 		$form = $this->getComponent('recordForm');
 		$form->setDefaults($record); // nastavení výchozích hodnot
-		$form->onSuccess[] = [$this, 'editingFormSucceeded'];
+		$form->onSuccess[] = $this->editingFormSucceeded(...);
 	}
 
 	protected function createComponentRecordForm(): Form
@@ -185,14 +185,14 @@ class RecordPresenter extends Nette\Application\UI\Presenter
 		return $form;
 	}
 
-	public function addingFormSucceeded(Form $form, array $data): void
+	private function addingFormSucceeded(Form $form, array $data): void
 	{
 		$this->facade->add($data); // přidání záznamu do databáze
 		$this->flashMessage('Successfully added');
 		$this->redirect('...');
 	}
 
-	public function editingFormSucceeded(Form $form, array $data): void
+	private function editingFormSucceeded(Form $form, array $data): void
 	{
 		$id = (int) $this->getParameter('id');
 		$this->facade->update($id, $data); // aktualizace záznamu
diff --git a/best-practices/cs/form-reuse.texy b/best-practices/cs/form-reuse.texy
@@ -193,11 +193,11 @@ class EditFormFactory
 		$form->addText('title', 'Titulek:');
 		// zde se přidávají další formulářová pole
 		$form->addSubmit('send', 'Odeslat');
-		$form->onSuccess[] = [$this, 'processForm'];
+		$form->onSuccess[] = $this->processForm(...);
 		return $form;
 	}
 
-	public function processForm(Form $form, array $data): void
+	private function processForm(Form $form, array $data): void
 	{
 		try {
 			// zpracování odeslaných dat
@@ -284,12 +284,12 @@ class EditControl extends Nette\Application\UI\Control
 		$form->addText('title', 'Titulek:');
 		// zde se přidávají další formulářová pole
 		$form->addSubmit('send', 'Odeslat');
-		$form->onSuccess[] = [$this, 'processForm'];
+		$form->onSuccess[] = $this->processForm(...);
 
 		return $form;
 	}
 
-	public function processForm(Form $form, array $data): void
+	private function processForm(Form $form, array $data): void
 	{
 		try {
 			// zpracování odeslaných dat
diff --git a/best-practices/cs/lets-create-contact-form.texy b/best-practices/cs/lets-create-contact-form.texy
@@ -24,11 +24,11 @@ class HomePresenter extends Presenter
 		$form->addTextarea('message', 'Zpráva:')
 			->setRequired('Zadejte zprávu');
 		$form->addSubmit('send', 'Odeslat');
-		$form->onSuccess[] = [$this, 'contactFormSucceeded'];
+		$form->onSuccess[] = $this->contactFormSucceeded(...);
 		return $form;
 	}
 
-	public function contactFormSucceeded(Form $form, $data): void
+	private function contactFormSucceeded(Form $form, $data): void
 	{
 		// odeslání emailu
 	}
diff --git a/best-practices/cs/restore-request.texy b/best-practices/cs/restore-request.texy
@@ -41,11 +41,11 @@ class SignPresenter extends Nette\Application\UI\Presenter
 	{
 		$form = new Nette\Application\UI\Form;
 		// ... přidáme políčka formuláře ...
-		$form->onSuccess[] = [$this, 'signInFormSubmitted'];
+		$form->onSuccess[] = $this->signInFormSubmitted(...);
 		return $form;
 	}
 
-	public function signInFormSubmitted($form)
+	private function signInFormSubmitted($form)
 	{
 		// ... tady uživatele přihlásíme ...
 
diff --git a/best-practices/en/creating-editing-form.texy b/best-practices/en/creating-editing-form.texy
@@ -29,11 +29,11 @@ class RecordPresenter extends Nette\Application\UI\Presenter
 
 		// ... add form fields ...
 
-		$form->onSuccess[] = [$this, 'recordFormSucceeded'];
+		$form->onSuccess[] = $this->recordFormSucceeded(...);
 		return $form;
 	}
 
-	public function recordFormSucceeded(Form $form, array $data): void
+	private function recordFormSucceeded(Form $form, array $data): void
 	{
 		$this->facade->add($data); // add record to the database
 		$this->flashMessage('Successfully added');
@@ -91,11 +91,11 @@ class RecordPresenter extends Nette\Application\UI\Presenter
 		// ... add form fields ...
 
 		$form->setDefaults($this->record); // set default values
-		$form->onSuccess[] = [$this, 'recordFormSucceeded'];
+		$form->onSuccess[] = $this->recordFormSucceeded(...);
 		return $form;
 	}
 
-	public function recordFormSucceeded(Form $form, array $data): void
+	private function recordFormSucceeded(Form $form, array $data): void
 	{
 		$this->facade->update($this->record->id, $data); // update record
 		$this->flashMessage('Successfully updated');
@@ -153,7 +153,7 @@ class RecordPresenter extends Nette\Application\UI\Presenter
 	public function actionAdd(): void
 	{
 		$form = $this->getComponent('recordForm');
-		$form->onSuccess[] = [$this, 'addingFormSucceeded'];
+		$form->onSuccess[] = $this->addingFormSucceeded(...);
 	}
 
 	public function actionEdit(int $id): void
@@ -168,7 +168,7 @@ class RecordPresenter extends Nette\Application\UI\Presenter
 
 		$form = $this->getComponent('recordForm');
 		$form->setDefaults($record); // set default values
-		$form->onSuccess[] = [$this, 'editingFormSucceeded'];
+		$form->onSuccess[] = $this->editingFormSucceeded(...);
 	}
 
 	protected function createComponentRecordForm(): Form
@@ -185,14 +185,14 @@ class RecordPresenter extends Nette\Application\UI\Presenter
 		return $form;
 	}
 
-	public function addingFormSucceeded(Form $form, array $data): void
+	private function addingFormSucceeded(Form $form, array $data): void
 	{
 		$this->facade->add($data); // add record to the database
 		$this->flashMessage('Successfully added');
 		$this->redirect('...');
 	}
 
-	public function editingFormSucceeded(Form $form, array $data): void
+	private function editingFormSucceeded(Form $form, array $data): void
 	{
 		$id = (int) $this->getParameter('id');
 		$this->facade->update($id, $data); // update record
diff --git a/best-practices/en/form-reuse.texy b/best-practices/en/form-reuse.texy
@@ -193,11 +193,11 @@ class EditFormFactory
 		$form->addText('title', 'Title:');
 		// additional form fields are added here
 		$form->addSubmit('send', 'Save');
-		$form->onSuccess[] = [$this, 'processForm'];
+		$form->onSuccess[] = $this->processForm(...);
 		return $form;
 	}
 
-	public function processForm(Form $form, array $data): void
+	private function processForm(Form $form, array $data): void
 	{
 		try {
 			// processing of submitted data
@@ -284,12 +284,12 @@ class EditControl extends Nette\Application\UI\Control
 		$form->addText('title', 'Title:');
 		// additional form fields are added here
 		$form->addSubmit('send', 'Save');
-		$form->onSuccess[] = [$this, 'processForm'];
+		$form->onSuccess[] = $this->processForm(...);
 
 		return $form;
 	}
 
-	public function processForm(Form $form, array $data): void
+	private function processForm(Form $form, array $data): void
 	{
 		try {
 			// processing of submitted data
diff --git a/best-practices/en/lets-create-contact-form.texy b/best-practices/en/lets-create-contact-form.texy
@@ -24,11 +24,11 @@ class HomePresenter extends Presenter
 		$form->addTextarea('message', 'Message:')
 			->setRequired('Please enter a message');
 		$form->addSubmit('send', 'Send');
-		$form->onSuccess[] = [$this, 'contactFormSucceeded'];
+		$form->onSuccess[] = $this->contactFormSucceeded(...);
 		return $form;
 	}
 
-	public function contactFormSucceeded(Form $form, $data): void
+	private function contactFormSucceeded(Form $form, $data): void
 	{
 		// sending an email
 	}
diff --git a/best-practices/en/restore-request.texy b/best-practices/en/restore-request.texy
@@ -41,11 +41,11 @@ class SignPresenter extends Nette\Application\UI\Presenter
 	{
 		$form = new Nette\Application\UI\Form;
 		// ... add form fields ...
-		$form->onSuccess[] = [$this, 'signInFormSubmitted'];
+		$form->onSuccess[] = $this->signInFormSubmitted(...);
 		return $form;
 	}
 
-	public function signInFormSubmitted($form)
+	private function signInFormSubmitted($form)
 	{
 		// ... log the user in here ...
 
diff --git a/dependency-injection/cs/services.texy b/dependency-injection/cs/services.texy
@@ -181,7 +181,7 @@ public function createServiceFoo(): Foo
 {
 	$service = new Foo;
 	$service->value = 123;
-	$service->onClick[] = [$this->getService('bar'), 'clickHandler'];
+	$service->onClick[] = $this->getService('bar')->clickHandler(...);
 	return $service;
 }
 ```
diff --git a/dependency-injection/en/services.texy b/dependency-injection/en/services.texy
@@ -181,7 +181,7 @@ public function createServiceFoo(): Foo
 {
 	$service = new Foo;
 	$service->value = 123;
-	$service->onClick[] = [$this->getService('bar'), 'clickHandler'];
+	$service->onClick[] = $this->getService('bar')->clickHandler(...);
 	return $service;
 }
 ```
diff --git a/forms/cs/in-presenter.texy b/forms/cs/in-presenter.texy
@@ -19,7 +19,7 @@ $form = new Form;
 $form->addText('name', 'Jméno:');
 $form->addPassword('password', 'Heslo:');
 $form->addSubmit('send', 'Registrovat');
-$form->onSuccess[] = [$this, 'formSucceeded'];
+$form->onSuccess[] = $this->formSucceeded(...);
 ```
 
 a v prohlížeči se zobrazí takto:
@@ -42,11 +42,11 @@ class HomePresenter extends Nette\Application\UI\Presenter
 		$form->addText('name', 'Jméno:');
 		$form->addPassword('password', 'Heslo:');
 		$form->addSubmit('send', 'Registrovat');
-		$form->onSuccess[] = [$this, 'formSucceeded'];
+		$form->onSuccess[] = $this->formSucceeded(...);
 		return $form;
 	}
 
-	public function formSucceeded(Form $form, $data): void
+	private function formSucceeded(Form $form, $data): void
 	{
 		// tady zpracujeme data odeslaná formulářem
 		// $data->name obsahuje jméno
@@ -303,16 +303,16 @@ Pokud má formulář více než jedno tlačítko, potřebujeme zpravidla rozliš
 
 ```php
 $form->addSubmit('save', 'Uložit')
-	->onClick[] = [$this, 'saveButtonPressed'];
+	->onClick[] = $this->saveButtonPressed(...);
 
 $form->addSubmit('delete', 'Smazat')
-	->onClick[] = [$this, 'deleteButtonPressed'];
+	->onClick[] = $this->deleteButtonPressed(...);
 ```
 
 Tyto handlery se volají pouze v případě validně vyplněného formuláře, stejně jako v případě události `onSuccess`. Rozdíl je v tom, že jako první parametr se místo formulář může předat odesílací tlačítko, záleží na typu, který uvedete:
 
 ```php
-public function saveButtonPressed(Nette\Forms\Controls\Button $button, $data)
+private function saveButtonPressed(Nette\Forms\Controls\Button $button, $data)
 {
 	$form = $button->getForm();
 	// ...
@@ -403,7 +403,7 @@ protected function createComponentSignInForm(): Form
 	$form = $this->formFactory->create();
 	// můžeme formulář pozměnit, zde například měníme popisku na tlačítku
 	$form['send']->setCaption('Pokračovat');
-	$form->onSuccess[] = [$this, 'signInFormSuceeded']; // a přidáme handler
+	$form->onSuccess[] = $this->signInFormSuceeded(...); // a přidáme handler
 	return $form;
 }
 ```
diff --git a/forms/cs/validation.texy b/forms/cs/validation.texy
@@ -223,11 +223,11 @@ protected function createComponentSignInForm(): Form
 {
 	$form = new Form;
 	// ...
-	$form->onValidate[] = [$this, 'validateSignInForm'];
+	$form->onValidate[] = $this->validateSignInForm(...);
 	return $form;
 }
 
-public function validateSignInForm(Form $form, \stdClass $data): void
+private function validateSignInForm(Form $form, \stdClass $data): void
 {
 	if ($data->foo > 1 && $data->bar > 5) {
 		$form->addError('Tato kombinace není možná.');
diff --git a/forms/en/in-presenter.texy b/forms/en/in-presenter.texy
@@ -19,14 +19,14 @@ $form = new Form;
 $form->addText('name', 'Name:');
 $form->addPassword('password', 'Password:');
 $form->addSubmit('send', 'Sign up');
-$form->onSuccess[] = [$this, 'formSucceeded'];
+$form->onSuccess[] = $this->formSucceeded(...);
 ```
 
 and in the browser, it will be displayed like this:
 
 [* form-en.webp *]
 
-A form in a presenter is an object of the `Nette\Application\UI\Form` class; its predecessor `Nette\Forms\Form` is intended for standalone use. We added controls named name, password, and a submit button. Finally, the line `$form->onSuccess[] = [$this, 'formSucceeded'];` states that after submission and successful validation, the method `$this->formSucceeded()` should be called.
+A form in a presenter is an object of the `Nette\Application\UI\Form` class; its predecessor `Nette\Forms\Form` is intended for standalone use. We added controls named name, password, and a submit button. Finally, the line `$form->onSuccess` states that after submission and successful validation, the method `$this->formSucceeded()` should be called.
 
 From the presenter's perspective, the form is a regular component. Therefore, it is treated as a component and integrated into the presenter using a [factory method |application:components#Factory Methods]. It will look like this:
 
@@ -42,11 +42,11 @@ class HomePresenter extends Nette\Application\UI\Presenter
 		$form->addText('name', 'Name:');
 		$form->addPassword('password', 'Password:');
 		$form->addSubmit('send', 'Sign up');
-		$form->onSuccess[] = [$this, 'formSucceeded'];
+		$form->onSuccess[] = $this->formSucceeded(...);
 		return $form;
 	}
 
-	public function formSucceeded(Form $form, $data): void
+	private function formSucceeded(Form $form, $data): void
 	{
 		// here we will process the data sent by the form
 		// $data->name contains name
@@ -303,16 +303,16 @@ If the form has more than one button, we usually need to distinguish which one w
 
 ```php
 $form->addSubmit('save', 'Save')
-	->onClick[] = [$this, 'saveButtonPressed'];
+	->onClick[] = $this->saveButtonPressed(...);
 
 $form->addSubmit('delete', 'Delete')
-	->onClick[] = [$this, 'deleteButtonPressed'];
+	->onClick[] = $this->deleteButtonPressed(...);
 ```
 
 These handlers are called only if the form is validly filled (unless validation is disabled for the button), just like the `onSuccess` event. The difference is that the first parameter passed can be the submit button object instead of the form, depending on the type hint you specify:
 
 ```php
-public function saveButtonPressed(Nette\Forms\Controls\Button $button, $data)
+private function saveButtonPressed(Nette\Forms\Controls\Button $button, $data)
 {
 	$form = $button->getForm();
 	// ...
@@ -403,7 +403,7 @@ protected function createComponentSignInForm(): Form
 	$form = $this->formFactory->create();
 	// we can change the form, here for example we change the label on the button
 	$form['login']->setCaption('Continue');
-	$form->onSuccess[] = [$this, 'signInFormSubmitted']; // and add handler
+	$form->onSuccess[] = $this->signInFormSubmitted(...); // and add handler
 	return $form;
 }
 ```
diff --git a/forms/en/validation.texy b/forms/en/validation.texy
@@ -223,11 +223,11 @@ protected function createComponentSignInForm(): Form
 {
 	$form = new Form;
 	// ...
-	$form->onValidate[] = [$this, 'validateSignInForm'];
+	$form->onValidate[] = $this->validateSignInForm(...);
 	return $form;
 }
 
-public function validateSignInForm(Form $form, \stdClass $data): void
+private function validateSignInForm(Form $form, \stdClass $data): void
 {
 	if ($data->foo > 1 && $data->bar > 5) {
 		$form->addError('This combination is not possible.');

Original file line number	Diff line number	Diff line change
`@@ -29,11 +29,11 @@ class RecordPresenter extends Nette\Application\UI\Presenter`
`29`	`29`
`30`	`30`	`// ... přidáme políčka formuláře ...`
`31`	`31`
`32`		`- $form->onSuccess[] = [$this, 'recordFormSucceeded'];`
	`32`	`+ $form->onSuccess[] = $this->recordFormSucceeded(...);`
`33`	`33`	`return $form;`
`34`	`34`	`}`
`35`	`35`
`36`		`- public function recordFormSucceeded(Form $form, array $data): void`
	`36`	`+ private function recordFormSucceeded(Form $form, array $data): void`
`37`	`37`	`{`
`38`	`38`	`$this->facade->add($data); // přidání záznamu do databáze`
`39`	`39`	`$this->flashMessage('Successfully added');`
`@@ -91,11 +91,11 @@ class RecordPresenter extends Nette\Application\UI\Presenter`
`91`	`91`	`// ... přidáme políčka formuláře ...`
`92`	`92`
`93`	`93`	`$form->setDefaults($this->record); // nastavení výchozích hodnot`
`94`		`- $form->onSuccess[] = [$this, 'recordFormSucceeded'];`
	`94`	`+ $form->onSuccess[] = $this->recordFormSucceeded(...);`
`95`	`95`	`return $form;`
`96`	`96`	`}`
`97`	`97`
`98`		`- public function recordFormSucceeded(Form $form, array $data): void`
	`98`	`+ private function recordFormSucceeded(Form $form, array $data): void`
`99`	`99`	`{`
`100`	`100`	`$this->facade->update($this->record->id, $data); // aktualizace záznamu`
`101`	`101`	`$this->flashMessage('Successfully updated');`
`@@ -153,7 +153,7 @@ class RecordPresenter extends Nette\Application\UI\Presenter`
`153`	`153`	`public function actionAdd(): void`
`154`	`154`	`{`
`155`	`155`	`$form = $this->getComponent('recordForm');`
`156`		`- $form->onSuccess[] = [$this, 'addingFormSucceeded'];`
	`156`	`+ $form->onSuccess[] = $this->addingFormSucceeded(...);`
`157`	`157`	`}`
`158`	`158`
`159`	`159`	`public function actionEdit(int $id): void`
`@@ -168,7 +168,7 @@ class RecordPresenter extends Nette\Application\UI\Presenter`
`168`	`168`
`169`	`169`	`$form = $this->getComponent('recordForm');`
`170`	`170`	`$form->setDefaults($record); // nastavení výchozích hodnot`
`171`		`- $form->onSuccess[] = [$this, 'editingFormSucceeded'];`
	`171`	`+ $form->onSuccess[] = $this->editingFormSucceeded(...);`
`172`	`172`	`}`
`173`	`173`
`174`	`174`	`protected function createComponentRecordForm(): Form`
`@@ -185,14 +185,14 @@ class RecordPresenter extends Nette\Application\UI\Presenter`
`185`	`185`	`return $form;`
`186`	`186`	`}`
`187`	`187`
`188`		`- public function addingFormSucceeded(Form $form, array $data): void`
	`188`	`+ private function addingFormSucceeded(Form $form, array $data): void`
`189`	`189`	`{`
`190`	`190`	`$this->facade->add($data); // přidání záznamu do databáze`
`191`	`191`	`$this->flashMessage('Successfully added');`
`192`	`192`	`$this->redirect('...');`
`193`	`193`	`}`
`194`	`194`
`195`		`- public function editingFormSucceeded(Form $form, array $data): void`
	`195`	`+ private function editingFormSucceeded(Form $form, array $data): void`
`196`	`196`	`{`
`197`	`197`	`$id = (int) $this->getParameter('id');`
`198`	`198`	`$this->facade->update($id, $data); // aktualizace záznamu`
Original file line number	Diff line number	Diff line change
`@@ -24,11 +24,11 @@ class HomePresenter extends Presenter`
`24`	`24`	`$form->addTextarea('message', 'Zpráva:')`
`25`	`25`	`->setRequired('Zadejte zprávu');`
`26`	`26`	`$form->addSubmit('send', 'Odeslat');`
`27`		`- $form->onSuccess[] = [$this, 'contactFormSucceeded'];`
	`27`	`+ $form->onSuccess[] = $this->contactFormSucceeded(...);`
`28`	`28`	`return $form;`
`29`	`29`	`}`
`30`	`30`
`31`		`- public function contactFormSucceeded(Form $form, $data): void`
	`31`	`+ private function contactFormSucceeded(Form $form, $data): void`
`32`	`32`	`{`
`33`	`33`	`// odeslání emailu`
`34`	`34`	`}`
Original file line number	Diff line number	Diff line change
`@@ -41,11 +41,11 @@ class SignPresenter extends Nette\Application\UI\Presenter`
`41`	`41`	`{`
`42`	`42`	`$form = new Nette\Application\UI\Form;`
`43`	`43`	`// ... přidáme políčka formuláře ...`
`44`		`- $form->onSuccess[] = [$this, 'signInFormSubmitted'];`
	`44`	`+ $form->onSuccess[] = $this->signInFormSubmitted(...);`
`45`	`45`	`return $form;`
`46`	`46`	`}`
`47`	`47`
`48`		`- public function signInFormSubmitted($form)`
	`48`	`+ private function signInFormSubmitted($form)`
`49`	`49`	`{`
`50`	`50`	`// ... tady uživatele přihlásíme ...`
`51`	`51`
Original file line number	Diff line number	Diff line change
`@@ -181,7 +181,7 @@ public function createServiceFoo(): Foo`
`181`	`181`	`{`
`182`	`182`	`$service = new Foo;`
`183`	`183`	`$service->value = 123;`
`184`		`- $service->onClick[] = [$this->getService('bar'), 'clickHandler'];`
	`184`	`+ $service->onClick[] = $this->getService('bar')->clickHandler(...);`
`185`	`185`	`return $service;`
`186`	`186`	`}`
`187`	`187`	```