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/zendframework/zendframework#7169-zendframework/z…
Browse files Browse the repository at this point in the history 
…endframework#6666-options-cannot-be-passed-to-separator-to-separator-filter'

Close zendframework/zendframework#7169
  • Loading branch information
@Ocramius
Ocramius committed Feb 2, 2015
139 parents f47ca61 + 797cb3c + 7df9cd3 + bc13fad + 90cc541 + 35ec740 + acfbbcd + 691454a + 3de0bd7 + 700917d + f10c3b2 + 4f82a12 + ba0d8a9 + c140dfc + 6c6a51d + 473be1c + 33a0274 + 56352fd + 8119cdf + 61d3103 + 4a23da8 + aed1a4d + d208606 + 3f667bd + 617a96b + ddb5852 + 6e16921 + 9418fac + 17b5ef4 + 846edfb + 216ac0e + aecb8f4 + ef44cf1 + bc4610b + 8c773ad + 0481606 + d1304e2 + d3d5a56 + 533570c + 6e30cb0 + 82c88d1 + 88c4f3b + c96ebb3 + f0320b1 + cb0afaa + 128be4b + 34cd6a3 + ec2aab9 + 809bd88 + 77026e3 + c2796da + 0ee8602 + bf4e728 + cd33c2d + 32497e5 + 79eb7d0 + 8cc5d58 + 869ab1c + 436e613 + ab7d56c + 6dbeef6 + 84670b1 + cccfba9 + 2717653 + b4dd364 + 460818e + b5ac15d + 2d218aa + 046d669 + 5597f80 + 98dc299 + 01b3149 + b0177b5 + 74f8270 + 62799e5 + 512426e + 5a9a928 + 3b3e691 + 6f57ae9 + 116cf37 + bb991fd + 1ce1893 + 5000327 + 32beb38 + fe88f0e + 49921e6 + 6387996 + 9623b87 + fef33e6 + a55293c + 37a7d0c + aeda378 + 1681df7 + 8557890 + 792de65 + 072f053 + fbc1502 + 482716d + 0da8a0e + 7d9112c + ca312d7 + cef4359 + 711d775 + 7826111 + 14b10f4 + 7b6700e + f304770 + 57e491b + c3425d2 + d591073 + 2235288 + d4694ac + 56d8e16 + 07f05df + 622531f + 641a66a + 4938b37 + 4bda1f3 + b1e478c + bf4b889 + fe09441 + b5e7532 + 149b9b1 + 90ed0aa + e6d18f9 + 3417ce7 + 6fe2e03 + c8263a5 + 163cb93 + c5ac758 + 477bd0b + fda1abb + 6b484d8 + 79a0d3d + 6fdffb1 + cf50c78 + a2b31ea + f374b87 + cc9937e commit eb8d23e
Show file tree
Hide file tree
Showing 3 changed files with 155 additions and 53 deletions.
115 changes: 62 additions & 53 deletions src/FilterPluginManager.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,65 +20,74 @@
*/
class FilterPluginManager extends AbstractPluginManager
{
/**
* Default set of plugins factories
*
* @var array
*/
protected $factories = array(
'wordseparatortoseparator' => 'Zend\Filter\Word\Service\SeparatorToSeparatorFactory',
);

/**
* Default set of filters
*
* @var array
*/
protected $invokableClasses = array(
'alnum' => 'Zend\I18n\Filter\Alnum',
'alpha' => 'Zend\I18n\Filter\Alpha',
'basename' => 'Zend\Filter\BaseName',
'boolean' => 'Zend\Filter\Boolean',
'callback' => 'Zend\Filter\Callback',
'compress' => 'Zend\Filter\Compress',
'compressbz2' => 'Zend\Filter\Compress\Bz2',
'compressgz' => 'Zend\Filter\Compress\Gz',
'compresslzf' => 'Zend\Filter\Compress\Lzf',
'compressrar' => 'Zend\Filter\Compress\Rar',
'compresssnappy' => 'Zend\Filter\Compress\Snappy',
'compresstar' => 'Zend\Filter\Compress\Tar',
'compresszip' => 'Zend\Filter\Compress\Zip',
'datetimeformatter' => 'Zend\Filter\DateTimeFormatter',
'decompress' => 'Zend\Filter\Decompress',
'decrypt' => 'Zend\Filter\Decrypt',
'digits' => 'Zend\Filter\Digits',
'dir' => 'Zend\Filter\Dir',
'encrypt' => 'Zend\Filter\Encrypt',
'encryptblockcipher' => 'Zend\Filter\Encrypt\BlockCipher',
'encryptopenssl' => 'Zend\Filter\Encrypt\Openssl',
'filedecrypt' => 'Zend\Filter\File\Decrypt',
'fileencrypt' => 'Zend\Filter\File\Encrypt',
'filelowercase' => 'Zend\Filter\File\LowerCase',
'filerename' => 'Zend\Filter\File\Rename',
'filerenameupload' => 'Zend\Filter\File\RenameUpload',
'fileuppercase' => 'Zend\Filter\File\UpperCase',
'htmlentities' => 'Zend\Filter\HtmlEntities',
'inflector' => 'Zend\Filter\Inflector',
'int' => 'Zend\Filter\Int',
'null' => 'Zend\Filter\Null',
'numberformat' => 'Zend\I18n\Filter\NumberFormat',
'numberparse' => 'Zend\I18n\Filter\NumberParse',
'pregreplace' => 'Zend\Filter\PregReplace',
'realpath' => 'Zend\Filter\RealPath',
'stringtolower' => 'Zend\Filter\StringToLower',
'stringtoupper' => 'Zend\Filter\StringToUpper',
'stringtrim' => 'Zend\Filter\StringTrim',
'stripnewlines' => 'Zend\Filter\StripNewlines',
'striptags' => 'Zend\Filter\StripTags',
'urinormalize' => 'Zend\Filter\UriNormalize',
'wordcamelcasetodash' => 'Zend\Filter\Word\CamelCaseToDash',
'wordcamelcasetoseparator' => 'Zend\Filter\Word\CamelCaseToSeparator',
'wordcamelcasetounderscore' => 'Zend\Filter\Word\CamelCaseToUnderscore',
'worddashtocamelcase' => 'Zend\Filter\Word\DashToCamelCase',
'worddashtoseparator' => 'Zend\Filter\Word\DashToSeparator',
'worddashtounderscore' => 'Zend\Filter\Word\DashToUnderscore',
'wordseparatortocamelcase' => 'Zend\Filter\Word\SeparatorToCamelCase',
'wordseparatortodash' => 'Zend\Filter\Word\SeparatorToDash',
'wordseparatortoseparator' => 'Zend\Filter\Word\SeparatorToSeparator',
'wordunderscoretocamelcase' => 'Zend\Filter\Word\UnderscoreToCamelCase',
'wordunderscoretodash' => 'Zend\Filter\Word\UnderscoreToDash',
'wordunderscoretoseparator' => 'Zend\Filter\Word\UnderscoreToSeparator',
'alnum' => 'Zend\I18n\Filter\Alnum',
'alpha' => 'Zend\I18n\Filter\Alpha',
'basename' => 'Zend\Filter\BaseName',
'boolean' => 'Zend\Filter\Boolean',
'callback' => 'Zend\Filter\Callback',
'compress' => 'Zend\Filter\Compress',
'compressbz2' => 'Zend\Filter\Compress\Bz2',
'compressgz' => 'Zend\Filter\Compress\Gz',
'compresslzf' => 'Zend\Filter\Compress\Lzf',
'compressrar' => 'Zend\Filter\Compress\Rar',
'compresssnappy' => 'Zend\Filter\Compress\Snappy',
'compresstar' => 'Zend\Filter\Compress\Tar',
'compresszip' => 'Zend\Filter\Compress\Zip',
'datetimeformatter' => 'Zend\Filter\DateTimeFormatter',
'decompress' => 'Zend\Filter\Decompress',
'decrypt' => 'Zend\Filter\Decrypt',
'digits' => 'Zend\Filter\Digits',
'dir' => 'Zend\Filter\Dir',
'encrypt' => 'Zend\Filter\Encrypt',
'encryptblockcipher' => 'Zend\Filter\Encrypt\BlockCipher',
'encryptopenssl' => 'Zend\Filter\Encrypt\Openssl',
'filedecrypt' => 'Zend\Filter\File\Decrypt',
'fileencrypt' => 'Zend\Filter\File\Encrypt',
'filelowercase' => 'Zend\Filter\File\LowerCase',
'filerename' => 'Zend\Filter\File\Rename',
'filerenameupload' => 'Zend\Filter\File\RenameUpload',
'fileuppercase' => 'Zend\Filter\File\UpperCase',
'htmlentities' => 'Zend\Filter\HtmlEntities',
'inflector' => 'Zend\Filter\Inflector',
'int' => 'Zend\Filter\Int',
'null' => 'Zend\Filter\Null',
'numberformat' => 'Zend\I18n\Filter\NumberFormat',
'numberparse' => 'Zend\I18n\Filter\NumberParse',
'pregreplace' => 'Zend\Filter\PregReplace',
'realpath' => 'Zend\Filter\RealPath',
'stringtolower' => 'Zend\Filter\StringToLower',
'stringtoupper' => 'Zend\Filter\StringToUpper',
'stringtrim' => 'Zend\Filter\StringTrim',
'stripnewlines' => 'Zend\Filter\StripNewlines',
'striptags' => 'Zend\Filter\StripTags',
'urinormalize' => 'Zend\Filter\UriNormalize',
'wordcamelcasetodash' => 'Zend\Filter\Word\CamelCaseToDash',
'wordcamelcasetoseparator' => 'Zend\Filter\Word\CamelCaseToSeparator',
'wordcamelcasetounderscore' => 'Zend\Filter\Word\CamelCaseToUnderscore',
'worddashtocamelcase' => 'Zend\Filter\Word\DashToCamelCase',
'worddashtoseparator' => 'Zend\Filter\Word\DashToSeparator',
'worddashtounderscore' => 'Zend\Filter\Word\DashToUnderscore',
'wordseparatortocamelcase' => 'Zend\Filter\Word\SeparatorToCamelCase',
'wordseparatortodash' => 'Zend\Filter\Word\SeparatorToDash',
'wordunderscoretocamelcase' => 'Zend\Filter\Word\UnderscoreToCamelCase',
'wordunderscoretostudlycase' => 'Zend\Filter\Word\UnderscoreToStudlyCase',
'wordunderscoretodash' => 'Zend\Filter\Word\UnderscoreToDash',
'wordunderscoretoseparator' => 'Zend\Filter\Word\UnderscoreToSeparator',
);

/**
Expand Down
53 changes: 53 additions & 0 deletions src/Word/Service/SeparatorToSeparatorFactory.php
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
<?php

namespace Zend\Filter\Word\Service;

use Zend\Filter\Word\SeparatorToSeparator;
use Zend\ServiceManager\FactoryInterface;
use Zend\ServiceManager\MutableCreationOptionsInterface;
use Zend\ServiceManager\ServiceLocatorInterface;

class SeparatorToSeparatorFactory implements
FactoryInterface,
MutableCreationOptionsInterface
{
/**
* @var array
*/
protected $creationOptions = array();

/**
* Set creation options
*
* @param array $creationOptions
* @return void
*/
public function setCreationOptions(array $creationOptions)
{
$this->creationOptions = $creationOptions;
}

/**
* Get creation options
*
* @return array
*/
public function getCreationOptions()
{
return $this->creationOptions;
}

/**
* {@inheritDoc}
*
* @return SeparatorToSeparator
* @throws ServiceNotCreatedException if Controllermanager service is not found in application service locator
*/
public function createService(ServiceLocatorInterface $plugins)
{
return new SeparatorToSeparator(
isset($this->creationOptions['search_separator']) ? $this->creationOptions['search_separator'] : ' ',
isset($this->creationOptions['replacement_separator']) ? $this->creationOptions['replacement_separator'] : '-'
);
}
}
40 changes: 40 additions & 0 deletions test/FilterPluginManagerTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,4 +39,44 @@ public function testLoadingInvalidFilterRaisesException()
$this->setExpectedException('Zend\Filter\Exception\RuntimeException');
$this->filters->get('test');
}

/**
* @group 7169
*/
public function testFilterSuccessfullyConstructed()
{
$search_separator = ';';
$replacement_separator = '|';
$options = array(
'search_separator' => $search_separator,
'replacement_separator' => $replacement_separator,
);
$filter = $this->filters->get('wordseparatortoseparator', $options);
$this->assertInstanceOf('Zend\Filter\Word\SeparatorToSeparator', $filter);
$this->assertEquals(';', $filter->getSearchSeparator());
$this->assertEquals('|', $filter->getReplacementSeparator());
}

/**
* @group 7169
*/
public function testFiltersConstructedAreDifferent()
{
$filterOne = $this->filters->get(
'wordseparatortoseparator',
array(
'search_separator' => ';',
'replacement_separator' => '|',
)
);
$filterTwo = $this->filters->get(
'wordseparatortoseparator',
array(
'search_separator' => '.',
'replacement_separator' => ',',
)
);

$this->assertNotEquals($filterOne, $filterTwo);
}
}

0 comments on commit eb8d23e

Please sign in to comment.