summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Tests/Auth/OpenID/Consumer.php6
-rw-r--r--Tests/Auth/OpenID/Discover_OpenID.php1
-rw-r--r--Tests/Auth/OpenID/KVForm.php2
-rw-r--r--Tests/Auth/OpenID/Message.php1
-rw-r--r--Tests/Auth/OpenID/OpenID_Yadis.php7
-rw-r--r--Tests/Auth/OpenID/Server.php1
-rw-r--r--Tests/Auth/OpenID/StoreTest.php1
-rw-r--r--Tests/Services/Yadis/DiscoverData.php5
-rw-r--r--Tests/Services/Yadis/Discover_Yadis.php1
-rw-r--r--Tests/TestDriver.php2
10 files changed, 27 insertions, 0 deletions
diff --git a/Tests/Auth/OpenID/Consumer.php b/Tests/Auth/OpenID/Consumer.php
index 2af932f..bab5f18 100644
--- a/Tests/Auth/OpenID/Consumer.php
+++ b/Tests/Auth/OpenID/Consumer.php
@@ -39,6 +39,7 @@ class Auth_OpenID_TestConsumer extends Auth_OpenID_GenericConsumer {
*/
}
+global $_Auth_OpenID_assocs;
$_Auth_OpenID_assocs = array(
array('another 20-byte key.', 'Snarky'),
array(str_repeat("\x00", 20), 'Zeros'),
@@ -154,6 +155,7 @@ class Auth_OpenID_TestFetcher extends Services_Yadis_HTTPFetcher {
}
}
+global $_Auth_OpenID_user_page_pat;
$_Auth_OpenID_user_page_pat = "<html>
<head>
<title>A user page</title>
@@ -164,7 +166,10 @@ $_Auth_OpenID_user_page_pat = "<html>
</body>
</html>";
+global $_Auth_OpenID_server_url;
$_Auth_OpenID_server_url = "http://server.example.com/";
+
+global $_Auth_OpenID_consumer_url;
$_Auth_OpenID_consumer_url = "http://consumer.example.com/";
class Tests_Auth_OpenID_Consumer extends PHPUnit_TestCase {
@@ -2119,6 +2124,7 @@ if (!defined('Auth_OpenID_NO_MATH_SUPPORT') &&
}
// Add other test cases to be run.
+global $Tests_Auth_OpenID_Consumer_other;
$Tests_Auth_OpenID_Consumer_other = array(
// new Tests_Auth_OpenID_Consumer_TestSetupNeeded(),
new Tests_Auth_OpenID_Consumer_TestCheckAuth(),
diff --git a/Tests/Auth/OpenID/Discover_OpenID.php b/Tests/Auth/OpenID/Discover_OpenID.php
index a77cbf1..43ab1a1 100644
--- a/Tests/Auth/OpenID/Discover_OpenID.php
+++ b/Tests/Auth/OpenID/Discover_OpenID.php
@@ -526,6 +526,7 @@ class Tests_Auth_OpenID_DiscoverSession {
}
}
+global $__Tests_BOGUS_SERVICE;
$__Tests_BOGUS_SERVICE = new Auth_OpenID_ServiceEndpoint();
$__Tests_BOGUS_SERVICE->claimed_id = "=really.bogus.endpoint";
diff --git a/Tests/Auth/OpenID/KVForm.php b/Tests/Auth/OpenID/KVForm.php
index d6bcc71..0440792 100644
--- a/Tests/Auth/OpenID/KVForm.php
+++ b/Tests/Auth/OpenID/KVForm.php
@@ -16,7 +16,9 @@
require_once 'PHPUnit.php';
require_once 'Auth/OpenID/KVForm.php';
+global $_Tests_Auth_OpenID_kverrors;
$_Tests_Auth_OpenID_kverrors = null;
+
/**
* Keep a list of the logged errors
*/
diff --git a/Tests/Auth/OpenID/Message.php b/Tests/Auth/OpenID/Message.php
index 5b24727..9c4e637 100644
--- a/Tests/Auth/OpenID/Message.php
+++ b/Tests/Auth/OpenID/Message.php
@@ -1078,6 +1078,7 @@ class Tests_Auth_OpenID_NamespaceMap extends PHPUnit_TestCase {
class Tests_Auth_OpenID_Message extends PHPUnit_TestCase {
}
+global $Tests_Auth_OpenID_Message_other;
$Tests_Auth_OpenID_Message_other = array(
new Tests_Auth_OpenID_EmptyMessage(),
new Tests_Auth_OpenID_OpenID1Message(),
diff --git a/Tests/Auth/OpenID/OpenID_Yadis.php b/Tests/Auth/OpenID/OpenID_Yadis.php
index 092d043..7ce85d7 100644
--- a/Tests/Auth/OpenID/OpenID_Yadis.php
+++ b/Tests/Auth/OpenID/OpenID_Yadis.php
@@ -9,6 +9,7 @@ require_once "PHPUnit.php";
require_once "Services/Yadis/XRDS.php";
require_once "Auth/OpenID/Discover.php";
+global $__XRDS_BOILERPLATE;
$__XRDS_BOILERPLATE = '<?xml version="1.0" encoding="UTF-8"?>
<xrds:XRDS xmlns:xrds="xri://$xrds"
xmlns="xri://$xrd*($v*2.0)"
@@ -20,6 +21,7 @@ $__XRDS_BOILERPLATE = '<?xml version="1.0" encoding="UTF-8"?>
';
// Different sets of server URLs for use in the URI tag
+global $__server_url_options;
$__server_url_options = array(
array(), // This case should not generate an endpoint object
array('http://server.url/'),
@@ -32,12 +34,14 @@ $__server_url_options = array(
// A couple of example extension type URIs. These are not at all
// official, but are just here for testing.
+global $__ext_types;
$__ext_types = array(
'http://janrain.com/extension/blah',
'http://openid.net/sreg/1.0');
// All valid combinations of Type tags that should produce an OpenID
// endpoint
+global $__openid_types;
$__openid_types = array(
Auth_OpenID_TYPE_1_0,
Auth_OpenID_TYPE_1_1);
@@ -51,9 +55,11 @@ foreach (__subsets($__ext_types) as $exts) {
}
}
+global $__type_uri_options;
$__type_uri_options = $temp;
// Range of valid Delegate tag values for generating test data
+global $__delegate_options;
$__delegate_options = array(
null,
'http://vanity.domain/',
@@ -69,6 +75,7 @@ foreach ($__delegate_options as $delegate) {
}
// All combinations of valid URIs, Type URIs and Delegate tags
+global $__data;
$__data = $temp;
function _mkXRDS($services_str)
diff --git a/Tests/Auth/OpenID/Server.php b/Tests/Auth/OpenID/Server.php
index 962371b..7c37d2d 100644
--- a/Tests/Auth/OpenID/Server.php
+++ b/Tests/Auth/OpenID/Server.php
@@ -32,6 +32,7 @@ function altModulus()
return $num;
}
+global $ALT_GEN;
$ALT_GEN = 5;
function arrayToString($arr)
diff --git a/Tests/Auth/OpenID/StoreTest.php b/Tests/Auth/OpenID/StoreTest.php
index 195a531..a369670 100644
--- a/Tests/Auth/OpenID/StoreTest.php
+++ b/Tests/Auth/OpenID/StoreTest.php
@@ -44,6 +44,7 @@ function _Auth_OpenID_mkdtemp()
* This is the host where the SQL stores' databases should be created
* and destroyed.
*/
+global $_Auth_OpenID_db_test_host;
$_Auth_OpenID_db_test_host = 'dbtest';
/**
diff --git a/Tests/Services/Yadis/DiscoverData.php b/Tests/Services/Yadis/DiscoverData.php
index 5fb9865..60aa5e2 100644
--- a/Tests/Services/Yadis/DiscoverData.php
+++ b/Tests/Services/Yadis/DiscoverData.php
@@ -3,6 +3,7 @@
require_once "Services/Yadis/Yadis.php";
require_once "Tests/Services/Yadis/TestUtil.php";
+global $testlist;
$testlist = array(
// success, input_name, id_name, result_name
array(true, "equiv", "equiv", "xrds"),
@@ -29,9 +30,13 @@ function getExampleXRDS()
return Tests_Services_Yadis_readdata('example-xrds.xml');
}
+global $example_xrds;
$example_xrds = getExampleXRDS();
+
+global $default_test_file;
$default_test_file = 'test1-discover.txt';
+global $discover_tests;
$discover_tests = array();
function readTests($filename)
diff --git a/Tests/Services/Yadis/Discover_Yadis.php b/Tests/Services/Yadis/Discover_Yadis.php
index 5ab2690..7ec9d7d 100644
--- a/Tests/Services/Yadis/Discover_Yadis.php
+++ b/Tests/Services/Yadis/Discover_Yadis.php
@@ -5,6 +5,7 @@ require_once "Tests/Services/Yadis/DiscoverData.php";
require_once "Services/Yadis/Yadis.php";
require_once "Services/Yadis/HTTPFetcher.php";
+global $__status_header_re;
$__status_header_re = '/Status: (\d+) .*?$/m';
function mkResponse($data)
diff --git a/Tests/TestDriver.php b/Tests/TestDriver.php
index 8065975..fa3b494 100644
--- a/Tests/TestDriver.php
+++ b/Tests/TestDriver.php
@@ -18,6 +18,7 @@ require_once 'PHPUnit/GUI/HTML.php';
error_reporting(E_ALL);
+global $__test_errors;
$__test_errors = array();
function __handler($code, $message)
@@ -62,6 +63,7 @@ function __getError()
*/
function loadTests($test_dir, $test_names)
{
+ global $_tests;
$suites = array();
foreach ($test_names as $filename) {
generated by cgit v1.1 at 2025-05-12 17:38:20 +0000