From c26f7e6d5e44d9dc8869971ca9fe5506cea02369 Mon Sep 17 00:00:00 2001 From: Jacson Passold Date: Mon, 20 Nov 2017 12:37:01 -0200 Subject: [PATCH] removed some classes sufix --- ...-checkbox-field-type.php => class-tainacan-checkbox.php} | 2 +- ...tainacan-date-field-type.php => class-tainacan-date.php} | 2 +- ...an-numeric-field-type.php => class-tainacan-numeric.php} | 2 +- ...inacan-radio-field-type.php => class-tainacan-radio.php} | 2 +- ...nship-field-type.php => class-tainacan-relationship.php} | 2 +- ...electbox-field-type.php => class-tainacan-selectbox.php} | 2 +- ...tainacan-text-field-type.php => class-tainacan-text.php} | 2 +- ...-textarea-field-type.php => class-tainacan-textarea.php} | 2 +- ...-list-filter-type.php => class-tainacan-list-filter.php} | 3 ++- ...nacan-range-filter-type.php => class-tainacan-range.php} | 2 +- tests/test-filters.php | 6 +++--- tests/test-metadata.php | 4 ++-- 12 files changed, 16 insertions(+), 15 deletions(-) rename src/classes/field-types/{class-tainacan-checkbox-field-type.php => class-tainacan-checkbox.php} (89%) rename src/classes/field-types/{class-tainacan-date-field-type.php => class-tainacan-date.php} (88%) rename src/classes/field-types/{class-tainacan-numeric-field-type.php => class-tainacan-numeric.php} (89%) rename src/classes/field-types/{class-tainacan-radio-field-type.php => class-tainacan-radio.php} (89%) rename src/classes/field-types/{class-tainacan-relationship-field-type.php => class-tainacan-relationship.php} (88%) rename src/classes/field-types/{class-tainacan-selectbox-field-type.php => class-tainacan-selectbox.php} (88%) rename src/classes/field-types/{class-tainacan-text-field-type.php => class-tainacan-text.php} (89%) rename src/classes/field-types/{class-tainacan-textarea-field-type.php => class-tainacan-textarea.php} (90%) rename src/classes/filter-types/{class-tainacan-list-filter-type.php => class-tainacan-list-filter.php} (83%) rename src/classes/filter-types/{class-tainacan-range-filter-type.php => class-tainacan-range.php} (89%) diff --git a/src/classes/field-types/class-tainacan-checkbox-field-type.php b/src/classes/field-types/class-tainacan-checkbox.php similarity index 89% rename from src/classes/field-types/class-tainacan-checkbox-field-type.php rename to src/classes/field-types/class-tainacan-checkbox.php index 3c5baa65c..cbf1d609f 100644 --- a/src/classes/field-types/class-tainacan-checkbox-field-type.php +++ b/src/classes/field-types/class-tainacan-checkbox.php @@ -9,7 +9,7 @@ if ( ! defined( 'ABSPATH' ) ) { /** * Class TainacanFieldType */ -class Checkbox_Field_Type extends Field_Type { +class Checkbox extends Field_Type { function __construct(){ $this->primitive_type = 'date'; diff --git a/src/classes/field-types/class-tainacan-date-field-type.php b/src/classes/field-types/class-tainacan-date.php similarity index 88% rename from src/classes/field-types/class-tainacan-date-field-type.php rename to src/classes/field-types/class-tainacan-date.php index f9d3d7018..e6a4114ff 100644 --- a/src/classes/field-types/class-tainacan-date-field-type.php +++ b/src/classes/field-types/class-tainacan-date.php @@ -9,7 +9,7 @@ if ( ! defined( 'ABSPATH' ) ) { /** * Class TainacanFieldType */ -class Textarea_Field_Type extends Field_Type { +class Textarea extends Field_Type { function __construct(){ $this->primitive_type = 'date'; diff --git a/src/classes/field-types/class-tainacan-numeric-field-type.php b/src/classes/field-types/class-tainacan-numeric.php similarity index 89% rename from src/classes/field-types/class-tainacan-numeric-field-type.php rename to src/classes/field-types/class-tainacan-numeric.php index b56cee50c..0179ee74d 100644 --- a/src/classes/field-types/class-tainacan-numeric-field-type.php +++ b/src/classes/field-types/class-tainacan-numeric.php @@ -9,7 +9,7 @@ if ( ! defined( 'ABSPATH' ) ) { /** * Class TainacanFieldType */ -class Numeric_Field_Type extends Field_Type { +class Numeric extends Field_Type { function __construct(){ $this->primitive_type = 'float'; diff --git a/src/classes/field-types/class-tainacan-radio-field-type.php b/src/classes/field-types/class-tainacan-radio.php similarity index 89% rename from src/classes/field-types/class-tainacan-radio-field-type.php rename to src/classes/field-types/class-tainacan-radio.php index bb7a51215..19fba7742 100644 --- a/src/classes/field-types/class-tainacan-radio-field-type.php +++ b/src/classes/field-types/class-tainacan-radio.php @@ -9,7 +9,7 @@ if ( ! defined( 'ABSPATH' ) ) { /** * Class TainacanFieldType */ -class Radio_Field_Type extends Field_Type { +class Radio extends Field_Type { function __construct(){ $this->primitive_type = ''; diff --git a/src/classes/field-types/class-tainacan-relationship-field-type.php b/src/classes/field-types/class-tainacan-relationship.php similarity index 88% rename from src/classes/field-types/class-tainacan-relationship-field-type.php rename to src/classes/field-types/class-tainacan-relationship.php index 7d2651c0b..8f00f60d0 100644 --- a/src/classes/field-types/class-tainacan-relationship-field-type.php +++ b/src/classes/field-types/class-tainacan-relationship.php @@ -9,7 +9,7 @@ if ( ! defined( 'ABSPATH' ) ) { /** * Class TainacanFieldType */ -class Relationship_Field_Type extends Field_Type { +class Relationship extends Field_Type { function __construct(){ $this->primitive_type = ''; diff --git a/src/classes/field-types/class-tainacan-selectbox-field-type.php b/src/classes/field-types/class-tainacan-selectbox.php similarity index 88% rename from src/classes/field-types/class-tainacan-selectbox-field-type.php rename to src/classes/field-types/class-tainacan-selectbox.php index 5a120b22e..d5d452a4d 100644 --- a/src/classes/field-types/class-tainacan-selectbox-field-type.php +++ b/src/classes/field-types/class-tainacan-selectbox.php @@ -9,7 +9,7 @@ if ( ! defined( 'ABSPATH' ) ) { /** * Class TainacanFieldType */ -class Selectbox_Field_Type extends Field_Type { +class Selectbox extends Field_Type { function __construct(){ $this->primitive_type = ''; diff --git a/src/classes/field-types/class-tainacan-text-field-type.php b/src/classes/field-types/class-tainacan-text.php similarity index 89% rename from src/classes/field-types/class-tainacan-text-field-type.php rename to src/classes/field-types/class-tainacan-text.php index cf21206c4..242ae0b5e 100644 --- a/src/classes/field-types/class-tainacan-text-field-type.php +++ b/src/classes/field-types/class-tainacan-text.php @@ -9,7 +9,7 @@ if ( ! defined( 'ABSPATH' ) ) { /** * Class TainacanFieldType */ -class Text_Field_Type extends Field_Type { +class Text extends Field_Type { function __construct(){ $this->primitive_type = 'string'; diff --git a/src/classes/field-types/class-tainacan-textarea-field-type.php b/src/classes/field-types/class-tainacan-textarea.php similarity index 90% rename from src/classes/field-types/class-tainacan-textarea-field-type.php rename to src/classes/field-types/class-tainacan-textarea.php index d46c9b1bb..d014d2ce9 100644 --- a/src/classes/field-types/class-tainacan-textarea-field-type.php +++ b/src/classes/field-types/class-tainacan-textarea.php @@ -9,7 +9,7 @@ if ( ! defined( 'ABSPATH' ) ) { /** * Class TainacanFieldType */ -class Field_Type extends Field_Type { +class Textarea extends Field_Type { function __construct(){ $this->primitive_type = 'string'; diff --git a/src/classes/filter-types/class-tainacan-list-filter-type.php b/src/classes/filter-types/class-tainacan-list-filter.php similarity index 83% rename from src/classes/filter-types/class-tainacan-list-filter-type.php rename to src/classes/filter-types/class-tainacan-list-filter.php index fd2d49dda..1c1028e87 100644 --- a/src/classes/filter-types/class-tainacan-list-filter-type.php +++ b/src/classes/filter-types/class-tainacan-list-filter.php @@ -7,8 +7,9 @@ if ( ! defined( 'ABSPATH' ) ) { /** * Class TainacanFieldType + * List_Filter because List is reseved */ -class List_Filter_Type extends Filter_Type { +class List_Filter extends Filter_Type { function __construct(){ $this->supported_types[] = 'string'; diff --git a/src/classes/filter-types/class-tainacan-range-filter-type.php b/src/classes/filter-types/class-tainacan-range.php similarity index 89% rename from src/classes/filter-types/class-tainacan-range-filter-type.php rename to src/classes/filter-types/class-tainacan-range.php index 74192ef1f..1c0461e2b 100644 --- a/src/classes/filter-types/class-tainacan-range-filter-type.php +++ b/src/classes/filter-types/class-tainacan-range.php @@ -9,7 +9,7 @@ if ( ! defined( 'ABSPATH' ) ) { /** * Class TainacanFieldType */ -class Range_Filter_Type extends Filter_Type { +class Range extends Filter_Type { function __construct(){ $this->supported_types = ['float','date']; diff --git a/tests/test-filters.php b/tests/test-filters.php index 3bf81aa47..6664eaeb4 100644 --- a/tests/test-filters.php +++ b/tests/test-filters.php @@ -42,9 +42,9 @@ class Filters extends \WP_UnitTestCase { $collection = new \Tainacan\Entities\Collection(); $metadata = new \Tainacan\Entities\Metadata(); $filter = new \Tainacan\Entities\Filter(); - $type = new \Tainacan\Field_Types\Text_Field_Type(); - $filter_list_type = new \Tainacan\Filter_Types\List_Filter_Type(); - $filter_range_type = new \Tainacan\Filter_Types\Range_Filter_Type(); + $type = new \Tainacan\Field_Types\Text(); + $filter_list_type = new \Tainacan\Filter_Types\List_Filter(); + $filter_range_type = new \Tainacan\Filter_Types\Range(); $collection->set_name('teste'); $collection = $Tainacan_Collections->insert($collection); diff --git a/tests/test-metadata.php b/tests/test-metadata.php index 869016542..8d7a3fcf4 100644 --- a/tests/test-metadata.php +++ b/tests/test-metadata.php @@ -49,7 +49,7 @@ class Metadata extends \WP_UnitTestCase { $collection = new \Tainacan\Entities\Collection(); $metadata = new \Tainacan\Entities\Metadata(); - $type = new \Tainacan\Field_Types\Text_Field_Type(); + $type = new \Tainacan\Field_Types\Text(); $collection->set_name('teste'); $collection = $Tainacan_Collections->insert($collection); @@ -67,7 +67,7 @@ class Metadata extends \WP_UnitTestCase { $this->assertEquals($test->get_name(), 'metadado'); $this->assertEquals($test->get_collection_id(), $collection->get_id()); - $this->assertEquals('Tainacan\Field_Types\Text_Field_Type', $test->get_field_type()); + $this->assertEquals('Tainacan\Field_Types\Text', $test->get_field_type()); $this->assertEquals($test->get_field_type_object(), $type); } } \ No newline at end of file