Commit 2fb65f5e authored by Ivan Chepurnyi's avatar Ivan Chepurnyi

! Fix incompatibility with the latest PHPUNIT 3.6.x

parent 5554e0b8
......@@ -183,7 +183,7 @@ class EcomDev_PHPUnit_Constraint_Config_Node
throw new RuntimeException(sprintf(
'Expected value is not an xml string for node %s, passed expected value: %s, parsing error: %s',
$this->_nodePath,
PHPUnit_Util_Type::toString($this->_expectedValue),
PHPUnit_Util_Type::export($this->_expectedValue),
$e->getMessage()
));
}
......@@ -268,7 +268,7 @@ class EcomDev_PHPUnit_Constraint_Config_Node
throw new RuntimeException(sprintf(
'Config node "%s" is not a string of comma separated values, passed expected value: %s',
$this->_nodePath,
PHPUnit_Util_Type::toString($this->_expectedValue)
PHPUnit_Util_Type::export($this->_expectedValue)
));
}
......@@ -289,7 +289,7 @@ class EcomDev_PHPUnit_Constraint_Config_Node
protected function textContainValue()
{
return sprintf('contains "%s" in comma separated value list',
PHPUnit_Util_Type::toString($this->_expectedValue));
PHPUnit_Util_Type::export($this->_expectedValue));
}
/**
......
......@@ -43,10 +43,6 @@ abstract class EcomDev_PHPUnit_Constraint_Layout_Abstract extends EcomDev_PHPUni
protected function getActualValue($other)
{
if ($this->_useActualValue) {
if (is_array($this->_actualValue)) {
return PHPUnit_Util_Type::toString($this->_actualValue);
}
return parent::getActualValue($other);
}
......
......@@ -86,7 +86,7 @@ class EcomDev_PHPUnit_Constraint_Layout_Block_Property
$value = $this->_actualValue;
}
return PHPUnit_Util_Type::toString($value);
return $value;
}
return '';
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment