Skip to content

Renamed reserved class names to {$classname}Type #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Renamed reserved class names to {$classname}Type #7

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
26 changes: 13 additions & 13 deletions lib/Filterus/Filter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,17 @@
abstract class Filter {

protected static $filters = array(
'alnum' => 'Filterus\Filters\Alnum',
'array' => 'Filterus\Filters\Arrays',
'bool' => 'Filterus\Filters\Boolean',
'alnum' => 'Filterus\Filters\AlnumType',
'array' => 'Filterus\Filters\ArrayType',
'bool' => 'Filterus\Filters\BooleanType',
'email' => 'Filterus\Filters\Email',
'float' => 'Filterus\Filters\Float',
'int' => 'Filterus\Filters\Int',
'float' => 'Filterus\Filters\FloatType',
'int' => 'Filterus\Filters\IntType',
'ip' => 'Filterus\Filters\IP',
'object' => 'Filterus\Filters\Object',
'raw' => 'Filterus\Filters\Raw',
'object' => 'Filterus\Filters\ObjectType',
'raw' => 'Filterus\Filters\RawType',
'regex' => 'Filterus\Filters\Regex',
'string' => 'Filterus\Filters\String',
'string' => 'Filterus\Filters\StringType',
'url' => 'Filterus\Filters\URL',
);

Expand All @@ -27,11 +27,11 @@ public static function arrays($filter = '', $keys = '', $values = '') {
if ($values) {
$options['values'] = $values;
}
return new Filters\Arrays($options);
return new Filters\ArrayType($options);
}

public static function map($filters) {
return new Filters\Map(array('filters' => $filters));
return new Filters\MapType(array('filters' => $filters));
}

public static function chain() {
Expand All @@ -47,22 +47,22 @@ public static function pool() {
public static function factory($filter) {
if ($filter instanceof self) {
return $filter;
}
}
list ($filterName, $options) = static::parseFilter($filter);
if (!isset(self::$filters[$filterName])) {
throw new \InvalidArgumentException('Invalid Filter Specified: ' . $filter);
}
$class = self::$filters[$filterName];
return new $class($options);
}

public static function registerFilter($name, $class) {
if (!is_subclass_of($class, __CLASS__)) {
throw new \InvalidArgumentException("Class name must be an instance of Filter");
}
self::$filters[strtolower($name)] = $class;
}


protected $defaultOptions = array();

Expand Down
4 changes: 2 additions & 2 deletions lib/Filterus/Filters/Alnum.php → lib/Filterus/Filters/AlnumType.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

namespace Filterus\Filters;

class Alnum extends Regex {
class AlnumType extends Regex {

protected $defaultOptions = array(
'min' => 0,
'max' => PHP_INT_MAX,
Expand Down
4 changes: 2 additions & 2 deletions lib/Filterus/Filters/Arrays.php → lib/Filterus/Filters/ArrayType.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

namespace Filterus\Filters;

class Arrays extends \Filterus\Filter {
class ArrayType extends \Filterus\Filter {

protected $defaultOptions = array(
'min' => 0,
'max' => PHP_INT_MAX,
Expand Down
4 changes: 2 additions & 2 deletions lib/Filterus/Filters/Boolean.php → lib/Filterus/Filters/BooleanType.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

namespace Filterus\Filters;

class Boolean extends \Filterus\Filter {
class BooleanType extends \Filterus\Filter {

protected $defaultOptions = array(
'default' => null,
);
Expand Down
4 changes: 2 additions & 2 deletions lib/Filterus/Filters/Float.php → lib/Filterus/Filters/FloatType.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

namespace Filterus\Filters;

class Float extends \Filterus\Filter {
class FloatType extends \Filterus\Filter {

protected $defaultOptions = array(
'min' => null,
'max' => null,
Expand Down
4 changes: 2 additions & 2 deletions lib/Filterus/Filters/Int.php → lib/Filterus/Filters/IntType.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@

defined('PHP_INT_MIN') or define('PHP_INT_MIN', ~PHP_INT_MAX);

class Int extends \Filterus\Filter {
class IntType extends \Filterus\Filter {

protected $defaultOptions = array(
'min' => PHP_INT_MIN,
'max' => PHP_INT_MAX,
Expand Down
4 changes: 2 additions & 2 deletions lib/Filterus/Filters/Map.php → lib/Filterus/Filters/MapType.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

namespace Filterus\Filters;

class Map extends \Filterus\Filter {
class MapType extends \Filterus\Filter {

protected $defaultOptions = array(
'filters' => array(),
);
Expand Down
4 changes: 2 additions & 2 deletions lib/Filterus/Filters/Object.php → lib/Filterus/Filters/ObjectType.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

namespace Filterus\Filters;

class Object extends \Filterus\Filter {
class ObjectType extends \Filterus\Filter {

protected $defaultOptions = array(
'class' => '',
);
Expand Down
4 changes: 2 additions & 2 deletions lib/Filterus/Filters/Raw.php → lib/Filterus/Filters/RawType.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

namespace Filterus\Filters;

class Raw extends \Filterus\Filter {
class RawType extends \Filterus\Filter {

public function filter($var) {
return $var;
}
Expand Down
4 changes: 2 additions & 2 deletions lib/Filterus/Filters/Regex.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

namespace Filterus\Filters;

class Regex extends String {
class Regex extends StringType {

protected $defaultOptions = array(
'min' => 0,
'max' => PHP_INT_MAX,
Expand Down
4 changes: 2 additions & 2 deletions lib/Filterus/Filters/String.php → lib/Filterus/Filters/StringType.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

namespace Filterus\Filters;

class String extends \Filterus\Filter {
class StringType extends \Filterus\Filter {

protected $defaultOptions = array(
'min' => 0,
'max' => PHP_INT_MAX,
Expand Down
22 changes: 11 additions & 11 deletions test/Filterus/FilterTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
class FilterTest extends \PHPUnit_Framework_TestCase {

public function testOptions() {
$filter = new Filters\Raw;
$filter = new Filters\RawType;
$filter->setOptions(array(1, 2));
$this->assertEquals(array(1, 2), $filter->getOptions());
$filter->setOption('foo', 'bar');
Expand All @@ -16,15 +16,15 @@ public function testOptions() {

public function testFactory() {
$raw = Filter::factory('raw');
$this->assertTrue($raw instanceof Filters\Raw);
$this->assertTrue($raw instanceof Filters\RawType);
}

public function testFactoryParsing() {
$raw = Filter::factory('raw,foo:bar');
$this->assertTrue($raw instanceof Filters\Raw);
$this->assertTrue($raw instanceof Filters\RawType);
$this->assertEquals(array('foo' => 'bar'), $raw->getOptions());
$raw = Filter::factory('raw,foo:bar,');
$this->assertTrue($raw instanceof Filters\Raw);
$this->assertTrue($raw instanceof Filters\RawType);
$this->assertEquals(array('foo' => 'bar'), $raw->getOptions());
}

Expand All @@ -42,9 +42,9 @@ public function testFactoryFail() {
}

public function testFactoryRegister() {
Filter::registerFilter('gibberish', 'Filterus\Filters\Raw');
Filter::registerFilter('gibberish', 'Filterus\Filters\RawType');
$expect = Filter::factory('gibberish');
$this->assertTrue($expect instanceof Filters\Raw);
$this->assertTrue($expect instanceof Filters\RawType);
}

/**
Expand All @@ -69,30 +69,30 @@ public function testChain() {
public function testMap() {
$mapArray = array('a' => 'int');
$map = Filter::map($mapArray);
$this->assertTrue($map instanceof Filters\Map);
$this->assertTrue($map instanceof Filters\MapType);
$this->assertEquals(array('filters' => $mapArray), $map->getOptions());
}

public function testArrays() {
$array = Filter::arrays();
$this->assertTrue($array instanceof Filters\Arrays);
$this->assertTrue($array instanceof Filters\ArrayType);
}

public function testArraysOptions() {
$array = Filter::arrays('foo:bar');
$this->assertTrue($array instanceof Filters\Arrays);
$this->assertTrue($array instanceof Filters\ArrayType);
$this->assertEquals(array('foo' => 'bar', 'min' => 0, 'max' => PHP_INT_MAX, 'keys' => null, 'values' => null), $array->getOptions());
}

public function testArraysKeys() {
$array = Filter::arrays('', 'int');
$this->assertTrue($array instanceof Filters\Arrays);
$this->assertTrue($array instanceof Filters\ArrayType);
$this->assertEquals(array('min' => 0, 'max' => PHP_INT_MAX, 'keys' => 'int', 'values' => null), $array->getOptions());
}

public function testArraysValues() {
$array = Filter::arrays('', '', 'int');
$this->assertTrue($array instanceof Filters\Arrays);
$this->assertTrue($array instanceof Filters\ArrayType);
$this->assertEquals(array('min' => 0, 'max' => PHP_INT_MAX, 'keys' => null, 'values' => 'int'), $array->getOptions());
}

Expand Down
2 changes: 1 addition & 1 deletion test/Filterus/Filters/AlnumTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ public static function provideTestFilter() {
* @dataProvider provideTestFilter
*/
public function testFilter($options, $raw, $filtered, $valid) {
$int = new Alnum($options);
$int = new AlnumType($options);
$this->assertEquals($filtered, $int->filter($raw));
$this->assertEquals($valid, $int->validate($raw));
}
Expand Down
2 changes: 1 addition & 1 deletion test/Filterus/Filters/ArraysTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ public static function provideTestFilter() {
* @dataProvider provideTestFilter
*/
public function testFilter($options, $raw, $filtered, $valid) {
$int = new Arrays($options);
$int = new ArrayType($options);
$this->assertEquals($filtered, $int->filter($raw));
$this->assertEquals($valid, $int->validate($raw));
}
Expand Down
2 changes: 1 addition & 1 deletion test/Filterus/Filters/BooleanTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ public static function provideTestFilter() {
* @dataProvider provideTestFilter
*/
public function testFilter($options, $raw, $filtered, $valid) {
$int = new Boolean($options);
$int = new BooleanType($options);
$this->assertEquals($filtered, $int->filter($raw));
$this->assertEquals($valid, $int->validate($raw));
}
Expand Down
2 changes: 1 addition & 1 deletion test/Filterus/Filters/FloatTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ public static function provideTestFilter() {
* @dataProvider provideTestFilter
*/
public function testFilter($options, $raw, $filtered, $valid) {
$int = new Float($options);
$int = new FloatType($options);
$this->assertEquals($filtered, $int->filter($raw));
$this->assertEquals($valid, $int->validate($raw));
}
Expand Down
2 changes: 1 addition & 1 deletion test/Filterus/Filters/IntTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ public static function provideTestFilter() {
* @dataProvider provideTestFilter
*/
public function testFilter($options, $raw, $filtered, $valid) {
$int = new Int($options);
$int = new IntType($options);
$this->assertEquals($filtered, $int->filter($raw));
$this->assertEquals($valid, $int->validate($raw));
}
Expand Down
2 changes: 1 addition & 1 deletion test/Filterus/Filters/MapTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ public static function provideTestFilter() {
* @dataProvider provideTestFilter
*/
public function testFilter($options, $raw, $filtered, $valid) {
$int = new Map($options);
$int = new MapType($options);
$this->assertEquals($filtered, $int->filter($raw));
$this->assertEquals($valid, $int->validate($raw));
}
Expand Down
2 changes: 1 addition & 1 deletion test/Filterus/Filters/ObjectTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ public static function provideTestFilter() {
* @dataProvider provideTestFilter
*/
public function testFilter($options, $raw, $filtered, $valid) {
$int = new Object($options);
$int = new ObjectType($options);
$this->assertEquals($filtered, $int->filter($raw));
$this->assertEquals($valid, $int->validate($raw));
}
Expand Down
2 changes: 1 addition & 1 deletion test/Filterus/Filters/RawTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ public static function provideTestFilter() {
* @dataProvider provideTestFilter
*/
public function testFilter($raw) {
$int = new Raw(array());
$int = new RawType(array());
$this->assertEquals($raw, $int->filter($raw));
$this->assertEquals(true, $int->validate($raw));
}
Expand Down
2 changes: 1 addition & 1 deletion test/Filterus/Filters/StringTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ public static function provideTestFilter() {
* @dataProvider provideTestFilter
*/
public function testFilter($options, $raw, $filtered, $valid) {
$int = new String($options);
$int = new StringType($options);
$this->assertEquals($filtered, $int->filter($raw));
$this->assertEquals($valid, $int->validate($raw));
}
Expand Down