From: sgunderson@bigfoot.com <>
Date: Fri, 23 Sep 2011 00:16:21 +0000 (+0200)
Subject: Add a proper wrapper for php5-swig, which also makes attribute[23] pass. All tests... 
X-Git-Url: https://git.sesse.net/?p=xml-template;a=commitdiff_plain;h=c00c787ebcd86ec94285b708db96a20286e57ab0

Add a proper wrapper for php5-swig, which also makes attribute[23] pass. All tests pass!
---

diff --git a/php5-swig/attribute-empty.php b/php5-swig/attribute-empty.php
index 98555a2..ba4941e 100644
--- a/php5-swig/attribute-empty.php
+++ b/php5-swig/attribute-empty.php
@@ -1,6 +1,5 @@
 <?php
-
-dl("XML_Template_SWIG.so");
+include("xml-template.php");
 
 # NULL values are ignored, but having one helps pointing out that
 # the array given is non-associative
diff --git a/php5-swig/attribute.php b/php5-swig/attribute.php
index 003cf2b..cc06561 100644
--- a/php5-swig/attribute.php
+++ b/php5-swig/attribute.php
@@ -1,6 +1,6 @@
 <?php
+include("xml-template.php");
 
-dl("XML_Template_SWIG.so");
 $doc = XML_Template_process_file('../xml/clone.xml', array(
 	'color' => 'red',
 	'#things' => array(
diff --git a/php5-swig/attribute2.php b/php5-swig/attribute2.php
index 0202885..95a6970 100644
--- a/php5-swig/attribute2.php
+++ b/php5-swig/attribute2.php
@@ -1,6 +1,6 @@
 <?php
+include("xml-template.php");
 
-dl("XML_Template_SWIG.so");
 $doc = XML_Template_process_file('../xml/clone.xml', array(
 	'color' => 'blue',
 	'#things' => XML_Template_alternate('li/class', array(
diff --git a/php5-swig/attribute3.php b/php5-swig/attribute3.php
index 2156215..74920fd 100644
--- a/php5-swig/attribute3.php
+++ b/php5-swig/attribute3.php
@@ -1,6 +1,6 @@
 <?php
+include("xml-template.php");
 
-dl("XML_Template_SWIG.so");
 $doc = XML_Template_process_file('../xml/clone.xml', array(
 	'color' => 'blue',
 	'#things' => XML_Template_alternate('li/class', array(
diff --git a/php5-swig/clone.php b/php5-swig/clone.php
index 1193ea0..ab0ed7a 100644
--- a/php5-swig/clone.php
+++ b/php5-swig/clone.php
@@ -1,6 +1,6 @@
 <?php
+include("xml-template.php");
 
-dl("XML_Template_SWIG.so");
 $doc = XML_Template_process_file('../xml/clone.xml', array( 
 	'color' => 'blue',
 	'#things' => array(
diff --git a/php5-swig/include.php b/php5-swig/include.php
index 92b71d6..cc98dde 100644
--- a/php5-swig/include.php
+++ b/php5-swig/include.php
@@ -1,6 +1,6 @@
 <?php
+include("xml-template.php");
 
-dl("XML_Template_SWIG.so");
 $doc = XML_Template_process_file('../xml/included.xml', array(
 	'color' => 'red'
 ), false);
diff --git a/php5-swig/namespace.php b/php5-swig/namespace.php
index 9a653dc..b5c8547 100644
--- a/php5-swig/namespace.php
+++ b/php5-swig/namespace.php
@@ -1,6 +1,6 @@
 <?php
+include("xml-template.php");
 
-dl("XML_Template_SWIG.so");
 $doc = XML_Template_process_file('../xml/namespace.xml', array( 
 	'title' => 'Namespace tests',
 	'#hello' => 'Hello world!',
diff --git a/php5-swig/namespace2.php b/php5-swig/namespace2.php
index 04622cf..3111890 100644
--- a/php5-swig/namespace2.php
+++ b/php5-swig/namespace2.php
@@ -1,6 +1,6 @@
 <?php
+include("xml-template.php");
 
-dl("XML_Template_SWIG.so");
 $doc = XML_Template_process_file('../xml/namespace2.xml', array( 
 	'title' => 'Namespace tests',
 	'#hello' => 'Replaced.',
diff --git a/php5-swig/passthru.php b/php5-swig/passthru.php
index 2496b18..c51e1e1 100644
--- a/php5-swig/passthru.php
+++ b/php5-swig/passthru.php
@@ -1,6 +1,6 @@
 <?php
+include("xml-template.php");
 
-dl("XML_Template_SWIG.so");
 $doc = XML_Template_process_file('../xml/passthru.xml', array(), true);
 output_to_fd($doc, 1);
 
diff --git a/php5-swig/simple.php b/php5-swig/simple.php
index a5b7f04..33a512d 100644
--- a/php5-swig/simple.php
+++ b/php5-swig/simple.php
@@ -1,6 +1,6 @@
 <?php
+include("xml-template.php");
 
-dl("XML_Template_SWIG.so");
 $doc = XML_Template_process_file('../xml/simple.xml', array( 
 	'title' => 'A very basic example',
 	'#hello' => 'Hello world!'
diff --git a/php5-swig/structure.php b/php5-swig/structure.php
index b27a040..32399dd 100644
--- a/php5-swig/structure.php
+++ b/php5-swig/structure.php
@@ -1,6 +1,6 @@
 <?php
+include("xml-template.php");
 
-dl("XML_Template_SWIG.so");
 $doc = XML_Template_process_file('../xml/structure.xml', array(
 	'#outer' => array(
 		array( '#inner' => 'One' ),
diff --git a/php5-swig/xml-template.php b/php5-swig/xml-template.php
new file mode 100644
index 0000000..289b9c7
--- /dev/null
+++ b/php5-swig/xml-template.php
@@ -0,0 +1,17 @@
+<?php
+include("XML_Template_SWIG.php");
+
+# FIXME: use varargs here
+function XML_Template_alternate($tag, $array, $elems)
+{
+	$num = count($elems);
+
+	for ($i = 0, $j = 0; $i < count($array); $i++) {
+		if (isset($array[$i])) {
+			$array[$i][$tag] = $elems[$j++ % $num];
+		}
+	}
+
+	return $array;
+}
+?>