From de19ec6fa7d8d3fd483bd8c828b1e413866a6e15 Mon Sep 17 00:00:00 2001 From: Pieter Frenssen Date: Sun, 19 Aug 2012 13:31:43 +0200 Subject: [PATCH] Issue #1739796 by pfrenssen: Fixed array to string conversion notice in Hooks test on PHP 5.4. --- tests/ds.base.test | 2 -- tests/ds_test.module | 12 ------------ 2 files changed, 14 deletions(-) diff --git a/tests/ds.base.test b/tests/ds.base.test index e92a333..9fa0529 100644 --- a/tests/ds.base.test +++ b/tests/ds.base.test @@ -796,8 +796,6 @@ class dsHooksTests extends dsBaseTest { 'fields[ds_test_field_null][label]' => 'inline', 'fields[ds_test_field_nothing][region]' => 'right', 'fields[ds_test_field_nothing][label]' => 'inline', - 'fields[ds_test_field_empty_array][region]' => 'right', - 'fields[ds_test_field_empty_array][label]' => 'inline', 'fields[ds_test_field_zero_int][region]' => 'right', 'fields[ds_test_field_zero_int][label]' => 'inline', 'fields[ds_test_field_zero_string][region]' => 'right', diff --git a/tests/ds_test.module b/tests/ds_test.module index 4079618..90f1370 100644 --- a/tests/ds_test.module +++ b/tests/ds_test.module @@ -127,11 +127,6 @@ function ds_test_ds_fields_info($entity_type) { 'field_type' => DS_FIELD_TYPE_FUNCTION, 'function' => 'dstest_render_nothing', ); - $fields['node']['ds_test_field_empty_array'] = array( - 'title' => t('Test code field that returns an empty array'), - 'field_type' => DS_FIELD_TYPE_FUNCTION, - 'function' => 'dstest_render_empty_array', - ); $fields['node']['ds_test_field_zero_int'] = array( 'title' => t('Test code field that returns zero as an integer'), 'field_type' => DS_FIELD_TYPE_FUNCTION, @@ -202,13 +197,6 @@ function dstest_render_nothing() { } /** - * Test code field that returns an empty array. - */ -function dstest_render_empty_array() { - return array(); -} - -/** * Test code field that returns zero as an integer. */ function dstest_render_zero_int() { -- 1.7.11.5