We will work on Apr 26th (Saturday) and will be off from Apr 30th (Wednesday) until May 2nd (Friday) for public holiday in our country

Commit ac76e595 authored by Fabian Schmengler's avatar Fabian Schmengler

Integrate PHP 7 compatibility patch from Inchoo_PHP7 into EcomDev_PHPUnit_Model_Layout

parent 8276c465
......@@ -532,6 +532,15 @@ class EcomDev_PHPUnit_Model_Layout
public function getOutput()
{
$this->record(self::ACTION_RENDER, 'layout');
return parent::getOutput();
// parent::getOutput() with Inchoo_PHP7 fix:
$out = '';
if (!empty($this->_output)) {
foreach ($this->_output as $callback) {
$out .= $this->getBlock($callback[0])->{$callback[1]}();
}
}
return $out;
}
}
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