4 files changed, 9 insertions, 10 deletions
diff --git a/Tests/Auth/Yadis/Discover_Yadis.php b/Tests/Auth/Yadis/Discover_Yadis.php
index 0ca3b2e..4a486a8 100644
--- a/Tests/Auth/Yadis/Discover_Yadis.php
+++ b/Tests/Auth/Yadis/Discover_Yadis.php
@@ -26,7 +26,7 @@ function mkResponse($data)
     return $r;
 }
 class TestFetcher {
-    function TestFetcher($base_url)
+    function __construct($base_url)
     {
         $this->base_url = $base_url;
     }
@@ -73,7 +73,7 @@ class NoContentTypeFetcher {
 }
 
 class MockFetcher {
-    function MockFetcher() {
+    function __construct() {
         $this->count = 0;
     }
 
@@ -103,7 +103,7 @@ class TestSecondGet extends PHPUnit_Framework_TestCase {
 class _TestCase extends PHPUnit_Framework_TestCase {
     var $base_url = 'http://invalid.unittest/';
 
-    function _TestCase($input_name, $id_name, $result_name, $success)
+    function __construct($input_name, $id_name, $result_name, $success)
     {
       parent::__construct();
         $this->input_name = $input_name;
@@ -169,7 +169,7 @@ class Tests_Auth_Yadis_Discover_Yadis extends PHPUnit_Framework_TestSuite {
         return "Tests_Auth_Yadis_Discover_Yadis";
     }
 
-    function Tests_Auth_Yadis_Discover_Yadis()
+    function __construct()
     {
         global $testlist;
 
diff --git a/Tests/Auth/Yadis/ParseHTML.php b/Tests/Auth/Yadis/ParseHTML.php
index e3977bc..444946d 100644
--- a/Tests/Auth/Yadis/ParseHTML.php
+++ b/Tests/Auth/Yadis/ParseHTML.php
@@ -17,7 +17,7 @@ require_once 'Tests/Auth/Yadis/TestUtil.php';
 require_once 'Auth/Yadis/ParseHTML.php';
 
 class Tests_Auth_Yadis_ParseTest extends PHPUnit_Framework_TestCase {
-    function Tests_Auth_Yadis_ParseTest($case)
+    function __construct($case)
     {
         list($result, $comment, $html) = $case;
 
@@ -72,7 +72,7 @@ class Tests_Auth_Yadis_ParseHTML extends PHPUnit_Framework_TestSuite {
         return $tests;
     }
 
-    function Tests_Auth_Yadis_ParseHTML()
+    function __construct()
     {
         $test_data = Tests_Auth_Yadis_readdata('test1-parsehtml.txt');
 
diff --git a/Tests/Auth/Yadis/XRI.php b/Tests/Auth/Yadis/XRI.php
index 403b1e3..2251f23 100644
--- a/Tests/Auth/Yadis/XRI.php
+++ b/Tests/Auth/Yadis/XRI.php
@@ -131,7 +131,7 @@ class Tests_Auth_Yadis_XRI extends PHPUnit_Framework_TestSuite {
         return "Tests_Auth_Yadis_XRI";
     }
 
-    function Tests_Auth_Yadis_XRI()
+    function __construct()
     {
         $this->addTest(new Tests_Auth_Yadis_ProxyQueryTestCase());
         $this->addTest(new Tests_Auth_Yadis_XriEscapingTestCase());
diff --git a/Tests/Auth/Yadis/Yadis.php b/Tests/Auth/Yadis/Yadis.php
index 5672a15..51efb14 100644
--- a/Tests/Auth/Yadis/Yadis.php
+++ b/Tests/Auth/Yadis/Yadis.php
@@ -9,8 +9,7 @@ require_once 'Tests/Auth/Yadis/TestUtil.php';
 
 class Tests_Auth_Yadis_DiscoveryTest extends PHPUnit_Framework_TestCase {
 
-    function Tests_Auth_Yadis_DiscoveryTest($input_url, $redir_uri,
-                                                $xrds_uri, $num)
+    function __construct($input_url, $redir_uri, $xrds_uri, $num)
     {
         $this->input_url = $input_url;
         $this->redir_uri = $redir_uri;
@@ -68,7 +67,7 @@ class Tests_Auth_Yadis_Yadis extends PHPUnit_Framework_TestSuite {
         return $tests;
     }
 
-    function Tests_Auth_Yadis_Yadis()
+    function __construct()
     {
         $test_data = file_get_contents('http://www.openidenabled.com/resources/yadis-test/discover/manifest.txt');