tmdinosaurcenter
/
tainacan
mirror of https://github.com/tainacan/tainacan
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Now tainacan is compatible with php 5.6 or greater

This commit is contained in:
weryques 2018-05-21 13:56:50 -03:00
parent b0b98630d6
commit c410b3cfa8
33 changed files with 213 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -22,4 +22,5 @@ src/assets/css/tainacan-admin.css.map
cypress/videos cypress/videos
cypress/screenshots cypress/screenshots
.vscode .vscode
src/pdf-viewer/pdfjs-dist src/pdf-viewer/pdfjs-dist
report.txt

9
composer.json
View File

@ -5,8 +5,17 @@
"require": { "require": {
"respect/validation": "^1.1" "respect/validation": "^1.1"
}, },
"require-dev": {
"squizlabs/php_codesniffer": "^2.2 || ^3.0.2",
"wimg/php-compatibility": "*"
},
"prefer-stable" : true,
"minimum-stability": "dev", "minimum-stability": "dev",
"config": { "config": {
"vendor-dir": "src/vendor" "vendor-dir": "src/vendor"
},
"scripts": {
"post-install-cmd": "\"src/vendor/bin/phpcs\" --config-set installed_paths src/vendor/wimg/php-compatibility",
"post-update-cmd" : "\"src/vendor/bin/phpcs\" --config-set installed_paths src/vendor/wimg/php-compatibility"
} }
} }

110
composer.lock generated
View File

@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"content-hash": "64fbb4d01225b482970da995b00dccfb", "content-hash": "b5a7a81dd7eed9bc122ee36e472c6430",
"packages": [ "packages": [
{ {
"name": "respect/validation", "name": "respect/validation",
@ -131,11 +131,115 @@
"time": "2017-10-11T12:05:26+00:00" "time": "2017-10-11T12:05:26+00:00"
} }
], ],
"packages-dev": [], "packages-dev": [
{
"name": "squizlabs/php_codesniffer",
"version": "3.2.3",
"source": {
"type": "git",
"url": "https://github.com/squizlabs/PHP_CodeSniffer.git",
"reference": "4842476c434e375f9d3182ff7b89059583aa8b27"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/4842476c434e375f9d3182ff7b89059583aa8b27",
"reference": "4842476c434e375f9d3182ff7b89059583aa8b27",
"shasum": ""
},
"require": {
"ext-simplexml": "*",
"ext-tokenizer": "*",
"ext-xmlwriter": "*",
"php": ">=5.4.0"
},
"require-dev": {
"phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0"
},
"bin": [
"bin/phpcs",
"bin/phpcbf"
],
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "3.x-dev"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"BSD-3-Clause"
],
"authors": [
{
"name": "Greg Sherwood",
"role": "lead"
}
],
"description": "PHP_CodeSniffer tokenizes PHP, JavaScript and CSS files and detects violations of a defined set of coding standards.",
"homepage": "http://www.squizlabs.com/php-codesniffer",
"keywords": [
"phpcs",
"standards"
],
"time": "2018-02-20T21:35:23+00:00"
},
{
"name": "wimg/php-compatibility",
"version": "8.1.0",
"source": {
"type": "git",
"url": "https://github.com/wimg/PHPCompatibility.git",
"reference": "4ac01e4fe8faaa4f8d3b3cd06ea92e5418ce472e"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/wimg/PHPCompatibility/zipball/4ac01e4fe8faaa4f8d3b3cd06ea92e5418ce472e",
"reference": "4ac01e4fe8faaa4f8d3b3cd06ea92e5418ce472e",
"shasum": ""
},
"require": {
"php": ">=5.3",
"squizlabs/php_codesniffer": "^2.2 || ^3.0.2"
},
"conflict": {
"squizlabs/php_codesniffer": "2.6.2"
},
"require-dev": {
"phpunit/phpunit": "^4.0 || ^5.0 || ^6.0"
},
"suggest": {
"dealerdirect/phpcodesniffer-composer-installer": "^0.4.3"
},
"type": "phpcodesniffer-standard",
"autoload": {
"psr-4": {
"PHPCompatibility\\": "PHPCompatibility/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"LGPL-3.0"
],
"authors": [
{
"name": "Wim Godden",
"role": "lead"
}
],
"description": "A set of sniffs for PHP_CodeSniffer that checks for PHP version compatibility.",
"homepage": "http://techblog.wimgodden.be/tag/codesniffer/",
"keywords": [
"compatibility",
"phpcs",
"standards"
],
"time": "2017-12-27T21:58:38+00:00"
}
],
"aliases": [], "aliases": [],
"minimum-stability": "dev", "minimum-stability": "dev",
"stability-flags": [], "stability-flags": [],
"prefer-stable": false, "prefer-stable": true,
"prefer-lowest": false, "prefer-lowest": false,
"platform": [], "platform": [],
"platform-dev": [] "platform-dev": []

