From: Raphaël Gertz <git@rapsys.eu>
Date: Tue, 8 Jan 2019 17:59:32 +0000 (+0100)
Subject: Switch to single|root|multi type
X-Git-Url: https://git.rapsys.eu/bbcode/commitdiff_plain/2d6495ed5c357dbfcfbd6aedf6b24b406225e128?ds=sidebyside

Switch to single|root|multi type
Adapt to new data structure
---

diff --git a/tests/002.phpt b/tests/002.phpt
index a1359a4..b9d101a 100644
--- a/tests/002.phpt
+++ b/tests/002.phpt
@@ -6,33 +6,35 @@ Check for bbcode functions
 <?php
 $obj = new bbcode(
 	[
+		'img' => [
+		],
 		'' => [
 			'type' => BBCODE::TYPE_ROOT,
-			'childs' => ['ul','url','img','b','i']
+			'child' => ['ul','url','img','b','i']
 		],
 		'i' => [
-			'type' => BBCODE::TYPE_NOARG
+			'type' => BBCODE::TYPE_MULTI
 			//TODO: by default open tag = <KEY> and close tag = </KEY>
 		],
 		'b' => [
-			'type' => BBCODE::TYPE_NOARG
+			'type' => BBCODE::TYPE_MULTI
 		],
 		'ul' => [
-			'type' => BBCODE::TYPE_NOARG,
-			'childs' => [ 'li' ]
+			'type' => BBCODE::TYPE_MULTI,
+			'child' => ['li']
 		],
 		'li' => [
-			'type' => BBCODE::TYPE_NOARG,
-			'parent' => 'ul',
-			'childs' => ['url','img','b','i']
+			'type' => BBCODE::TYPE_MULTI,
+			'parent' => ['ul'],
+			'child' => ['url','img','b','i']
 		],
 		'url' => [
-			'type' => BBCODE::TYPE_OPTARG,
-			'open_tag' => '<a href="{PARAM}">',
-			'close_tag' => '</a>',
-			'default_arg' => '{CONTENT}',
-			'parent' => [ '', 'li', 'b', 'i' ]
-		]
+			'type' => BBCODE::TYPE_MULTI,
+			'parent' => ['','li','b','i'],
+			'open' => '<a%s>',
+			'close' => '</a>',
+			'arg' => 'href'
+		],
 	],
 	[
 		':)' => '<img src="smiley.gif" alt=":)" />',
diff --git a/tests/003.phpt b/tests/003.phpt
index 0e30488..36c3931 100644
--- a/tests/003.phpt
+++ b/tests/003.phpt
@@ -8,30 +8,30 @@ $obj = new bbcode(
 	[
 		'' => [
 			'type' => BBCODE::TYPE_ROOT,
-			'childs' => ['ul','url','img','b','i']
+			'child' => ['ul','url','img','b','i']
 		],
 		'i' => [
-			'type' => BBCODE::TYPE_NOARG
+			'type' => BBCODE::TYPE_MULTI
 			//TODO: by default open tag = <KEY> and close tag = </KEY>
 		],
 		'b' => [
-			'type' => BBCODE::TYPE_NOARG
+			'type' => BBCODE::TYPE_MULTI
 		],
 		'ul' => [
-			'type' => BBCODE::TYPE_NOARG,
-			'childs' => [ 'li' ]
+			'type' => BBCODE::TYPE_MULTI,
+			'child' => [ 'li' ]
 		],
 		'li' => [
-			'type' => BBCODE::TYPE_NOARG,
+			'type' => BBCODE::TYPE_MULTI,
 			'parent' => 'ul',
-			'childs' => ['url','img','b','i']
+			'child' => ['url','img','b','i']
 		],
 		'url' => [
-			'type' => BBCODE::TYPE_OPTARG,
-			'open_tag' => '<a href="{PARAM}">',
-			'close_tag' => '</a>',
-			'default_arg' => '{CONTENT}',
-			'parent' => [ '', 'li', 'b', 'i' ]
+			'type' => BBCODE::TYPE_MULTI,
+			'parent' => [ '', 'li', 'b', 'i', null, 'toto', 0, 42 ],
+			'open' => '<a href="{PARAM}">',
+			'close' => '</a>',
+			'default' => '{CONTENT}'
 		]
 	],
 	[
@@ -40,7 +40,7 @@ $obj = new bbcode(
 		':D' => '<img src="happy.gif" alt=":D" />',
 		':p' => '<img src="tong.gif" alt=":p" />',
 		':|' => '<img src="special.gif" alt=":|" />',
-		':6:' => '<img src="six.gif" alt=":6:" />'
+		':6:' => '<img src="six.gif" alt=":6:" />',
 	],
 	BBCODE::REMOVE_EMPTY
 );