diff --git a/thirdparty/simpletest/compatibility.php b/thirdparty/simpletest/compatibility.php
index 4e0f78a4b..31f31b7df 100644
--- a/thirdparty/simpletest/compatibility.php
+++ b/thirdparty/simpletest/compatibility.php
@@ -19,7 +19,7 @@ class SimpleTestCompatibility {
      *    @access public
      *    @static
      */
-    function copy($object) {
+    static function copy($object) {
         if (version_compare(phpversion(), '5') >= 0) {
             eval('$copy = clone $object;');
             return $copy;
@@ -170,4 +170,4 @@ class SimpleTestCompatibility {
         }
     }
 }
-?>
\ No newline at end of file
+?>
diff --git a/thirdparty/simpletest/form.php b/thirdparty/simpletest/form.php
index b359552f4..be85e2e01 100644
--- a/thirdparty/simpletest/form.php
+++ b/thirdparty/simpletest/form.php
@@ -120,7 +120,7 @@ class SimpleForm {
         $class = $this->_encoding;
         $encoding = new $class();
         for ($i = 0, $count = count($this->_widgets); $i < $count; $i++) {
-            $this->_widgets[$i]->write($encoding);
+            $this->_widgets[$i]->write($encoding, 0, 0);
         }
         return $encoding;
     }
@@ -305,7 +305,7 @@ class SimpleForm {
         foreach ($this->_buttons as $button) {
             if ($selector->isMatch($button)) {
                 $encoding = $this->_encode();
-                $button->write($encoding);
+                $button->write($encoding, 0, 0);
                 if ($additional) {
                     $encoding->merge($additional);
                 }
diff --git a/thirdparty/simpletest/page.php b/thirdparty/simpletest/page.php
index 6c037626c..54b26acfd 100644
--- a/thirdparty/simpletest/page.php
+++ b/thirdparty/simpletest/page.php
@@ -980,4 +980,4 @@ class SimplePage {
         return null;
     }
 }
-?>
+
diff --git a/thirdparty/simpletest/parser.php b/thirdparty/simpletest/parser.php
index 93f8cf980..35616d717 100644
--- a/thirdparty/simpletest/parser.php
+++ b/thirdparty/simpletest/parser.php
@@ -690,7 +690,7 @@ class SimpleHtmlSaxParser {
      *    @access public
      *    @static
      */
-    function decodeHtml($html) {
+    static function decodeHtml($html) {
         return html_entity_decode($html, ENT_QUOTES);
     }
     
@@ -703,7 +703,7 @@ class SimpleHtmlSaxParser {
      *    @access public
      *    @static
      */
-    function normalise($html) {
+    static function normalise($html) {
         $text = preg_replace('|<!--.*?-->|', '', $html);
         $text = preg_replace('|<script[^>]*>.*?</script>|', '', $text);
         $text = preg_replace('|<img[^>]*alt\s*=\s*"([^"]*)"[^>]*>|', ' \1 ', $text);
@@ -761,4 +761,4 @@ class SimpleSaxListener {
     function addContent($text) {
     }
 }
-?>
+
diff --git a/thirdparty/simpletest/tag.php b/thirdparty/simpletest/tag.php
index 7bccae205..b7749db03 100644
--- a/thirdparty/simpletest/tag.php
+++ b/thirdparty/simpletest/tag.php
@@ -325,7 +325,7 @@ class SimpleWidget extends SimpleTag {
      *    @param SimpleEncoding $encoding    Form packet.
      *    @access public
      */
-    function write(&$encoding) {
+    function write(&$encoding, $x, $y) {
         if ($this->getName()) {
             $encoding->add($this->getName(), $this->getValue());
         }
@@ -680,7 +680,7 @@ class SimpleUploadTag extends SimpleWidget {
      *    @param SimpleEncoding $encoding    Form packet.
      *    @access public
      */
-    function write(&$encoding) {
+    function write(&$encoding, $x, $y) {
         if (! file_exists($this->getValue())) {
             return;
         }
@@ -1415,4 +1415,4 @@ class SimpleFrameTag extends SimpleTag {
         return false;
     }
 }
-?>
\ No newline at end of file
+