Skip to content

Commit 71c2a92

Browse files
committed
Merge branch 'hotfix/52' into develop
Forward port #52 Conflicts: CHANGELOG.md
2 parents 37f5e83 + 20a0e87 commit 71c2a92

File tree

2 files changed

+9
-4
lines changed

2 files changed

+9
-4
lines changed

CHANGELOG.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ All notable changes to this project will be documented in this file, in reverse
2020

2121
- Nothing.
2222

23-
## 1.2.3 - TBD
23+
## 1.2.3 - 2016-10-11
2424

2525
### Added
2626

@@ -41,6 +41,9 @@ All notable changes to this project will be documented in this file, in reverse
4141
- [#50](https://github.com/zfcampus/zf-apigility-documentation/pull/50) fixes
4242
escaping of field decriptions; previously, the template was improperly using
4343
`escapeTransformDescription()` instead of `agTransformDescription()`.
44+
- [#52](https://github.com/zfcampus/zf-apigility-documentation/pull/52) fixes
45+
output of fields when the `allows_only_fields_in_filter` parameter is present
46+
for an input filter.
4447

4548
## 1.2.2 - 2016-08-10
4649

src/ApiFactory.php

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -204,10 +204,12 @@ public function createService(Api $api, $serviceName)
204204
$fields = [];
205205
if (isset($this->config['zf-content-validation'][$serviceClassName])) {
206206
foreach ($this->config['zf-content-validation'][$serviceClassName] as $validatorKey => $validatorName) {
207-
foreach ($this->mapFields($this->config['input_filter_specs'][$validatorName]) as $fieldData) {
208-
$fields[$validatorKey][] = $this->getField($fieldData);
207+
if (isset($this->config['input_filter_specs'][$validatorName])) {
208+
foreach ($this->mapFields($this->config['input_filter_specs'][$validatorName]) as $fieldData) {
209+
$fields[$validatorKey][] = $this->getField($fieldData);
210+
}
211+
$hasFields = true;
209212
}
210-
$hasFields = true;
211213
}
212214
}
213215

0 commit comments

Comments
 (0)