Skip to content
This repository has been archived by the owner on Jan 30, 2020. It is now read-only.

Commit

Permalink
Merge branch 'hotfix/235'
Browse files Browse the repository at this point in the history
Close #235
  • Loading branch information
michalbundyra committed Oct 4, 2019
2 parents 507bac2 + 382ff1f commit d75da0e
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 2 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ All notable changes to this project will be documented in this file, in reverse

### Fixed

- Nothing.
- [#235](https://github.com/zendframework/zend-form/pull/235) fixes PHP 7.4 compatibility.

## 2.14.2 - 2019-10-03

Expand Down
7 changes: 6 additions & 1 deletion src/Form.php
Original file line number Diff line number Diff line change
Expand Up @@ -364,7 +364,12 @@ public function bindValues(array $values = [], array $validationGroup = null)
$data = array_key_exists($this->baseFieldset->getName(), $data)
? $data[$this->baseFieldset->getName()]
: [];
$this->object = $this->baseFieldset->bindValues($data, $validationGroup[$this->baseFieldset->getName()]);
$this->object = $this->baseFieldset->bindValues(
$data,
isset($validationGroup[$this->baseFieldset->getName()])
? $validationGroup[$this->baseFieldset->getName()]
: []
);
} else {
$this->object = parent::bindValues($data, $validationGroup);
}
Expand Down

0 comments on commit d75da0e

Please sign in to comment.