Merge branch 'master' into ng/postgresql

4 files changed, 68 insertions, 60 deletions

diff --git a/test/getopt.t b/test/getopt.t
index aa2de52..48f7d9d 100755
--- a/test/getopt.t
+++ b/test/getopt.t
@@ -38,10 +38,9 @@ getopt_ok([], false, "Missing positional argument fails");
 getopt_ok(['posarg', '--argument'], false, "Missing long named argument fails");
 getopt_ok(['posarg', '-a'], false, "Missing short named argument fails");
 
-// FIXME 2020-10 NG enable after fixme in it.class
-// $GLOBALS['usage'] = it::replace('\s*\[VARARGS\]' => '', $GLOBALS['usage']);
-// getopt_ok(['posargs', 'vararg'], false, "Extra positional argument fails");
-// getopt_ok(['posargs', '--zero', 'vararg'], false, "Extra positional argument fails after long argument");
-// getopt_ok(['posargs', '-0', 'vararg'], false, "Extra positional argument fails after short argument");
-// getopt_ok(['posargs', '--argument', 'value', 'vararg'], false, "Extra positional argument fails after long argument with value");
-// getopt_ok(['posargs', '-a', 'value', 'vararg'], false, "Extra positional argument fails after short argument with value");
+$GLOBALS['usage'] = it::replace(['\s*\[VARARGS\]' => ''], $GLOBALS['usage']);
+getopt_ok(['posargs', 'vararg'], false, "Extra positional argument fails");
+getopt_ok(['posargs', '--zero', 'vararg'], false, "Extra positional argument fails after long argument");
+getopt_ok(['posargs', '-0', 'vararg'], false, "Extra positional argument fails after short argument");
+getopt_ok(['posargs', '--argument', 'value', 'vararg'], false, "Extra positional argument fails after long argument with value");
+getopt_ok(['posargs', '-a', 'value', 'vararg'], false, "Extra positional argument fails after short argument with value");
diff --git a/test/it.t b/test/it.t
index 64b0fac..a3abf32 100755
--- a/test/it.t
+++ b/test/it.t
@@ -12,7 +12,7 @@ $oldlocale = setlocale(LC_CTYPE, 0);
 ini_set('default_charset', 'utf-8');
 setlocale(LC_CTYPE, 'de_CH');		# required becuase we're checking German umlauts in latin1 mode
 
-function match($regex, $string, $expect, $name, $p = [])
+function _match($regex, $string, $expect, $name, $p = [])
 {
 	$GLOBALS['TEST_MORE_LEVEL'] = 1;
 	$pass = is (it::match($regex, $string, $p), $expect, $name);
@@ -24,103 +24,103 @@ function match($regex, $string, $expect, $name, $p = [])
 }
 
 
