Skip to content
This repository was archived by the owner on Feb 26, 2018. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions src/AdamWathan/Form/Elements/Element.php
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,15 @@ protected function splitKeysAndValues($array)
return [$keys, $values];
}

protected function setBooleanAttribute($attribute, $value)
{
if ($value) {
$this->setAttribute($attribute, $attribute);
} else {
$this->removeAttribute($attribute);
}
}

public function __call($method, $params)
{
$params = count($params) ? $params : [$method];
Expand Down
18 changes: 9 additions & 9 deletions src/AdamWathan/Form/Elements/FormControl.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ protected function setName($name)
$this->setAttribute('name', $name);
}

public function required()
public function required($conditional = true)
{
$this->setAttribute('required', 'required');

$this->setBooleanAttribute('required', $conditional);
return $this;
}

Expand All @@ -28,17 +28,17 @@ public function optional()
return $this;
}

public function disable()
public function disable($conditional = true)
{
$this->setAttribute('disabled', 'disabled');

$this->setBooleanAttribute('disabled', $conditional);
return $this;
}

public function readonly()
public function readonly($conditional = true)
{
$this->setAttribute('readonly', 'readonly');

$this->setBooleanAttribute('readonly', $conditional);
return $this;
}

Expand Down
27 changes: 27 additions & 0 deletions tests/InputContractTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,15 @@ public function testRequired()
$this->assertRegExp($this->elementRegExp('required="required"'), $result, $message);
}

public function testConditionalRequired()
{
$text = $this->newTestSubjectInstance('email');
$result = $text->required(false)->render();

$message = "required attribute shouldnt be set";
$this->assertNotRegExp($this->elementRegExp('required="required"'), $result, $message);
}

public function testAutofocus()
{
$text = $this->newTestSubjectInstance('');
Expand Down Expand Up @@ -77,6 +86,15 @@ public function testDisable()
$this->assertRegExp($this->elementRegExp('disabled="disabled"'), $result, $message);
}

public function testConditionalDisable()
{
$text = $this->newTestSubjectInstance('email');
$result = $text->required(false)->render();

$message = "disabled attribute shouldnt be set";
$this->assertNotRegExp($this->elementRegExp('disabled="disabled"'), $result, $message);
}

public function testReadyOnly()
{
$text = $this->newTestSubjectInstance('email');
Expand All @@ -86,6 +104,15 @@ public function testReadyOnly()
$this->assertRegExp($this->elementRegExp('readonly="readonly"'), $result, $message);
}

public function testConditionalReadyOnly()
{
$text = $this->newTestSubjectInstance('email');
$result = $text->required(false)->render();

$message = "readonly attribute shouldnt be set";
$this->assertNotRegExp($this->elementRegExp('readonly="readonly"'), $result, $message);
}

public function testEnableDisabled()
{
$pattern = 'disabled="disabled"';
Expand Down