Container: addImage() renamed to addImageButton()

Author: dg

src/Forms/Container.php

@@ -424,12 +424,19 @@ public function addButton(string $name, $caption = null): Controls\Button
 	 * @param  string  $src  URI of the image
 	 * @param  string  $alt  alternate text for the image
 	 */
-	public function addImage(string $name, string $src = null, string $alt = null): Controls\ImageButton
+	public function addImageButton(string $name, string $src = null, string $alt = null): Controls\ImageButton
 	{
 		return $this[$name] = new Controls\ImageButton($src, $alt);
 	}
 
 
+	/** @deprecated  use addImageButton() */
+	public function addImage(): Controls\ImageButton
+	{
+		return $this->addImageButton(...func_get_args());
+	}
+
+
 	/**
 	 * Adds naming container to the form.
 	 * @param  string|int  $name

tests/Forms/Controls.ImageButton.loadData.phpt

@@ -28,18 +28,18 @@ test('', function () {
 	];
 
 	$form = new Form;
-	$input = $form->addImage('image');
+	$input = $form->addImageButton('image');
 	Assert::true($input->isFilled());
 	Assert::same([1, 2], $input->getValue());
 
-	$input = $form->addContainer('container')->addImage('image');
+	$input = $form->addContainer('container')->addImageButton('image');
 	Assert::same([3, 4], $form['container']['image']->getValue());
 });
 
 
 test('missing data', function () {
 	$form = new Form;
-	$input = $form->addImage('missing');
+	$input = $form->addImageButton('missing');
 	Assert::false($input->isFilled());
 	Assert::null($input->getValue());
 });
@@ -52,11 +52,11 @@ test('malformed data', function () {
 	];
 
 	$form = new Form;
-	$input = $form->addImage('malformed1');
+	$input = $form->addImageButton('malformed1');
 	Assert::true($input->isFilled());
 	Assert::same([1, 0], $input->getValue());
 
-	$input = $form->addImage('malformed2');
+	$input = $form->addImageButton('malformed2');
 	Assert::false($input->isFilled());
 	Assert::null($input->getValue());
 });

tests/Forms/Controls.ImageButton.render.phpt

@@ -25,7 +25,7 @@ class Translator implements Nette\Localization\ITranslator
 
 test('', function () {
 	$form = new Form;
-	$input = $form->addImage('button', 'image.gif');
+	$input = $form->addImageButton('button', 'image.gif');
 
 	Assert::null($input->getLabel());
 	Assert::type(Html::class, $input->getControl());
@@ -35,7 +35,7 @@ test('', function () {
 
 test('translator', function () {
 	$form = new Form;
-	$input = $form->addImage('button', 'image.gif');
+	$input = $form->addImageButton('button', 'image.gif');
 	$input->setTranslator(new Translator);
 
 	Assert::same('<input type="image" name="button[]" src="image.gif">', (string) $input->getControl());
@@ -44,7 +44,7 @@ test('translator', function () {
 
 test('no validation rules', function () {
 	$form = new Form;
-	$input = $form->addImage('button', 'image.gif')->setRequired('required');
+	$input = $form->addImageButton('button', 'image.gif')->setRequired('required');
 
 	Assert::same('<input type="image" name="button[]" src="image.gif">', (string) $input->getControl());
 });
@@ -53,15 +53,15 @@ test('no validation rules', function () {
 test('container', function () {
 	$form = new Form;
 	$container = $form->addContainer('container');
-	$input = $container->addImage('button', 'image.gif');
+	$input = $container->addImageButton('button', 'image.gif');
 
 	Assert::same('<input type="image" name="container[button][]" src="image.gif">', (string) $input->getControl());
 });
 
 
 test('rendering options', function () {
 	$form = new Form;
-	$input = $form->addImage('button');
+	$input = $form->addImageButton('button');
 
 	Assert::same('button', $input->getOption('type'));
 

tests/Forms/Forms.submittedBy.phpt

@@ -38,9 +38,9 @@ test('', function () {
 	$_POST = [Form::TRACKER_ID => $name, 'send2' => ['x' => '1', 'y' => '1']];
 
 	$form = new Form($name);
-	$btn1 = $form->addImage('send1');
-	$btn2 = $form->addImage('send2');
-	$btn3 = $form->addImage('send3');
+	$btn1 = $form->addImageButton('send1');
+	$btn2 = $form->addImageButton('send2');
+	$btn3 = $form->addImageButton('send3');
 
 	Assert::true($form->isSuccess());
 	Assert::same($btn2, $form->isSubmitted());