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

added method to merge input filters #6431

Closed
wants to merge 10 commits into from
Closed

added method to merge input filters #6431

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
5fc5b4f
Merge conflicts resolved
brettminnie Jun 18, 2014
45da1cc
fixed formatting issue
brettminnie Jul 13, 2014
f48dd3a
Moved chain input filter to base class
brettminnie Jul 13, 2014
657a721
Update InputFilter.php
brettminnie Jul 15, 2014
14d0520
Update InputFilterTest.php
brettminnie Jul 15, 2014
e94e99c
Revert "Update InputFilterTest.php"
brettminnie Aug 5, 2014
2a3ef71
Revert "Update InputFilter.php"
brettminnie Aug 5, 2014
cf030c7
Removed extra new lines
brettminnie Aug 5, 2014
68405b0
Renamed chain method to merge, removed fluid interface on method
brettminnie Aug 5, 2014
95f59c8
Renamed mergeInputFilter to merge so it matches the input method name
brettminnie Nov 17, 2014
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
13 changes: 13 additions & 0 deletions library/Zend/InputFilter/BaseInputFilter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -684,4 +684,17 @@ public function getInputs()
{
return $this->inputs;
}

/**
* Merges the inputs from an InputFilter into the current one
*
* @param BaseInputFilter $inputFilter
* @return $this
*/
public function merge(BaseInputFilter $inputFilter)
{
foreach ($inputFilter->getInputs() as $name => $input) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What happens if the chained input filter is being changed afterwards?

This is more like "Merge" rather than "Chain". In a chain, I'd expect elements to keep interacting together after the chaining has happened: that's not the case here.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fair enough, in this case the method name as merge will make more sense

On Tue, Aug 5, 2014 at 1:04 PM, Marco Pivetta notifications@github.com
wrote:

In library/Zend/InputFilter/BaseInputFilter.php:

@@ -683,4 +683,18 @@ public function getInputs()
{
return $this->inputs;
}
+

  • /**
  • \* Chain the inputs from an InputFilter into the current one

  • *

  • \* @param BaseInputFilter $inputFilter

  • \* @return $this

  • */
  • public function chainInputFilter(BaseInputFilter $inputFilter)
  • {
  •    foreach ($inputFilter->getInputs() as $name => $input) {

What happens if the chained input filter is being changed afterwards?

This is more like "Merge" rather than "Chain". In a chain, I'd expect
elements to keep interacting together after the chaining has happened:
that's not the case here.

—
Reply to this email directly or view it on GitHub
https://github.com/zendframework/zf2/pull/6431/files#r15807663.

$this->add($input, $name);
}
}
}
21 changes: 21 additions & 0 deletions tests/ZendTest/InputFilter/BaseInputFilterTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -912,4 +912,25 @@ public function testPopulateSupportsArrayInputEvenIfDataMissing()
$filter->add($arrayInput, 'arrayInput');
$filter->setData(array('foo' => 'bar'));
}

public function testMerge()
{
$expectedFilters = array(
'foo',
'bar',
'baz'
);

$inputFilter = new InputFilter();
$chainedInputFilter = new InputFilter();

$inputFilter->add(new Input(), 'foo');
$inputFilter->add(new Input(), 'bar');

$chainedInputFilter->add(new Input(), 'baz');

$inputFilter->merge($chainedInputFilter);

$this->assertEquals($expectedFilters, array_keys($inputFilter->getInputs()));
}
}