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

Commit

Permalink
Merge remote-tracking branch 'weierophinney/hotfix/filter-validator-l…
Browse files Browse the repository at this point in the history 
…oading'
  • Loading branch information
@akrabat
akrabat committed Dec 9, 2011
57 parents a4c73c7 + 7fbb3d0 + 7d18607 + 6c3cd60 + ef1c96f + a259e6a + 1e034f5 + c54ce3b + 424e491 + c77add4 + 73ab6b0 + b7af510 + de52bea + a34a04c + ac8cce1 + b770346 + 6744f59 + d9d953e + bde13ca + 9fb0d4b + 8d10fba + fbd8f3f + 40cb888 + 3c17fc2 + 8ea395e + df65e36 + ebc923d + 384df88 + 60fb990 + 158f7a3 + 614a3dd + 201952b + 542d5b2 + 3d0c414 + eb59e8e + 9201686 + c18a81f + db481a0 + 70c6ab9 + 291f5db + f3c7d4b + 94f014f + bd0bd85 + 5a9d140 + b699281 + c75dc15 + d827092 + 2da11be + 80b065f + 8bda3ed + 2aa543c + 6bcd384 + f140509 + b6685fb + 028dec7 + 1f3e385 + dbaea0e commit 6ac57a2
Show file tree
Hide file tree
Showing 5 changed files with 135 additions and 125 deletions.
11 changes: 7 additions & 4 deletions src/Callback.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@
*/
namespace Zend\Filter;

use Traversable,
Zend\Stdlib\IteratorToArray;

