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

pass configured input filter plugin manager to generated input filter factories #77

Closed
wants to merge 1 commit into from
Closed

pass configured input filter plugin manager to generated input filter factories #77

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 17 additions & 0 deletions src/InputFilterAbstractServiceFactory.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,10 @@ protected function getInputFilterFactory(ServiceLocatorInterface $services)
->getDefaultValidatorChain()
->setPluginManager($this->getValidatorPluginManager($services));

if ($services->has('FilterManager') && $services->has('ValidatorManager')) {
$this->factory->setInputFilterManager($this->getInputFilterPluginManager($services));
}

return $this->factory;
}

Expand Down Expand Up @@ -109,4 +113,17 @@ protected function getValidatorPluginManager(ServiceLocatorInterface $services)

return new ValidatorPluginManager();
}

/**
* @param ServiceLocatorInterface $services
* @return InputFilterPluginManager
*/
protected function getInputFilterPluginManager(ServiceLocatorInterface $services)
{
if ($services->has('InputFilterManager')) {
return $services->get('InputFilterManager');
}

return new InputFilterPluginManager();
}
}
160 changes: 160 additions & 0 deletions test/InputFilterAbstractServiceFactoryTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,4 +170,164 @@ public function testRetrieveInputFilterFromInputFilterPluginManager()
$inputFilter = $this->services->get('InputFilterManager')->get('foobar');
$this->assertInstanceOf(InputFilterInterface::class, $inputFilter);
}

public function testRetrieveNestedInputFilterServiceFromInputFilterPluginManager()
{
$this->filters->addAbstractFactory($this->factory);

$this->services->setService('FilterManager', $filters = new FilterPluginManager());
$this->services->setService('ValidatorManager', $validators = new ValidatorPluginManager());
$this->services->setService('Config', [
'input_filter_specs' => [
'MyAddressFilter' => [
'city' => [
'name' => 'city',
'required' => true,
],
],
'MyPersonFilter' => [
'gender' => [
'name' => 'gender',
'required' => true,
],
'addresses' => [
'type' => \Zend\InputFilter\CollectionInputFilter::class,
'input_filter' => [
'type' => 'MyAddressFilter',
],
],
],
],
]);

$actual = $this->factory->createServiceWithName($this->filters, 'MyPersonFilter', 'MyPersonFilter');

$this->assertInstanceOf(InputFilterInterface::class, $actual);

$actual->setData([
'gender' => 'M',
'addresses' => [
[
'city' => 'Phoenix',
],
[
'city' => 'Tucson',
],
],
]);

$this->assertTrue($actual->isValid());
}

/**
* @depends testRetrieveNestedInputFilterServiceFromInputFilterPluginManager
* @expectedException \Zend\ServiceManager\Exception\ServiceNotFoundException
*/
public function testFactoryUsesDifferentInputFilterManagerDueToMissingFilterManager()
{
$this->filters->addAbstractFactory($this->factory);

$this->services->setService('ValidatorManager', $validators = new ValidatorPluginManager());
$this->services->setService('Config', [
'input_filter_specs' => [
'MyAddressFilter' => [
'city' => [
'name' => 'city',
'required' => true,
],
],
'MyPersonFilter' => [
'gender' => [
'name' => 'gender',
'required' => true,
],
'addresses' => [
'type' => \Zend\InputFilter\CollectionInputFilter::class,
'input_filter' => [
'type' => 'MyAddressFilter',
],
],
],
],
]);

$this->factory->createServiceWithName($this->filters, 'MyPersonFilter', 'MyPersonFilter');
}

/**
* @depends testRetrieveNestedInputFilterServiceFromInputFilterPluginManager
* @expectedException \Zend\ServiceManager\Exception\ServiceNotFoundException
*/
public function testFactoryUsesDifferentInputFilterManagerDueToMissingValidatorManager()
{
$this->filters->addAbstractFactory($this->factory);

$this->services->setService('FilterManager', $filters = new FilterPluginManager());
$this->services->setService('Config', [
'input_filter_specs' => [
'MyAddressFilter' => [
'city' => [
'name' => 'city',
'required' => true,
],
],
'MyPersonFilter' => [
'gender' => [
'name' => 'gender',
'required' => true,
],
'addresses' => [
'type' => \Zend\InputFilter\CollectionInputFilter::class,
'input_filter' => [
'type' => 'MyAddressFilter',
],
],
],
],
]);

$this->factory->createServiceWithName($this->filters, 'MyPersonFilter', 'MyPersonFilter');
}

/**
* @depends testRetrieveNestedInputFilterServiceFromInputFilterPluginManager
* @expectedException \Zend\ServiceManager\Exception\ServiceNotFoundException
*/
public function testFactoryUsesDifferentInputFilterManagerDueToMissingInputFilterManager()
{
$services = new ServiceManager();
$inputFilters = new InputFilterPluginManager();
$inputFilters->setServiceLocator($services);

$factory = new InputFilterAbstractServiceFactory();

$inputFilters->addAbstractFactory($factory);

$services->setService('FilterManager', $filters = new FilterPluginManager());
$services->setService('ValidatorManager', $validators = new ValidatorPluginManager());
$services->setService('Config', [
'input_filter_specs' => [
'MyAddressFilter' => [
'city' => [
'name' => 'city',
'required' => true,
],
],
'MyPersonFilter' => [
'gender' => [
'name' => 'gender',
'required' => true,
],
'addresses' => [
'type' => \Zend\InputFilter\CollectionInputFilter::class,
'input_filter' => [
'type' => 'MyAddressFilter',
],
],
],
],
]);

$factory->createServiceWithName($inputFilters, 'MyPersonFilter', 'MyPersonFilter');
}
}