2
docs/class-reference-filters.md
View File

@ -108,7 +108,7 @@ Represents the entity Filter
### `protected $repository = 'Filters'` ### `protected $repository = 'Filters'`
{@inheritDoc} {@inheritDoc}
### `public function __toArray()` ### `public function _toArray()`
**Returns:** array **Returns:** array

6
src/api/class-tainacan-rest-controller.php
View File

@ -29,7 +29,7 @@ class REST_Controller extends \WP_REST_Controller {
$get_ = 'get_' . $attribute; $get_ = 'get_' . $attribute;
$object_filtered[ $attribute ] = $object->$get_(); $object_filtered[ $attribute ] = $object->$get_();
} }
} catch ( \Error $error ) { } catch ( \Exception $error ) {
// Do nothing // Do nothing
} }
} }
@ -37,7 +37,7 @@ class REST_Controller extends \WP_REST_Controller {
try{ try{
$get_ = 'get_' . $attributes; $get_ = 'get_' . $attributes;
$object_filtered[$attributes] = $object->$get_(); $object_filtered[$attributes] = $object->$get_();
} catch (\Error $error){ } catch (\Exception $error){
// Do nothing // Do nothing
} }
} }
@ -57,7 +57,7 @@ class REST_Controller extends \WP_REST_Controller {
try { try {
$set_ = 'set_' . $key; $set_ = 'set_' . $key;
$object->$set_( $value ); $object->$set_( $value );
} catch (\Error $error){ } catch (\Exception $error){
// Do nothing // Do nothing
} }
} }

4
src/api/endpoints/class-tainacan-rest-collections-controller.php
View File

