[project @ fpeters@0d.be-20080328175710-s4031yloqsdbmvel]

merging benjamin branch

Original author: Frederic Peters <fpeters@0d.be>
Date: 2008-03-28 18:57:10.522000+01:00

7 files changed, 17 insertions, 10 deletions

diff --git a/bindings/php5/Makefile.am b/bindings/php5/Makefile.am
index a5682282..7c898803 100644
--- a/bindings/php5/Makefile.am
+++ b/bindings/php5/Makefile.am
@@ -1,3 +1,5 @@
+SUBDIRS = tests examples
+
 if PHP5_ENABLED
 INCLUDES = -I$(top_srcdir) \
 	-I$(top_builddir) \
diff --git a/bindings/php5/examples/Makefile.am b/bindings/php5/examples/Makefile.am
new file mode 100644
index 00000000..731cee07
--- /dev/null
+++ b/bindings/php5/examples/Makefile.am
@@ -0,0 +1 @@
+EXTRA_DIST = get_attributes_from_assertion.php
diff --git a/bindings/php5/tests/Makefile.am b/bindings/php5/tests/Makefile.am
new file mode 100644
index 00000000..72851d43
--- /dev/null
+++ b/bindings/php5/tests/Makefile.am
@@ -0,0 +1,6 @@
+if PHP5_ENABLED
+TESTS = profile_tests.sh binding_tests.sh
+endif
+
+EXTRA_DIST = profile_tests.php binding_tests.php
+
diff --git a/bindings/php5/tests/binding_tests.php b/bindings/php5/tests/binding_tests.php
index d4614154..240be092 100755
--- a/bindings/php5/tests/binding_tests.php
+++ b/bindings/php5/tests/binding_tests.php
@@ -1,4 +1,3 @@
-#! /usr/bin/env php
 <?php
 # Lasso - A free implementation of the Liberty Alliance specifications.
 # 
diff --git a/bindings/php5/tests/binding_tests.sh b/bindings/php5/tests/binding_tests.sh
new file mode 100755
index 00000000..9f3e9e17
--- /dev/null
+++ b/bindings/php5/tests/binding_tests.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+php5 -n -d extension_dir=../.libs binding_tests.php
diff --git a/bindings/php5/tests/profile_tests.php b/bindings/php5/tests/profile_tests.php
index cb8f4ade..71d525bf 100755
--- a/bindings/php5/tests/profile_tests.php
+++ b/bindings/php5/tests/profile_tests.php
@@ -1,4 +1,3 @@
-#! /usr/bin/env php
 <?php
 # Lasso - A free implementation of the Liberty Alliance specifications.
 # 
@@ -112,10 +111,7 @@ function test04() {
     try {
         $login->processResponseMsg("");
     }
-    catch (LassoError $error) {
-        if ($error->getCode() != LASSO_PARAM_ERROR_INVALID_VALUE) {
-            throw $error;
-        }
+    catch (LassoProfileInvalidMsgError $error) {
     }
 
     echo "OK.\n";
@@ -193,10 +189,7 @@ function test06() {
         echo "logout.initRequest without having set identity before should fail\n";
         assert(False);
     }
-    catch (LassoError $error) {
-        if ($error->getCode() != LASSO_PROFILE_ERROR_SESSION_NOT_FOUND) {
-            throw $error;
-        }
+    catch (LassoProfileSessionNotFoundError $error) {
     }
 
     echo "OK.\n";
diff --git a/bindings/php5/tests/profile_tests.sh b/bindings/php5/tests/profile_tests.sh
new file mode 100755
index 00000000..446131df
--- /dev/null
+++ b/bindings/php5/tests/profile_tests.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+php5 -n -d extension_dir=../.libs profile_tests.php