-match(
+_match(
 	'b', 'aaaabaaaa',
 	'b',
 	'simple regex'
 );
 
-match(
+_match(
 	'a/b', '   a/b   ',
 	'a/b',
 	'regex with /'
 );
 
-match(
+_match(
 	'aa(bb)aa(cc)aa(dd)qq', 'aabbaaccaaddqq',
 	['bb', 'cc', 'dd'],
 	'return array of captures'
 );
 
-match(
+_match(
 	'\bblah\b', ' blah ',
 	'blah',
 	'match \b at spaces'
 );
 
-match(
+_match(
 	'\bblah\b', 'blah',
 	'blah',
 	'match \b at end of string'
 );
 
-match(
+_match(
 	'\bblah\b', 'ablahc',
 	null,
 	'don\'t match \b at word chars'
 );
 
-match(
+_match(
 	'\bblah\b', 'Üblahä',
 	null,
 	'don\'t match \b at umlaute'
 );
 
-match(
+_match(
 	'\Bblah\B', ' blah ',
 	null,
 	'don\'t match \B at spaces'
 );
 
-match(
+_match(
 	'\Bblah\B', 'blah',
 	null,
 	'don\'t match \B at end of string'
 );
 
-match(
+_match(
 	'\Bblah\B', 'ablahc',
 	'blah',
 	'match \B at word chars'
 );
 
-match(
+_match(
 	'\Bblah\B', 'Üblahä',
 	'blah',
 	'match \B at umlaute'
 );
 
-match(
+_match(
 	'\w+', '  |#Üblahä   ',
 	'Üblahä',
 	'include umlaute in \w'
 );
 
-match(
+_match(
 	'[[:alpha:]]+', '  |#blahä   ',
 	'blahä',
 	'include umlaute in [[:alpha:]]'
 );
 
-match(
+_match(
 	'\W+', '  |#Üblahä  ',
 	'  |#',
 	'don\'t include umlaute in \W'
 );
 
-match(
+_match(
 	'\ba', 'äa',
 	null,
 	'\b must know umlauts'
 );
 
-match(
+_match(
 	'aaa\\\\w+', '   aaa\www  ',
 	'aaa\www',
 	'don\'t parse \w in \\\\w at beginning (match)'
 );
 
-match(
+_match(
 	'aaa\\\\w+', '   aaa\www  ',
 	'aaa\www',
 	'don\'t parse \w in \\\\w after chars (match)'
@@ -129,105 +129,105 @@ match(
 eval('$escapedwordregex = "' . it::convertregex('\w') . '";');
 $escapedwordregex = preg_replace('|[\\\\/]|', '', $escapedwordregex);
 
-match(
+_match(
 	'\\\\w+',  $escapedwordregex,
 	null,
 	'don\'t parse \w in \\\\w at beginning (no match)'
 );
 
-match(
+_match(
 	'aaa\\\\w+', 'aaa' . $escapedwordregex,
 	null,
 	'don\'t parse \w in \\\\w after chars (no match)'
 );
 
-match(
+_match(
 	'\\\\\\\\w+', '\\' . $escapedwordregex,
 	null,
 	'don\'t parse \w in \\\\\\\w (no match)'
 );
 
-match(
+_match(
 	'\\\\\\\\w+', '  \\\\www  ',
 	'\\\\www',
 	'don\'t parse \\\\\\\\w as \w (match)'
 );
 
-match(
+_match(
 	'[\w]+', '[[[]]]---',
 	null,
 	'replace \w in [\w] correctly (no match)'
 );
 
-match(
+_match(
 	'[\w]+', '  \\\\aword[[[]]]   ',
 	'aword',
 	'replace \w in [\w] correctly (match)'
 );
 
-match(
+_match(
 	'[\\\\w]+', ' blabergna ',
 	null,
 	'don\'t parse \w in [\\\\w] (no match)'
 );
 
-match(
+_match(
 	'[\\\\w]+', '  \\\\worda[[[]',
 	'\\\\w',
 	'don\'t parse \w in [\\\\w] (match)'
 );
 
-match(
+_match(
 	'[a\W]+', 'bbbbbbb a a%$+ accccc',
 	' a a%$+ a',
 	'\W in []'
 );
 
-match(
+_match(
 	'\\\\\\w+', '  \Üblahä  ',
 	'\Üblahä',
 	'parse \w in \\\\\\w at beginning'
 );
 
-match(
+_match(
 	'aaa\\\\\\w+', '  aaa\Üblahä  ',
 	'aaa\Üblahä',
 	'parse \w in \\\\\\w after chars'
 );
 
-match(
+_match(
 	'\w+', 'word1 wörd2 word_3',
 	['word1', 'wörd2', 'word_3'],
 	"test match_all function",
 	['all' => true]
 );
 
-match(
+_match(
 	'aBcD', '  aBcD  ',
 	'aBcD',
 	"caseinsensitive is default"
 );
 
-match(
+_match(
 	'\w+', 'Müller',
 	'Müller',
 	'\w matches umlaut in utf-8 mode'
 );
 
-match(
+_match(
 	'M.ller', 'Müller',
 	'Müller',
 	'. matches umlaut in utf-8 mode'
 );
 
-match(
+_match(
 	utf8_decode('ö'), utf8_decode('Ö'),
 	utf8_decode('Ö'),
 	'match umlaute in de_CH.latin1 case insensitive',
 	['utf8' => false]
 );
 
-match(
+_match(
 	utf8_decode('aöBÜ'), utf8_decode('AÖbü'),
 	utf8_decode('AÖbü'),
 	"match umlaute with non-utf-8 override in p",
@@ -235,35 +235,35 @@ match(
 );
 
 
-match(
+_match(
 	'abc', "aBc",
 	null,
 	"set case sensitivity by parameter",
 	['casesensitive' => 1]
 );
 
-match(
+_match(
 	'\w+', 'word1 wörd2 word_3',
 	['word1', 'wörd2', 'word_3'],
 	"test all => 1 without captures",
 	['all' => 1]
 );
 
-match(
+_match(
 	'\w+\s+(\d+)', 'word1 12 wörd2 3 word_3 4',
 	['12', '3', '4'],
 	"test all => 1 with one capture",
 	['all' => 1]
 );
 
-match(
+_match(
 	'(\w+)\s+(\d+)', 'word1 12 wörd2 3 word_3 4',
 	[['word1', '12'], ['wörd2', '3'], ['word_3', '4']],
 	"test all => 1 with captures",
 	['all' => 1]
 );
 
-match(
+_match(
 	'(\w+)\s+(\d+)', 'word1 12 wörd2 3 word_3 4',
 	[['word1', 'wörd2', 'word_3'], ['12', '3', '4']],
 	"test all => 1,pattern_order => 1",
@@ -271,7 +271,7 @@ match(
 );
 
 ini_set('default_charset', 'iso-8859-1');
-match(
+_match(
 	'aöBÜ', "AÖbü",
 	'AÖbü',
 	"match utf-8 umlaute in case insensitive mode with utf8 override",
@@ -381,6 +381,10 @@ is(it::ucwords('foo bär über'), 'Foo Bär Über');
 # it::substr_replace
 is(it::substr_replace('abcdefgh', 'xyz', 2, 4), substr_replace('abcdefgh', 'xyz', 2, 4), 'it::substr_replace the same as substr_replace for ascii');
 is(it::substr_replace('✔☯♥', '☃☃', 1, 1), '✔☃☃♥', 'it::substr_replace for utf-8');
+is(it::substr_replace('', 'xyz', 0, 0), substr_replace('', 'xyz', 0, 0), 'it::substr_replace with empty haystack the same as substr_replace');
+is(it::substr_replace('abc', 'xyz', 0, 2), substr_replace('abc', 'xyz', 0, 2), 'it::substr_replace replacing to end of haystack');
+is(it::substr_replace('abc', 'xyz', 0, 10), substr_replace('abc', 'xyz', 0, 10), 'it::substr_replace replacing past end of haystack');
+is(it::substr_replace('abcdefgh', 'xyz', 10, 4), substr_replace('abcdefgh', 'xyz', 10, 4), 'it::substr_replace outside of string');
 
 is(grapheme_strlen("\xc1"), null, "need grapheme_strlen side effect for any2utf8");
 
@@ -448,6 +452,7 @@ is(it::mod(7, 4), 3);
 
 is(it::map('5*$k+$v', [0 => 1, 1 => 2]), [1, 7]);
 is(it::map(function($k, $v) {return 5*$k+$v;}, [0 => 1, 1 => 2]), [1, 7]);
+is(it::map(function($v) {return 2*$v;}, [0 => 1, 1 => 2]), [2, 4]);
 is(it::map('strlen', ["aaa", "aa"]), [3, 2]);
 is(it::map('it::ucfirst', ["aaa"]), ["Aaa"]);
 $dom = new DOMDocument;
@@ -465,6 +470,8 @@ is(it::map('2*$v', ['foo' => 1, 'bar' => 2], ['keys' => 'foo']), ['foo' => 2, 'b
 # it::filter
 is(it::filter('$v > 2', [1, 5 => 2, 2 => 3]), [2 => 3]);
 is(it::filter('$k > 2', [1, 5 => 2, 2 => 3]), [5 => 2]);
+is(it::filter(function($v) {return $v > 2;}, [1, 5 => 2, 2 => 3]), [2 => 3]);
+is(it::filter(function($k, $v) {return $k > 2;}, [1, 5 => 2, 2 => 3]), [5 => 2]);
 
 is(it::split("b", "aba"),                               ["a", "a"]);
 is(it::split("b", "aBa"),                               ["a", "a"]);
diff --git a/test/it_text.t b/test/it_text.t
index 5629d51..6726996 100755
--- a/test/it_text.t
+++ b/test/it_text.t
@@ -1,7 +1,9 @@
 #!/www/server/bin/php
 <?php
 
+$obj = (object)[];
 $obj->x = "attr";
+$obj->y = (object)[];
 $obj->y->z = "attr";
 
 is(it_text::transmogrify(""), "");
diff --git a/test/it_xml.t b/test/it_xml.t
index 27f910f..e21f052 100755
--- a/test/it_xml.t
+++ b/test/it_xml.t
@@ -3,7 +3,7 @@
 
 # Tests for xml.class
 
-function match($xmldata, $expected, $name, $prefix = "", $p = [])
+function _match($xmldata, $expected, $name, $prefix = "", $p = [])
 {
 	$classname = ($prefix ?: "it") . "_xml";
 	$varname  = $prefix . "foo";
@@ -31,37 +31,37 @@ function match($xmldata, $expected, $name, $prefix = "", $p = [])
 	);
 }
 
-match(
+_match(
 	'<foo />',
 	'foo Object ( ) ',
 	'empty tag'
 );
 
-match(
+_match(
 	'<foo /><foo />',
 	'Array ( [0] => foo Object ( ) [1] => foo Object ( ) ) ',
 	'multiple empty tags converted to array'
 );
 
-match(
+_match(
 	'<foo title="Zürich">Stüssihofstadt</foo>',
 	'foo Object ( [attr] => Array ( [title] => Zürich ) [val] => Stüssihofstadt ) ',
 	'simple tag with latin1 content and attribute'
 );
 
-match(
+_match(
 	'<foo><ns:a.b.-c ns2:d.e-f="value" /></foo>',
 	'foo Object ( [a_b__c] => a_b__c Object ( [attr] => Array ( [d_e_f] => value ) ) ) ',
 	'Tags and attributes with name space and special characters'
 );
 
-match(
+_match(
 	'<foo>x &amp; y</foo>',
 	'foo Object ( [val] => x & y ) ',
 	'Character data with entities'
 );
 
-match(
+_match(
 	'<foo>x &uuml; y</foo>',
 	utf8_decode('foo Object ( [val] => x ü y ) '),
 	'Manual encoding override',
@@ -69,13 +69,13 @@ match(
 	['encoding' => "iso-8859-1"]
 );
 
-match(
+_match(
 	'<foo>&amp;amp; &lt;a&gt; &#38;amp; &#60;b&#62; &#x26;amp; &#x3C;c&#x3E; &uuml;</foo>',
 	'foo Object ( [val] => &amp; <a> &amp; <b> &amp; <c> ü ) ',
 	'Predecode illegal entities while keeping properly encoded ones'
 );
 
-match(
+_match(
 	'<foo>&amp;amp; &lt;a&gt; &#38;amp; &#60;b&#62; &#x26;amp; &#x3C;c&#x3E; &#xFC;</foo>',
 	utf8_decode('foo Object ( [val] => &amp; <a> &amp; <b> &amp; <c> ü ) '),
 	'Predecode illegal entities while keeping properly encoded ones (iso-8859-1)',
@@ -83,7 +83,7 @@ match(
 	['encoding' => "iso-8859-1"]
 );
 
-match(
+_match(
 	"<foo>a\x05b</foo>",
 	'foo Object ( [val] => a b ) ',
 	'Illegal latin 1 character',
@@ -109,7 +109,7 @@ function __construct($xmldata)
 
 }
 
-match(
+_match(
 	'<myfoo />',
 	'myfoo Object ( [inheritbaseclass] => ) ',
 	'Inheritance and constructor (critical for e.g. tel_xmlentry)',
@@ -118,7 +118,7 @@ match(
 
 $x = new foo("<foo></foo>", ['prefix' => "test"]);
 $x->set(['gna' => 42, 'bar' => ['baz' => ["qux", "quux"]]]);
-match(
+_match(
 	$x->to_xml(),
 	'foo Object ( [gna] => gna Object ( [val] => 42 ) [bar] => bar Object ( [baz] => Array ( [0] => baz Object ( [val] => qux ) [1] => baz Object ( [val] => quux ) ) ) ) ',
 	"Method set()"