@ -145,7 +145,7 @@ class REST_Collections_Controller extends REST_Controller {
if(!isset($request['fetch_only'])) { if(!isset($request['fetch_only'])) {
$item_arr = $item->__toArray(); $item_arr = $item->_toArray();
if ( $request['context'] === 'edit' ) { if ( $request['context'] === 'edit' ) {
$moderators_ids = $item_arr['moderators_ids']; $moderators_ids = $item_arr['moderators_ids'];
@ -239,7 +239,7 @@ class REST_Collections_Controller extends REST_Controller {
try { try {
$prepared_post = $this->prepare_item_for_database( $body ); $prepared_post = $this->prepare_item_for_database( $body );
} catch (\Error $exception){ } catch (\Exception $exception){
return new \WP_REST_Response($exception->getMessage(), 400); return new \WP_REST_Response($exception->getMessage(), 400);
} }

2
src/api/endpoints/class-tainacan-rest-export-controller.php
View File

@ -137,7 +137,7 @@ class REST_Export_Controller extends REST_Controller {
$prepared_item = []; $prepared_item = [];
foreach ($items_metadata as $item_metadata){ foreach ($items_metadata as $item_metadata){
$prepared_item[] = $item_metadata->__toArray(); $prepared_item[] = $item_metadata->_toArray();
} }
return $prepared_item; return $prepared_item;

2
src/api/endpoints/class-tainacan-rest-field-types-controller.php
View File

@ -70,7 +70,7 @@ class REST_Field_Types_Controller extends REST_Controller {
$name = "\Tainacan\Field_Types\\$item"; $name = "\Tainacan\Field_Types\\$item";
$field_type = new $name(); $field_type = new $name();
$field_arr = $field_type->__toArray(); $field_arr = $field_type->_toArray();
$field_arr['name'] = $item; $field_arr['name'] = $item;
return $field_arr; return $field_arr;

8
src/api/endpoints/class-tainacan-rest-fields-controller.php
View File

@ -197,7 +197,7 @@ class REST_Fields_Controller extends REST_Controller {
try { try {
$prepared = $this->prepare_item_for_database( $request->get_body(), $collection_id ); $prepared = $this->prepare_item_for_database( $request->get_body(), $collection_id );
} catch (\Error $exception){ } catch (\Exception $exception){
return new \WP_REST_Response($exception->getMessage(), 400); return new \WP_REST_Response($exception->getMessage(), 400);
} }
@ -217,7 +217,7 @@ class REST_Fields_Controller extends REST_Controller {
} elseif (!empty($request->get_body())) { } elseif (!empty($request->get_body())) {
try { try {
$prepared = $this->prepare_item_for_database( $request->get_body() ); $prepared = $this->prepare_item_for_database( $request->get_body() );
} catch ( \Error $exception ) { } catch ( \Exception $exception ) {
return new \WP_REST_Response( $exception->getMessage(), 400 ); return new \WP_REST_Response( $exception->getMessage(), 400 );
} }
@ -266,9 +266,9 @@ class REST_Fields_Controller extends REST_Controller {
*/ */
public function prepare_item_for_response( $item, $request ) { public function prepare_item_for_response( $item, $request ) {
if(!empty($item)){ if(!empty($item)){
$item_arr = $item->__toArray(); $item_arr = $item->_toArray();
$item_arr['field_type_object'] = $item->get_field_type_object()->__toArray(); $item_arr['field_type_object'] = $item->get_field_type_object()->_toArray();
if($request['context'] === 'edit'){ if($request['context'] === 'edit'){
$item_arr['current_user_can_edit'] = $item->can_edit(); $item_arr['current_user_can_edit'] = $item->can_edit();

2
src/api/endpoints/class-tainacan-rest-filter-types-controller.php
View File

@ -55,7 +55,7 @@ class REST_Filter_Types_Controller extends REST_Controller {
$name = "\Tainacan\Filter_Types\\$item"; $name = "\Tainacan\Filter_Types\\$item";
$filter_type = new $name(); $filter_type = new $name();
$filter_arr = $filter_type->__toArray(); $filter_arr = $filter_type->_toArray();
$filter_arr['name'] = $item; $filter_arr['name'] = $item;
return $filter_arr; return $filter_arr;

6
src/api/endpoints/class-tainacan-rest-filters-controller.php
View File

@ -131,7 +131,7 @@ class REST_Filters_Controller extends REST_Controller {
try { try {
$set_ = 'set_'. $attribute; $set_ = 'set_'. $attribute;
$filter_obj->$set_($value); $filter_obj->$set_($value);
} catch (\Error $error){ } catch (\Exception $error){
// //
} }
} }
@ -315,11 +315,11 @@ class REST_Filters_Controller extends REST_Controller {
*/ */
public function prepare_item_for_response( $item, $request ) { public function prepare_item_for_response( $item, $request ) {
if(!empty($item)) { if(!empty($item)) {
$item_arr = $item->__toArray(); $item_arr = $item->_toArray();
if($request['context'] === 'edit'){ if($request['context'] === 'edit'){
$item_arr['current_user_can_edit'] = $item->can_edit(); $item_arr['current_user_can_edit'] = $item->can_edit();
$item_arr['filter_type_object'] = $item->get_filter_type_object()->__toArray(); $item_arr['filter_type_object'] = $item->get_filter_type_object()->_toArray();
$item_arr['enabled'] = $item->get_enabled_for_collection(); $item_arr['enabled'] = $item->get_enabled_for_collection();
} }

4
src/api/endpoints/class-tainacan-rest-item-metadata-controller.php
View File

@ -96,7 +96,7 @@ class REST_Item_Metadata_Controller extends REST_Controller {
* @return array|\WP_Error|\WP_REST_Response * @return array|\WP_Error|\WP_REST_Response
*/ */
public function prepare_item_for_response( $item, $request ) { public function prepare_item_for_response( $item, $request ) {
$item_arr = $item->__toArray(); $item_arr = $item->_toArray();
if($request['context'] === 'edit'){ if($request['context'] === 'edit'){
$item_arr['current_user_can_edit'] = $item->can_edit(); $item_arr['current_user_can_edit'] = $item->can_edit();
@ -209,7 +209,7 @@ class REST_Item_Metadata_Controller extends REST_Controller {
} }
elseif($field->get_accept_suggestion()) { elseif($field->get_accept_suggestion()) {
$log = $this->item_metadata_repository->suggest( $item_metadata ); $log = $this->item_metadata_repository->suggest( $item_metadata );
$prepared_item = $log->__toArray(); $prepared_item = $log->_toArray();
} }
else { else {
return new \WP_REST_Response( [ return new \WP_REST_Response( [

8
src/api/endpoints/class-tainacan-rest-items-controller.php
View File

@ -92,6 +92,8 @@ class REST_Items_Controller extends REST_Controller {
* @param $item_object * @param $item_object
* @param $item_array * @param $item_array
* *
* @param array $args
*
* @return mixed * @return mixed
*/ */
private function add_metadata_to_item($item_object, $item_array, $args = []){ private function add_metadata_to_item($item_object, $item_array, $args = []){
@ -100,7 +102,7 @@ class REST_Items_Controller extends REST_Controller {
foreach($item_metadata as $index => $me){ foreach($item_metadata as $index => $me){
$field = $me->get_field(); $field = $me->get_field();
$slug = $field->get_slug(); $slug = $field->get_slug();
$item_metadata_array = $me->__toArray(); $item_metadata_array = $me->_toArray();
$item_array['metadata'][ $slug ]['name'] = $field->get_name(); $item_array['metadata'][ $slug ]['name'] = $field->get_name();
$item_array['metadata'][ $slug ]['value'] = $item_metadata_array['value']; $item_array['metadata'][ $slug ]['value'] = $item_metadata_array['value'];
@ -125,7 +127,7 @@ class REST_Items_Controller extends REST_Controller {
if(!empty($item)){ if(!empty($item)){
if(!isset($request['fetch_only'])) { if(!isset($request['fetch_only'])) {
$item_arr = $item->__toArray(); $item_arr = $item->_toArray();
if ( $request['context'] === 'edit' ) { if ( $request['context'] === 'edit' ) {
$item_arr['current_user_can_edit'] = $item->can_edit(); $item_arr['current_user_can_edit'] = $item->can_edit();
@ -298,7 +300,7 @@ class REST_Items_Controller extends REST_Controller {
try { try {
$this->prepare_item_for_database( [ $item, $collection_id ] ); $this->prepare_item_for_database( [ $item, $collection_id ] );
} catch (\Error $exception){ } catch (\Exception $exception){
return new \WP_REST_Response($exception->getMessage(), 400); return new \WP_REST_Response($exception->getMessage(), 400);
} }

2
src/api/endpoints/class-tainacan-rest-logs-controller.php
View File

@ -77,7 +77,7 @@ class REST_Logs_Controller extends REST_Controller {
if(!empty($item)){ if(!empty($item)){
if(!isset($request['fetch_only'])) { if(!isset($request['fetch_only'])) {
$item_array = $item->__toArray(); $item_array = $item->_toArray();
unset($item_array['value']); unset($item_array['value']);
unset($item_array['old_value']); unset($item_array['old_value']);

2
src/api/endpoints/class-tainacan-rest-taxonomies-controller.php
View File

@ -95,7 +95,7 @@ class REST_Taxonomies_Controller extends REST_Controller {
public function prepare_item_for_response( $item, $request ) { public function prepare_item_for_response( $item, $request ) {
if(!empty($item)) { if(!empty($item)) {
if(!isset($request['fetch_only'])) { if(!isset($request['fetch_only'])) {
$item_arr = $item->__toArray(); $item_arr = $item->_toArray();
if ( $request['context'] === 'edit' ) { if ( $request['context'] === 'edit' ) {
$item_arr['current_user_can_edit'] = $item->can_edit(); $item_arr['current_user_can_edit'] = $item->can_edit();

4
src/api/endpoints/class-tainacan-rest-terms-controller.php
View File

@ -90,7 +90,7 @@ class REST_Terms_Controller extends REST_Controller {
try { try {
$this->term->$set_( $value ); $this->term->$set_( $value );
} catch (\Error $error){ } catch (\Exception $error){
// Do nothing // Do nothing
} }
} }
@ -262,7 +262,7 @@ class REST_Terms_Controller extends REST_Controller {
public function prepare_item_for_response( $item, $request ) { public function prepare_item_for_response( $item, $request ) {
if(!empty($item)){ if(!empty($item)){
if(!isset($request['fetch_only'])) { if(!isset($request['fetch_only'])) {
$item_arr = $item->__toArray(); $item_arr = $item->_toArray();
if ( $request['context'] === 'edit' ) { if ( $request['context'] === 'edit' ) {
$item_arr['current_user_can_edit'] = $item->can_edit(); $item_arr['current_user_can_edit'] = $item->can_edit();

6
src/classes/class-tainacan-embed.php
View File

@ -18,14 +18,14 @@ class Embed {
/** /**
* Replace default WordPress embedders with HTML 5 tags instead of shortcodes * Replace default WordPress embedders with HTML 5 tags instead of shortcodes
*/ */
add_filter('wp_embed_handler_video', [&$this, 'filter_video_embed'], 10, 4); add_filter('wp_embed_handler_video', [$this, 'filter_video_embed'], 10, 4);
add_filter('wp_embed_handler_audio', [&$this, 'filter_audio_embed'], 10, 4); add_filter('wp_embed_handler_audio', [$this, 'filter_audio_embed'], 10, 4);
/** /**
* ADD PDF Embed handler using PDF.js * ADD PDF Embed handler using PDF.js
* @var [type] * @var [type]
*/ */
wp_embed_register_handler( 'pdf', '#^https?://.+?\.(pdf)$#i', [&$this, 'pdf_embed_handler'] ); wp_embed_register_handler( 'pdf', '#^https?://.+?\.(pdf)$#i', [$this, 'pdf_embed_handler'] );
} }

4
src/classes/entities/class-tainacan-collection.php
View File

@ -65,8 +65,8 @@ class Collection extends Entity {
return 'Hello, my name is ' . $this->get_name(); return 'Hello, my name is ' . $this->get_name();
} }
public function __toArray() { public function _toArray() {
$array_collection = parent::__toArray(); $array_collection = parent::_toArray();
$array_collection['thumbnail'] = $this->get_thumbnail(); $array_collection['thumbnail'] = $this->get_thumbnail();
$array_collection['header_image'] = $this->get_header_image(); $array_collection['header_image'] = $this->get_header_image();

6
src/classes/entities/class-tainacan-entity.php
View File

@ -333,7 +333,7 @@ class Entity {
return true; return true;
} }
public function __toArray(){ public function _toArray(){
$repository = $this->get_repository(); $repository = $this->get_repository();
$map = $repository->get_map(); $map = $repository->get_map();
@ -345,8 +345,8 @@ class Entity {
return $attributes; return $attributes;
} }
public function __toJSON(){ public function _toJson(){
return json_encode($this->__toArray(), JSON_NUMERIC_CHECK); return json_encode($this->_toArray(), JSON_NUMERIC_CHECK);
} }
/** /**

4
src/classes/entities/class-tainacan-filter.php
View File

@ -37,8 +37,8 @@ class Filter extends Entity {
* @return array * @return array
* @throws \Exception * @throws \Exception
*/ */
public function __toArray(){ public function _toArray(){
$filter_array = parent::__toArray(); $filter_array = parent::_toArray();
$field_id = $filter_array['field']; $field_id = $filter_array['field'];
$filter_array['field'] = []; $filter_array['field'] = [];

10
src/classes/entities/class-tainacan-item-metadata-entity.php
View File

@ -111,7 +111,7 @@ class Item_Metadata_Entity extends Entity {
foreach ($value as $v) { foreach ($value as $v) {
if ( $v instanceof Term || $v instanceof ItemMetadataEntity ) { if ( $v instanceof Term || $v instanceof ItemMetadataEntity ) {
$return[] = $v->__toArray(); $return[] = $v->_toArray();
} else { } else {
$return[] = $v; $return[] = $v;
} }
@ -122,7 +122,7 @@ class Item_Metadata_Entity extends Entity {
$return = ''; $return = '';
if ( $value instanceof Term || $value instanceof ItemMetadataEntity ) { if ( $value instanceof Term || $value instanceof ItemMetadataEntity ) {
$return = $value->__toArray(); $return = $value->_toArray();
} else { } else {
$return = $value; $return = $value;
} }
@ -136,7 +136,7 @@ class Item_Metadata_Entity extends Entity {
* Convert the object to an Array * Convert the object to an Array
* @return array the representation of this object as an array * @return array the representation of this object as an array
*/ */
public function __toArray(){ public function _toArray(){
$as_array = []; $as_array = [];
$as_array['value'] = $this->get_value_as_array(); $as_array['value'] = $this->get_value_as_array();
@ -147,8 +147,8 @@ class Item_Metadata_Entity extends Entity {
$as_array['date_i18n'] = $this->get_date_i18n($this->get_value_as_string()); $as_array['date_i18n'] = $this->get_date_i18n($this->get_value_as_string());
} }
$as_array['item'] = $this->get_item()->__toArray(); $as_array['item'] = $this->get_item()->_toArray();
$as_array['field'] = $this->get_field()->__toArray(); $as_array['field'] = $this->get_field()->_toArray();
return $as_array; return $as_array;
} }

6
src/classes/entities/class-tainacan-item.php
View File

@ -49,8 +49,8 @@ class Item extends Entity {
return 'Hello, my name is ' . $this->get_title(); return 'Hello, my name is ' . $this->get_title();
} }
public function __toArray() { public function _toArray() {
$array_item = parent::__toArray(); $array_item = parent::_toArray();
$array_item['thumbnail'] = $this->get_thumbnail(); $array_item['thumbnail'] = $this->get_thumbnail();
$array_item['_thumbnail_id'] = $this->get__thumbnail_id(); $array_item['_thumbnail_id'] = $this->get__thumbnail_id();
@ -417,7 +417,7 @@ class Item extends Entity {
} }
public function __toHtml() { public function _toHtml() {
$return = ''; $return = '';
$id = $this->get_id(); $id = $this->get_id();

4
src/classes/entities/class-tainacan-log.php
View File

@ -44,8 +44,8 @@ class Log extends Entity {
/** /**
* @return array * @return array
*/ */
public function __toArray() { public function _toArray() {
$array_log = parent::__toArray(); $array_log = parent::_toArray();
$array_log['user_name'] = $this->get_user_name(); $array_log['user_name'] = $this->get_user_name();

6
src/classes/entities/class-tainacan-term.php
View File

@ -55,8 +55,8 @@ class Term extends Entity {
return 'Hello, my name is '. $this->get_name(); return 'Hello, my name is '. $this->get_name();
} }
public function __toArray(){ public function _toArray(){
$term_array = parent::__toArray(); $term_array = parent::_toArray();
$term_id = $term_array['term_id']; $term_id = $term_array['term_id'];
@ -257,7 +257,7 @@ class Term extends Entity {
} }
public function __toHtml() { public function _toHtml() {
$return = ''; $return = '';
$id = $this->get_id(); $id = $this->get_id();

4
src/classes/field-types/category/class-tainacan-category.php
View File

@ -154,7 +154,7 @@ class Category extends Field_Type {
foreach ( $value as $term ) { foreach ( $value as $term ) {
if ( $term instanceof \Tainacan\Entities\Term ) { if ( $term instanceof \Tainacan\Entities\Term ) {
$return .= $term->__toHtml(); $return .= $term->_toHtml();
} }
$count ++; $count ++;
@ -168,7 +168,7 @@ class Category extends Field_Type {
} else { } else {
if ( $value instanceof \Tainacan\Entities\Term ) { if ( $value instanceof \Tainacan\Entities\Term ) {
$return .= $value->__toHtml(); $return .= $value->_toHtml();
} }
} }

2
src/classes/field-types/field-type/class-tainacan-field-type.php
View File

@ -160,7 +160,7 @@ abstract class Field_Type {
} }
public function __toArray(){ public function _toArray(){
$attributes = []; $attributes = [];
$attributes['errors'] = $this->get_errors(); $attributes['errors'] = $this->get_errors();

4
src/classes/field-types/relationship/class-tainacan-relationship.php
View File

@ -90,7 +90,7 @@ class Relationship extends Field_Type {
$item = new \Tainacan\Entities\Item($item_id); $item = new \Tainacan\Entities\Item($item_id);
if ( $item instanceof \Tainacan\Entities\Item ) { if ( $item instanceof \Tainacan\Entities\Item ) {
$return .= $item->__toHtml(); $return .= $item->_toHtml();
} }
$count ++; $count ++;
@ -112,7 +112,7 @@ class Relationship extends Field_Type {
$item = new \Tainacan\Entities\Item($value); $item = new \Tainacan\Entities\Item($value);
if ( $item instanceof \Tainacan\Entities\Item ) { if ( $item instanceof \Tainacan\Entities\Item ) {
$return .= $item->__toHtml(); $return .= $item->_toHtml();
} }
} catch (Exception $e) { } catch (Exception $e) {

2
src/classes/filter-types/filter-type/class-tainacan-filter-type.php
View File

@ -50,7 +50,7 @@ abstract class Filter_Type {
/** /**
* @return array * @return array
*/ */
public function __toArray(){ public function _toArray(){
$attributes = []; $attributes = [];
$attributes['className'] = get_class($this); $attributes['className'] = get_class($this);

4
src/exposers/class-tainacan-exposers.php
View File

@ -98,7 +98,7 @@ class Exposers {
$items_metadata = $item->get_fields(); $items_metadata = $item->get_fields();
$prepared_item = []; $prepared_item = [];
foreach ($items_metadata as $item_metadata){ foreach ($items_metadata as $item_metadata){
array_push($prepared_item, $item_metadata->__toArray()); array_push($prepared_item, $item_metadata->_toArray());
} }
$item_arr = $prepared_item; $item_arr = $prepared_item;
} }
@ -221,7 +221,7 @@ class Exposers {
if( if(
$type === false || // do not have a exposer type $type === false || // do not have a exposer type
$type->get_mappers() === true || // the type accept all mappers $type->get_mappers() === true || // the type accept all mappers
( is_array($type->mappers) && in_array($body['exposer-map'], $type->get_mappers()) ) ) { // the current mapper is accepted by type ( is_array($type->get_mappers()) && in_array($body['exposer-map'], $type->get_mappers()) ) ) { // the current mapper is accepted by type
$mapper = $Tainacan_Exposers->check_class_name($body['exposer-map'], true, self::MAPPER_CLASS_PREFIX); $mapper = $Tainacan_Exposers->check_class_name($body['exposer-map'], true, self::MAPPER_CLASS_PREFIX);
return new $mapper; return new $mapper;
} }

20
src/theme-helper/class-tainacan-theme-helper.php
View File

@ -20,29 +20,29 @@ class Theme_Helper {
private function __construct() { private function __construct() {
add_filter( 'the_content', [&$this, 'the_content_filter'] ); add_filter( 'the_content', [$this, 'the_content_filter'] );
// Replace collections permalink to post type archive if cover not enabled // Replace collections permalink to post type archive if cover not enabled
add_filter('post_type_link', array(&$this, 'permalink_filter'), 10, 3); add_filter('post_type_link', array($this, 'permalink_filter'), 10, 3);
// Replace single query to the page content set as cover for the colllection // Replace single query to the page content set as cover for the colllection
// Redirect to post type archive if no cover page is set // Redirect to post type archive if no cover page is set
add_action('wp', array(&$this, 'collection_single_redirect')); add_action('wp', array($this, 'collection_single_redirect'));
add_action('wp_print_scripts', array(&$this, 'enqueue_scripts')); add_action('wp_print_scripts', array($this, 'enqueue_scripts'));
// make archive for terms work with items // make archive for terms work with items
add_action('pre_get_posts', array(&$this, 'tax_archive_pre_get_posts')); add_action('pre_get_posts', array($this, 'tax_archive_pre_get_posts'));
add_action('archive_template_hierarchy', array(&$this, 'items_template_hierachy')); add_action('archive_template_hierarchy', array($this, 'items_template_hierachy'));
add_action('single_template_hierarchy', array(&$this, 'items_template_hierachy')); add_action('single_template_hierarchy', array($this, 'items_template_hierachy'));
add_filter('theme_mod_header_image', array(&$this, 'header_image')); add_filter('theme_mod_header_image', array($this, 'header_image'));
add_filter('get_the_archive_title', array(&$this, 'filter_archive_title')); add_filter('get_the_archive_title', array($this, 'filter_archive_title'));
add_shortcode( 'tainacan-search', array(&$this, 'search_shortcode')); add_shortcode( 'tainacan-search', array($this, 'search_shortcode'));
} }

14
tests/factories/class-tainacan-entity-factory.php
View File

@ -83,19 +83,19 @@ class Entity_Factory {
} elseif (empty($args) && !$is_validated_and_in_db) { } elseif (empty($args) && !$is_validated_and_in_db) {
try { try {
$this->entity->set_name( "$type " . random_int( 0, 10000 ) . " for test" ); $this->entity->set_name( "$type " . rand( 0, 10000 ) . " for test" );
$this->entity->set_description( 'It is only for test' ); $this->entity->set_description( 'It is only for test' );
} catch (\Error $exception){ } catch (\Exception $exception){
$this->entity->set_title( "$type " . random_int( 0, 10000 ) . " for test" ); $this->entity->set_title( "$type " . rand( 0, 10000 ) . " for test" );
$this->entity->set_description( 'It is only for test' ); $this->entity->set_description( 'It is only for test' );
} }
} elseif (empty($args) && $is_validated_and_in_db) { } elseif (empty($args) && $is_validated_and_in_db) {
try { try {
$this->entity->set_name( "$type " . random_int( 0, 10000 ) . " for test" ); $this->entity->set_name( "$type " . rand( 0, 10000 ) . " for test" );
$this->entity->set_description( 'It is only for test' ); $this->entity->set_description( 'It is only for test' );
} catch (\Error $exception){ } catch (\Exception $exception){
$this->entity->set_title( "$type " . random_int( 0, 10000 ) . " for test" ); $this->entity->set_title( "$type " . rand( 0, 10000 ) . " for test" );
$this->entity->set_description( 'It is only for test' ); $this->entity->set_description( 'It is only for test' );
} }
@ -104,7 +104,7 @@ class Entity_Factory {
} else { } else {
throw new \InvalidArgumentException('One or more arguments are invalid.'); throw new \InvalidArgumentException('One or more arguments are invalid.');
} }
} catch (\Error $exception){ } catch (\Exception $exception){
echo "\n" . $exception->getMessage() . "\n"; echo "\n" . $exception->getMessage() . "\n";
} }

24
tests/test-filters.php
View File

@ -135,13 +135,13 @@ class Filters extends TAINACAN_UnitTestCase {
$filter = $this->tainacan_entity_factory->create_entity( $filter = $this->tainacan_entity_factory->create_entity(
'filter', 'filter',
array( array(
'name' => 'filtro', 'name' => 'filtro',
'collection' => $collection, 'collection' => $collection,
'description' => 'descricao', 'description' => 'descricao',
'field' => $field2, 'field' => $field2,
'filter_type' => $autocomplete 'filter_type' => $autocomplete
), ),
true true
); );
@ -155,11 +155,11 @@ class Filters extends TAINACAN_UnitTestCase {
$filter2 = $this->tainacan_entity_factory->create_entity( $filter2 = $this->tainacan_entity_factory->create_entity(
'filter', 'filter',
array( array(
'name' => 'filtro 2', 'name' => 'filtro 2',
'collection' => $collection, 'collection' => $collection,
'description' => 'descricao', 'description' => 'descricao',
'field' => $field2, 'field' => $field2,
'filter_type' => $custom_interval 'filter_type' => $custom_interval
), ),
true true
); );

8
verify_compat.sh Executable file
View File

@ -0,0 +1,8 @@
touch report.txt
echo 'Verifing potencial incompatibilities with php 5.6 or greater'
echo 'W is Warning'
echo 'E is Error'
./src/vendor/bin/phpcs -p . --standard=PHPCompatibility --extensions=php --ignore=*/node_modules/*,*/src/vendor/* --report-file=./report.txt --runtime-set testVersion 5.6