simpletest changes for php 5.3.1 (strict)

git-svn-id: http://dev.piwik.org/svn/trunk@1612 59fd770c-687e-43c8-a1e3-f5a4ff64c105

tests/config_test.php

@@ -25,7 +25,7 @@ require_once PIWIK_INCLUDE_PATH .'/core/Loader.php';
 					
 require_once 'simpletest/autorun.php';
 require_once 'simpletest/mock_objects.php';
-SimpleTest :: prefer(new HtmlReporter());
+SimpleTest::prefer(new HtmlReporter());
 
 error_reporting(E_ALL|E_NOTICE);
 //@date_default_timezone_set('Europe/London');

tests/simpletest/expectation.php

@@ -441,6 +441,8 @@ class OutsideMarginExpectation extends WithinMarginExpectation {
     }
 }
 
+// test() method is incompatible with SimpleExpectation (php 5.3.1)
+if(0){
 /**
  *    Test for reference.
  *    @package SimpleTest
@@ -491,6 +493,7 @@ class ReferenceExpectation extends SimpleExpectation {
         return $this->_value;
     }
 }
+}
 
 /**
  *    Test for identity.

tests/simpletest/simpletest.php

@@ -87,7 +87,7 @@ class SimpleTest {
      *   @access public
      *   @see preferred()
      */
-    function prefer(&$object) {
+    public static function prefer(&$object) {
         $registry = &SimpleTest::_getRegistry();
         $registry['Preferred'][] = &$object;
     }
@@ -202,7 +202,7 @@ class SimpleTest {
      *    @access private
      *    @static
      */
-    function &_getRegistry() {
+    public static function &_getRegistry() {
         static $registry = false;
         if (! $registry) {
             $registry = SimpleTest::_getDefaults();
@@ -231,7 +231,7 @@ class SimpleTest {
      *    @access private
      *    @static
      */
-    function _getDefaults() {
+    private static function _getDefaults() {
         return array(
                 'StubBaseClass' => 'SimpleStub',
                 'MockBaseClass' => 'SimpleMock',