/**
* @uses Zend\Filter\Exception
* @uses Zend\Filter\AbstractFilter
Expand Down Expand Up @@ -53,11 +56,11 @@ class Callback extends AbstractFilter
* @param string|array $callback Callback in a call_user_func format
* @param mixed $options (Optional) Default options for this filter
*/
public function __construct($options)
public function __construct($options = array())
{
if ($options instanceof \Zend\Config\Config) {
$options = $options->toArray();
} else if (!is_array($options) || !array_key_exists('callback', $options)) {
if ($options instanceof Traversable) {
$options = IteratorToArray::convert($options);
} elseif (!is_array($options) || !array_key_exists('callback', $options)) {
$options = func_get_args();
$temp['callback'] = array_shift($options);
if (!empty($options)) {
Expand Down
10 changes: 7 additions & 3 deletions src/Compress.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,10 +99,14 @@ public function getAdapter()
$adapter = $this->_adapter;
$options = $this->getAdapterOptions();
if (!class_exists($adapter)) {
if (\Zend\Loader::isReadable('Zend/Filter/Compress/' . ucfirst($adapter) . '.php')) {
$adapter = 'Zend\\Filter\\Compress\\' . ucfirst($adapter);
$adapter = 'Zend\\Filter\\Compress\\' . ucfirst($adapter);
if (!class_exists($adapter)) {
throw new Exception\RuntimeException(sprintf(
'%s unable to load adapter; class "%s" not found',
__METHOD__,
$this->_adapter
));
}
\Zend\Loader::loadClass($adapter);
}

$this->_adapter = new $adapter($options);
Expand Down
2 changes: 1 addition & 1 deletion src/FilterBroker.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ class FilterBroker extends PluginSpecBroker
protected function validatePlugin($plugin)
{
if (!$plugin instanceof Filter) {
throw new Exception('Filters must implement Zend\Filter\Filter');
throw new Exception\RuntimeException('Filters must implement Zend\Filter\Filter');
}
return true;
}
Expand Down
226 changes: 113 additions & 113 deletions src/FilterLoader.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,118 +36,118 @@ class FilterLoader extends PluginClassLoader
* @var array Pre-aliased filter
*/
protected $plugins = array(
'alnum' => 'Zend\Filter\Alnum',
'alpha' => 'Zend\Filter\Alpha',
'basename' => 'Zend\Filter\BaseName',
'base_name' => 'Zend\Filter\BaseName',
'boolean' => 'Zend\Filter\Boolean',
'callback' => 'Zend\Filter\Callback',
'compress' => 'Zend\Filter\Compress',
'compress\bz2' => 'Zend\Filter\Compress\Bz2',
'compress_bz2' => 'Zend\Filter\Compress\Bz2',
'compress\gz' => 'Zend\Filter\Compress\Gz',
'compress_gz' => 'Zend\Filter\Compress\Gz',
'compress\lzf' => 'Zend\Filter\Compress\Lzf',
'compress_lzf' => 'Zend\Filter\Compress\Lzf',
'compress\rar' => 'Zend\Filter\Compress\Rar',
'compress_rar' => 'Zend\Filter\Compress\Rar',
'compress\tar' => 'Zend\Filter\Compress\Tar',
'compress_tar' => 'Zend\Filter\Compress\Tar',
'compress\zip' => 'Zend\Filter\Compress\Zip',
'compress_zip' => 'Zend\Filter\Compress\Zip',
'decompress' => 'Zend\Filter\Decompress',
'decrypt' => 'Zend\Filter\Decrypt',
'digits' => 'Zend\Filter\Digits',
'dir' => 'Zend\Filter\Dir',
'encrypt' => 'Zend\Filter\Encrypt',
'encrypt\mcrypt' => 'Zend\Filter\Encrypt\Mcrypt',
'encrypt_mcrypt' => 'Zend\Filter\Encrypt\Mcrypt',
'encrypt\openssl' => 'Zend\Filter\Encrypt\Openssl',
'encrypt_openssl' => 'Zend\Filter\Encrypt\Openssl',
'file\decrypt' => 'Zend\Filter\File\Decrypt',
'file_decrypt' => 'Zend\Filter\File\Decrypt',
'file\encrypt' => 'Zend\Filter\File\Encrypt',
'file_encrypt' => 'Zend\Filter\File\Encrypt',
'file\lowercase' => 'Zend\Filter\File\LowerCase',
'file\lower_case' => 'Zend\Filter\File\LowerCase',
'file_lowercase' => 'Zend\Filter\File\LowerCase',
'file_lower_case' => 'Zend\Filter\File\LowerCase',
'file\rename' => 'Zend\Filter\File\Rename',
'file_rename' => 'Zend\Filter\File\Rename',
'file\uppercase' => 'Zend\Filter\File\UpperCase',
'file\upper_case' => 'Zend\Filter\File\UpperCase',
'file_uppercase' => 'Zend\Filter\File\UpperCase',
'file_upper_case' => 'Zend\Filter\File\UpperCase',
'htmlentities' => 'Zend\Filter\HtmlEntities',
'html_entities' => 'Zend\Filter\HtmlEntities',
'inflector' => 'Zend\Filter\Inflector',
'int' => 'Zend\Filter\Int',
'localizedtonormalized' => 'Zend\Filter\LocalizedToNormalized',
'localized_to_normalized' => 'Zend\Filter\LocalizedToNormalized',
'normalizedtolocalized' => 'Zend\Filter\NormalizedToLocalized',
'normalized_to_localized' => 'Zend\Filter\NormalizedToLocalizedTest',
'null' => 'Zend\Filter\Null',
'pregreplace' => 'Zend\Filter\PregReplace',
'preg_replace' => 'Zend\Filter\PregReplace',
'realpath' => 'Zend\Filter\RealPath',
'real_path' => 'Zend\Filter\RealPath',
'stringtolower' => 'Zend\Filter\StringToLower',
'string_to_lower' => 'Zend\Filter\StringToLower',
'stringtoupper' => 'Zend\Filter\StringToUpper',
'string_to_upper' => 'Zend\Filter\StringToUpper',
'stringtrim' => 'Zend\Filter\StringTrim',
'string_trim' => 'Zend\Filter\StringTrim',
'stripnewlines' => 'Zend\Filter\StripNewlines',
'strip_newlines' => 'Zend\Filter\StripNewlines',
'striptags' => 'Zend\Filter\StripTags',
'strip_tags' => 'Zend\Filter\StripTags',
'word\camelcasetodash' => 'Zend\Filter\Word\CamelCaseToDash',
'word\camel_case_to_dash' => 'Zend\Filter\Word\CamelCaseToDash',
'word_camelcasetodash' => 'Zend\Filter\Word\CamelCaseToDash',
'word_camel_case_to_dash' => 'Zend\Filter\Word\CamelCaseToDash',
'word\camelcasetoseparator' => 'Zend\Filter\Word\CamelCaseToSeparator',
'word\camel_case_to_separator' => 'Zend\Filter\Word\CamelCaseToSeparator',
'word_camelcasetoseparator' => 'Zend\Filter\Word\CamelCaseToSeparator',
'word_camel_case_to_separator' => 'Zend\Filter\Word\CamelCaseToSeparator',
'word\camelcasetounderscore' => 'Zend\Filter\Word\CamelCaseToUnderscore',
'word\camel_case_to_underscore' => 'Zend\Filter\Word\CamelCaseToUnderscore',
'word_camelcasetounderscore' => 'Zend\Filter\Word\CamelCaseToUnderscore',
'word_camel_case_to_underscore' => 'Zend\Filter\Word\CamelCaseToUnderscore',
'word\dashtocamelcase' => 'Zend\Filter\Word\DashToCamelCase',
'word\dash_to_camel_case' => 'Zend\Filter\Word\DashToCamelCase',
'word_dashtocamelcase' => 'Zend\Filter\Word\DashToCamelCase',
'word_dash_to_camel_case' => 'Zend\Filter\Word\DashToCamelCase',
'word\dashtoseparator' => 'Zend\Filter\Word\DashToSeparator',
'word\dash_to_separator' => 'Zend\Filter\Word\DashToSeparator',
'word_dashtoseparator' => 'Zend\Filter\Word\DashToSeparator',
'word_dash_to_separator' => 'Zend\Filter\Word\DashToSeparator',
'word\dashtounderscore' => 'Zend\Filter\Word\DashToUnderscore',
'word\dash_to_underscore' => 'Zend\Filter\Word\DashToUnderscore',
'word_dashtounderscore' => 'Zend\Filter\Word\DashToUnderscore',
'word_dash_to_underscore' => 'Zend\Filter\Word\DashToUnderscore',
'word\separatortocamelcase' => 'Zend\Filter\Word\SeparatorToCamelCase',
'word\separator_to_camel_case' => 'Zend\Filter\Word\SeparatorToCamelCase',
'word_separatortocamelcase' => 'Zend\Filter\Word\SeparatorToCamelCase',
'word_separator_to_camel_case' => 'Zend\Filter\Word\SeparatorToCamelCase',
'word\separatortodash' => 'Zend\Filter\Word\SeparatorToDash',
'word\separator_to_dash' => 'Zend\Filter\Word\SeparatorToDash',
'word_separatortodash' => 'Zend\Filter\Word\SeparatorToDash',
'word_separator_to_dash' => 'Zend\Filter\Word\SeparatorToDash',
'word\separatortoseparator' => 'Zend\Filter\Word\SeparatorToSeparator',
'word\separator_to_separator' => 'Zend\Filter\Word\SeparatorToSeparator',
'word_separatortoseparator' => 'Zend\Filter\Word\SeparatorToSeparator',
'word_separator_to_separator' => 'Zend\Filter\Word\SeparatorToSeparator',
'word\underscoretocamelcase' => 'Zend\Filter\Word\UnderscoreToCamelCase',
'word\underscore_to_camel_case' => 'Zend\Filter\Word\UnderscoreToCamelCase',
'word_underscoretocamelcase' => 'Zend\Filter\Word\UnderscoreToCamelCase',
'word_underscore_to_camel_case' => 'Zend\Filter\Word\UnderscoreToCamelCase',
'word\underscoretodash' => 'Zend\Filter\Word\UnderscoreToDash',
'word\underscore_to_dash' => 'Zend\Filter\Word\UnderscoreToDash',
'word_underscoretodash' => 'Zend\Filter\Word\UnderscoreToDash',
'word_underscore_to_dash' => 'Zend\Filter\Word\UnderscoreToDash',
'word\underscoretoseparator' => 'Zend\Filter\Word\UnderscoreToSeparator',
'word\underscore_to_separator' => 'Zend\Filter\Word\UnderscoreToSeparator',
'word_underscoretoseparator' => 'Zend\Filter\Word\UnderscoreToSeparator',
'word_underscore_to_separator' => 'Zend\Filter\Word\UnderscoreToSeparator',
'alnum' => 'Zend\Filter\Alnum',
'alpha' => 'Zend\Filter\Alpha',
'basename' => 'Zend\Filter\BaseName',
'base_name' => 'Zend\Filter\BaseName',
'boolean' => 'Zend\Filter\Boolean',
'callback' => 'Zend\Filter\Callback',
'compress' => 'Zend\Filter\Compress',
'compress\\bz2' => 'Zend\Filter\Compress\Bz2',
'compress_bz2' => 'Zend\Filter\Compress\Bz2',
'compress\\gz' => 'Zend\Filter\Compress\Gz',
'compress_gz' => 'Zend\Filter\Compress\Gz',
'compress\\lzf' => 'Zend\Filter\Compress\Lzf',
'compress_lzf' => 'Zend\Filter\Compress\Lzf',
'compress\\rar' => 'Zend\Filter\Compress\Rar',
'compress_rar' => 'Zend\Filter\Compress\Rar',
'compress\\tar' => 'Zend\Filter\Compress\Tar',
'compress_tar' => 'Zend\Filter\Compress\Tar',
'compress\\zip' => 'Zend\Filter\Compress\Zip',
'compress_zip' => 'Zend\Filter\Compress\Zip',
'decompress' => 'Zend\Filter\Decompress',
'decrypt' => 'Zend\Filter\Decrypt',
'digits' => 'Zend\Filter\Digits',
'dir' => 'Zend\Filter\Dir',
'encrypt' => 'Zend\Filter\Encrypt',
'encrypt\\mcrypt' => 'Zend\Filter\Encrypt\Mcrypt',
'encrypt_mcrypt' => 'Zend\Filter\Encrypt\Mcrypt',
'encrypt\\openssl' => 'Zend\Filter\Encrypt\Openssl',
'encrypt_openssl' => 'Zend\Filter\Encrypt\Openssl',
'file\\decrypt' => 'Zend\Filter\File\Decrypt',
'file_decrypt' => 'Zend\Filter\File\Decrypt',
'file\\encrypt' => 'Zend\Filter\File\Encrypt',
'file_encrypt' => 'Zend\Filter\File\Encrypt',
'file\\lowercase' => 'Zend\Filter\File\LowerCase',
'file\\lower_case' => 'Zend\Filter\File\LowerCase',
'file_lowercase' => 'Zend\Filter\File\LowerCase',
'file_lower_case' => 'Zend\Filter\File\LowerCase',
'file\\rename' => 'Zend\Filter\File\Rename',
'file_rename' => 'Zend\Filter\File\Rename',
'file\\uppercase' => 'Zend\Filter\File\UpperCase',
'file\\upper_case' => 'Zend\Filter\File\UpperCase',
'file_uppercase' => 'Zend\Filter\File\UpperCase',
'file_upper_case' => 'Zend\Filter\File\UpperCase',
'htmlentities' => 'Zend\Filter\HtmlEntities',
'html_entities' => 'Zend\Filter\HtmlEntities',
'inflector' => 'Zend\Filter\Inflector',
'int' => 'Zend\Filter\Int',
'localizedtonormalized' => 'Zend\Filter\LocalizedToNormalized',
'localized_to_normalized' => 'Zend\Filter\LocalizedToNormalized',
'normalizedtolocalized' => 'Zend\Filter\NormalizedToLocalized',
'normalized_to_localized' => 'Zend\Filter\NormalizedToLocalized',
'null' => 'Zend\Filter\Null',
'pregreplace' => 'Zend\Filter\PregReplace',
'preg_replace' => 'Zend\Filter\PregReplace',
'realpath' => 'Zend\Filter\RealPath',
'real_path' => 'Zend\Filter\RealPath',
'stringtolower' => 'Zend\Filter\StringToLower',
'string_to_lower' => 'Zend\Filter\StringToLower',
'stringtoupper' => 'Zend\Filter\StringToUpper',
'string_to_upper' => 'Zend\Filter\StringToUpper',
'stringtrim' => 'Zend\Filter\StringTrim',
'string_trim' => 'Zend\Filter\StringTrim',
'stripnewlines' => 'Zend\Filter\StripNewlines',
'strip_newlines' => 'Zend\Filter\StripNewlines',
'striptags' => 'Zend\Filter\StripTags',
'strip_tags' => 'Zend\Filter\StripTags',
'word\\camelcasetodash' => 'Zend\Filter\Word\CamelCaseToDash',
'word\\camel_case_to_dash' => 'Zend\Filter\Word\CamelCaseToDash',
'word_camelcasetodash' => 'Zend\Filter\Word\CamelCaseToDash',
'word_camel_case_to_dash' => 'Zend\Filter\Word\CamelCaseToDash',
'word\\camelcasetoseparator' => 'Zend\Filter\Word\CamelCaseToSeparator',
'word\\camel_case_to_separator' => 'Zend\Filter\Word\CamelCaseToSeparator',
'word_camelcasetoseparator' => 'Zend\Filter\Word\CamelCaseToSeparator',
'word_camel_case_to_separator' => 'Zend\Filter\Word\CamelCaseToSeparator',
'word\\camelcasetounderscore' => 'Zend\Filter\Word\CamelCaseToUnderscore',
'word\\camel_case_to_underscore' => 'Zend\Filter\Word\CamelCaseToUnderscore',
'word_camelcasetounderscore' => 'Zend\Filter\Word\CamelCaseToUnderscore',
'word_camel_case_to_underscore' => 'Zend\Filter\Word\CamelCaseToUnderscore',
'word\\dashtocamelcase' => 'Zend\Filter\Word\DashToCamelCase',
'word\\dash_to_camel_case' => 'Zend\Filter\Word\DashToCamelCase',
'word_dashtocamelcase' => 'Zend\Filter\Word\DashToCamelCase',
'word_dash_to_camel_case' => 'Zend\Filter\Word\DashToCamelCase',
'word\\dashtoseparator' => 'Zend\Filter\Word\DashToSeparator',
'word\\dash_to_separator' => 'Zend\Filter\Word\DashToSeparator',
'word_dashtoseparator' => 'Zend\Filter\Word\DashToSeparator',
'word_dash_to_separator' => 'Zend\Filter\Word\DashToSeparator',
'word\\dashtounderscore' => 'Zend\Filter\Word\DashToUnderscore',
'word\\dash_to_underscore' => 'Zend\Filter\Word\DashToUnderscore',
'word_dashtounderscore' => 'Zend\Filter\Word\DashToUnderscore',
'word_dash_to_underscore' => 'Zend\Filter\Word\DashToUnderscore',
'word\\separatortocamelcase' => 'Zend\Filter\Word\SeparatorToCamelCase',
'word\\separator_to_camel_case' => 'Zend\Filter\Word\SeparatorToCamelCase',
'word_separatortocamelcase' => 'Zend\Filter\Word\SeparatorToCamelCase',
'word_separator_to_camel_case' => 'Zend\Filter\Word\SeparatorToCamelCase',
'word\\separatortodash' => 'Zend\Filter\Word\SeparatorToDash',
'word\\separator_to_dash' => 'Zend\Filter\Word\SeparatorToDash',
'word_separatortodash' => 'Zend\Filter\Word\SeparatorToDash',
'word_separator_to_dash' => 'Zend\Filter\Word\SeparatorToDash',
'word\\separatortoseparator' => 'Zend\Filter\Word\SeparatorToSeparator',
'word\\separator_to_separator' => 'Zend\Filter\Word\SeparatorToSeparator',
'word_separatortoseparator' => 'Zend\Filter\Word\SeparatorToSeparator',
'word_separator_to_separator' => 'Zend\Filter\Word\SeparatorToSeparator',
'word\\underscoretocamelcase' => 'Zend\Filter\Word\UnderscoreToCamelCase',
'word\\underscore_to_camel_case' => 'Zend\Filter\Word\UnderscoreToCamelCase',
'word_underscoretocamelcase' => 'Zend\Filter\Word\UnderscoreToCamelCase',
'word_underscore_to_camel_case' => 'Zend\Filter\Word\UnderscoreToCamelCase',
'word\\underscoretodash' => 'Zend\Filter\Word\UnderscoreToDash',
'word\\underscore_to_dash' => 'Zend\Filter\Word\UnderscoreToDash',
'word_underscoretodash' => 'Zend\Filter\Word\UnderscoreToDash',
'word_underscore_to_dash' => 'Zend\Filter\Word\UnderscoreToDash',
'word\\underscoretoseparator' => 'Zend\Filter\Word\UnderscoreToSeparator',
'word\\underscore_to_separator' => 'Zend\Filter\Word\UnderscoreToSeparator',
'word_underscoretoseparator' => 'Zend\Filter\Word\UnderscoreToSeparator',
'word_underscore_to_separator' => 'Zend\Filter\Word\UnderscoreToSeparator',
);
}
Loading

0 comments on commit 6ac57a2

Please sign in to comment.