X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=tests%2Fphpunit%2FCRM%2FUtils%2FTypeTest.php;h=21a47fa35b330e7a713afd9fb5ff0bf85871533e;hb=d111a110d99397070c6f3ee38c9f1525c30eb767;hp=dab58cbfe5967a023472a40d3260181b34785b2c;hpb=30b6117f306e9e037c1b9776848cdf8fd6d7ad45;p=civicrm-core.git

diff --git a/tests/phpunit/CRM/Utils/TypeTest.php b/tests/phpunit/CRM/Utils/TypeTest.php
index dab58cbfe5..21a47fa35b 100644
--- a/tests/phpunit/CRM/Utils/TypeTest.php
+++ b/tests/phpunit/CRM/Utils/TypeTest.php
@@ -26,59 +26,59 @@ class CRM_Utils_TypeTest extends CiviUnitTestCase {
    * @return array
    */
   public function validateDataProvider() {
-    return array(
-      array(10, 'Int', 10),
-      array('145E+3', 'Int', NULL),
-      array('10', 'Integer', 10),
-      array(-10, 'Int', -10),
-      array('-10', 'Integer', -10),
-      array('-10foo', 'Int', NULL),
-      array(10, 'Positive', 10),
-      array('145.0E+3', 'Positive', NULL),
-      array('10', 'Positive', 10),
-      array(-10, 'Positive', NULL),
-      array('-10', 'Positive', NULL),
-      array('-10foo', 'Positive', NULL),
-      array('civicrm_column_name', 'MysqlColumnNameOrAlias', 'civicrm_column_name'),
-      array('table.civicrm_column_name', 'MysqlColumnNameOrAlias', 'table.civicrm_column_name'),
-      array('table.civicrm_column_name.toomanydots', 'MysqlColumnNameOrAlias', NULL),
-      array('Home-street_address', 'MysqlColumnNameOrAlias', 'Home-street_address'),
-      array('`Home-street_address`', 'MysqlColumnNameOrAlias', '`Home-street_address`'),
-      array('`Home-street_address', 'MysqlColumnNameOrAlias', NULL),
-      array('table.`Home-street_address`', 'MysqlColumnNameOrAlias', 'table.`Home-street_address`'),
-      array('`table-alias`.`Home-street_address`', 'MysqlColumnNameOrAlias', '`table-alias`.`Home-street_address`'),
-      array('`table-alias`.column', 'MysqlColumnNameOrAlias', '`table-alias`.column'),
+    return [
+      [10, 'Int', 10],
+      ['145E+3', 'Int', NULL],
+      ['10', 'Integer', 10],
+      [-10, 'Int', -10],
+      ['-10', 'Integer', -10],
+      ['-10foo', 'Int', NULL],
+      [10, 'Positive', 10],
+      ['145.0E+3', 'Positive', NULL],
+      ['10', 'Positive', 10],
+      [-10, 'Positive', NULL],
+      ['-10', 'Positive', NULL],
+      ['-10foo', 'Positive', NULL],
+      ['civicrm_column_name', 'MysqlColumnNameOrAlias', 'civicrm_column_name'],
+      ['table.civicrm_column_name', 'MysqlColumnNameOrAlias', 'table.civicrm_column_name'],
+      ['table.civicrm_column_name.toomanydots', 'MysqlColumnNameOrAlias', NULL],
+      ['Home-street_address', 'MysqlColumnNameOrAlias', 'Home-street_address'],
+      ['`Home-street_address`', 'MysqlColumnNameOrAlias', '`Home-street_address`'],
+      ['`Home-street_address', 'MysqlColumnNameOrAlias', NULL],
+      ['table.`Home-street_address`', 'MysqlColumnNameOrAlias', 'table.`Home-street_address`'],
+      ['`table-alias`.`Home-street_address`', 'MysqlColumnNameOrAlias', '`table-alias`.`Home-street_address`'],
+      ['`table-alias`.column', 'MysqlColumnNameOrAlias', '`table-alias`.column'],
       // Spaces also permitted, only when enclosed in backticks.
-      array('`column alias`', 'MysqlColumnNameOrAlias', '`column alias`'),
-      array('`table alias`.column', 'MysqlColumnNameOrAlias', '`table alias`.column'),
-      array('`table alias`.`column alias`', 'MysqlColumnNameOrAlias', '`table alias`.`column alias`'),
-      array('table alias.column alias', 'MysqlColumnNameOrAlias', NULL),
-      array('table alias.column_alias', 'MysqlColumnNameOrAlias', NULL),
-      array('table_alias.column alias', 'MysqlColumnNameOrAlias', NULL),
+      ['`column alias`', 'MysqlColumnNameOrAlias', '`column alias`'],
+      ['`table alias`.column', 'MysqlColumnNameOrAlias', '`table alias`.column'],
+      ['`table alias`.`column alias`', 'MysqlColumnNameOrAlias', '`table alias`.`column alias`'],
+      ['table alias.column alias', 'MysqlColumnNameOrAlias', NULL],
+      ['table alias.column_alias', 'MysqlColumnNameOrAlias', NULL],
+      ['table_alias.column alias', 'MysqlColumnNameOrAlias', NULL],
       // Functions are not permitted.
-      array('column_name, sleep(5)', 'MysqlColumnNameOrAlias', NULL),
+      ['column_name, sleep(5)', 'MysqlColumnNameOrAlias', NULL],
       // Length checking permits only 64 chars.
-      array(str_repeat('a', 64), 'MysqlColumnNameOrAlias', str_repeat('a', 64)),
-      array(str_repeat('a', 65), 'MysqlColumnNameOrAlias', NULL),
-      array(str_repeat('a', 64) . '.' . str_repeat('a', 64), 'MysqlColumnNameOrAlias', str_repeat('a', 64) . '.' . str_repeat('a', 64)),
-      array('`' . str_repeat('a', 64) . '`.`' . str_repeat('b', 64) . '`', 'MysqlColumnNameOrAlias', '`' . str_repeat('a', 64) . '`.`' . str_repeat('b', 64) . '`'),
-      array(str_repeat('a', 64) . '.' . str_repeat('a', 65), 'MysqlColumnNameOrAlias', NULL),
-      array(str_repeat('a', 65) . '.' . str_repeat('a', 64), 'MysqlColumnNameOrAlias', NULL),
+      [str_repeat('a', 64), 'MysqlColumnNameOrAlias', str_repeat('a', 64)],
+      [str_repeat('a', 65), 'MysqlColumnNameOrAlias', NULL],
+      [str_repeat('a', 64) . '.' . str_repeat('a', 64), 'MysqlColumnNameOrAlias', str_repeat('a', 64) . '.' . str_repeat('a', 64)],
+      ['`' . str_repeat('a', 64) . '`.`' . str_repeat('b', 64) . '`', 'MysqlColumnNameOrAlias', '`' . str_repeat('a', 64) . '`.`' . str_repeat('b', 64) . '`'],
+      [str_repeat('a', 64) . '.' . str_repeat('a', 65), 'MysqlColumnNameOrAlias', NULL],
+      [str_repeat('a', 65) . '.' . str_repeat('a', 64), 'MysqlColumnNameOrAlias', NULL],
       // ORDER BY can be ASC or DESC, case not significant.
-      array('asc', 'MysqlOrderByDirection', 'asc'),
-      array('DESC', 'MysqlOrderByDirection', 'desc'),
-      array('DESCc', 'MysqlOrderByDirection', NULL),
-      array('table.civicrm_column_name desc', 'MysqlOrderBy', 'table.civicrm_column_name desc'),
-      array('field(civicrm_column_name,4,5,6)', 'MysqlOrderBy', 'field(civicrm_column_name,4,5,6)'),
-      array('field(table.civicrm_column_name,4,5,6)', 'MysqlOrderBy', 'field(table.civicrm_column_name,4,5,6)'),
-      array('table.civicrm_column_name desc,other_column, another_column desc', 'MysqlOrderBy', 'table.civicrm_column_name desc,other_column, another_column desc'),
-      array('table.`Home-street_address` asc, `table-alias`.`Home-street_address` desc,`table-alias`.column', 'MysqlOrderBy', 'table.`Home-street_address` asc, `table-alias`.`Home-street_address` desc,`table-alias`.column'),
+      ['asc', 'MysqlOrderByDirection', 'asc'],
+      ['DESC', 'MysqlOrderByDirection', 'desc'],
+      ['DESCc', 'MysqlOrderByDirection', NULL],
+      ['table.civicrm_column_name desc', 'MysqlOrderBy', 'table.civicrm_column_name desc'],
+      ['field(civicrm_column_name,4,5,6)', 'MysqlOrderBy', 'field(civicrm_column_name,4,5,6)'],
+      ['field(table.civicrm_column_name,4,5,6)', 'MysqlOrderBy', 'field(table.civicrm_column_name,4,5,6)'],
+      ['table.civicrm_column_name desc,other_column, another_column desc', 'MysqlOrderBy', 'table.civicrm_column_name desc,other_column, another_column desc'],
+      ['table.`Home-street_address` asc, `table-alias`.`Home-street_address` desc,`table-alias`.column', 'MysqlOrderBy', 'table.`Home-street_address` asc, `table-alias`.`Home-street_address` desc,`table-alias`.column'],
       // Lab issue dev/core#93 allow for 3 column orderby
-      array('contact_id.gender_id.label', 'MysqlOrderBy', 'contact_id.gender_id.label'),
-      array('a string', 'String', 'a string'),
-      array('{"contact":{"contact_id":205}}', 'Json', '{"contact":{"contact_id":205}}'),
-      array('{"contact":{"contact_id":!n†rude®}}', 'Json', NULL),
-    );
+      ['contact_id.gender_id.label', 'MysqlOrderBy', 'contact_id.gender_id.label'],
+      ['a string', 'String', 'a string'],
+      ['{"contact":{"contact_id":205}}', 'Json', '{"contact":{"contact_id":205}}'],
+      ['{"contact":{"contact_id":!n†rude®}}', 'Json', NULL],
+    ];
   }
 
   /**
@@ -95,43 +95,43 @@ class CRM_Utils_TypeTest extends CiviUnitTestCase {
    * @return array
    */
   public function escapeDataProvider() {
-    return array(
-      array(10, 'Int', 10),
-      array('145E+3', 'Int', NULL),
-      array('10', 'Integer', 10),
-      array(-10, 'Int', -10),
-      array(array(), 'Integer', NULL),
-      array('-10foo', 'Int', NULL),
-      array(10, 'Positive', 10),
-      array('145.0E+3', 'Positive', NULL),
-      array('10', 'Positive', 10),
-      array(-10, 'Positive', NULL),
-      array('-10', 'Positive', NULL),
-      array('-10foo', 'Positive', NULL),
-      array(array('10', 20), 'Country', array('10', 20)),
-      array(array('10', '-10foo'), 'Country', NULL),
-      array('', 'Timestamp', ''),
-      array('', 'ContactReference', ''),
-      array('3', 'ContactReference', 3),
-      array('-3', 'ContactReference', NULL),
+    return [
+      [10, 'Int', 10],
+      ['145E+3', 'Int', NULL],
+      ['10', 'Integer', 10],
+      [-10, 'Int', -10],
+      [[], 'Integer', NULL],
+      ['-10foo', 'Int', NULL],
+      [10, 'Positive', 10],
+      ['145.0E+3', 'Positive', NULL],
+      ['10', 'Positive', 10],
+      [-10, 'Positive', NULL],
+      ['-10', 'Positive', NULL],
+      ['-10foo', 'Positive', NULL],
+      [['10', 20], 'Country', ['10', 20]],
+      [['10', '-10foo'], 'Country', NULL],
+      ['', 'Timestamp', ''],
+      ['', 'ContactReference', ''],
+      ['3', 'ContactReference', 3],
+      ['-3', 'ContactReference', NULL],
       // Escape function is meant for sql, not xss
-      array('<p onclick="alert(\'xss\');">Hello</p>', 'Memo', '<p onclick=\\"alert(\\\'xss\\\');\\">Hello</p>'),
-      array('civicrm_column_name', 'MysqlColumnNameOrAlias', '`civicrm_column_name`'),
-      array('table.civicrm_column_name', 'MysqlColumnNameOrAlias', '`table`.`civicrm_column_name`'),
-      array('table.civicrm_column_name.toomanydots', 'MysqlColumnNameOrAlias', NULL),
-      array('Home-street_address', 'MysqlColumnNameOrAlias', '`Home-street_address`'),
-      array('`Home-street_address`', 'MysqlColumnNameOrAlias', '`Home-street_address`'),
-      array('`Home-street_address', 'MysqlColumnNameOrAlias', NULL),
-      array('column_name, sleep(5)', 'MysqlColumnNameOrAlias', NULL),
-      array('asc', 'MysqlOrderByDirection', 'asc'),
-      array('DESC', 'MysqlOrderByDirection', 'desc'),
-      array('DESCc', 'MysqlOrderByDirection', NULL),
-      array('table.civicrm_column_name desc', 'MysqlOrderBy', '`table`.`civicrm_column_name` desc'),
-      array('field(contribution_status_id,4,5,6) asc', 'MysqlOrderBy', 'field(`contribution_status_id`,4,5,6) asc'),
-      array('field(contribution_status_id,4,5,6) asc, contact_id asc', 'MysqlOrderBy', 'field(`contribution_status_id`,4,5,6) asc, `contact_id` asc'),
-      array('table.civicrm_column_name desc,other_column,another_column desc', 'MysqlOrderBy', '`table`.`civicrm_column_name` desc, `other_column`, `another_column` desc'),
-      array('table.`Home-street_address` asc, `table-alias`.`Home-street_address` desc,`table-alias`.column', 'MysqlOrderBy', '`table`.`Home-street_address` asc, `table-alias`.`Home-street_address` desc, `table-alias`.`column`'),
-    );
+      ['<p onclick="alert(\'xss\');">Hello</p>', 'Memo', '<p onclick=\\"alert(\\\'xss\\\');\\">Hello</p>'],
+      ['civicrm_column_name', 'MysqlColumnNameOrAlias', '`civicrm_column_name`'],
+      ['table.civicrm_column_name', 'MysqlColumnNameOrAlias', '`table`.`civicrm_column_name`'],
+      ['table.civicrm_column_name.toomanydots', 'MysqlColumnNameOrAlias', NULL],
+      ['Home-street_address', 'MysqlColumnNameOrAlias', '`Home-street_address`'],
+      ['`Home-street_address`', 'MysqlColumnNameOrAlias', '`Home-street_address`'],
+      ['`Home-street_address', 'MysqlColumnNameOrAlias', NULL],
+      ['column_name, sleep(5)', 'MysqlColumnNameOrAlias', NULL],
+      ['asc', 'MysqlOrderByDirection', 'asc'],
+      ['DESC', 'MysqlOrderByDirection', 'desc'],
+      ['DESCc', 'MysqlOrderByDirection', NULL],
+      ['table.civicrm_column_name desc', 'MysqlOrderBy', '`table`.`civicrm_column_name` desc'],
+      ['field(contribution_status_id,4,5,6) asc', 'MysqlOrderBy', 'field(`contribution_status_id`,4,5,6) asc'],
+      ['field(contribution_status_id,4,5,6) asc, contact_id asc', 'MysqlOrderBy', 'field(`contribution_status_id`,4,5,6) asc, `contact_id` asc'],
+      ['table.civicrm_column_name desc,other_column,another_column desc', 'MysqlOrderBy', '`table`.`civicrm_column_name` desc, `other_column`, `another_column` desc'],
+      ['table.`Home-street_address` asc, `table-alias`.`Home-street_address` desc,`table-alias`.column', 'MysqlOrderBy', '`table`.`Home-street_address` asc, `table-alias`.`Home-street_address` desc, `table-alias`.`column`'],
+    ];
   }
 
 }