Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

MINOR Fixing E_STRICT compliance in simpletest

  • Loading branch information...
commit 972dfee5c32655934a9c99336872dea4d0fa9aa9 1 parent 41433f1
@halkyon halkyon authored
View
4 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 @@ function setTimeout($handle, $timeout) {
}
}
}
-?>
+?>
View
4 thirdparty/simpletest/form.php
@@ -120,7 +120,7 @@ function _encode() {
$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 @@ function submitButton($selector, $additional = false) {
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);
}
View
2  thirdparty/simpletest/page.php
@@ -980,4 +980,4 @@ function getField($selector) {
return null;
}
}
-?>
+
View
6 thirdparty/simpletest/parser.php
@@ -690,7 +690,7 @@ function ignore($token, $event) {
* @access public
* @static
*/
- function decodeHtml($html) {
+ static function decodeHtml($html) {
return html_entity_decode($html, ENT_QUOTES);
}
@@ -703,7 +703,7 @@ function decodeHtml($html) {
* @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 @@ function endElement($name) {
function addContent($text) {
}
}
-?>
+
View
6 thirdparty/simpletest/tag.php
@@ -325,7 +325,7 @@ function isLabel($label) {
* @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 @@ function expectEndTag() {
* @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 @@ function expectEndTag() {
return false;
}
}
-?>
+
Please sign in to comment.
Something went wrong with that request. Please try again.