Commit 8111e7ca authored by Ivan Chepurnyi's avatar Ivan Chepurnyi

Merge pull request #124 from Cotya/dev-patch1

vfsStream now can even be used if autoload was configured from extern
parents ccf93cc0 19683a2f
...@@ -739,6 +739,9 @@ class EcomDev_PHPUnit_Model_Fixture ...@@ -739,6 +739,9 @@ class EcomDev_PHPUnit_Model_Fixture
if (is_dir(Mage::getBaseDir('lib') . DS . 'vfsStream' . DS . 'src')) { if (is_dir(Mage::getBaseDir('lib') . DS . 'vfsStream' . DS . 'src')) {
spl_autoload_register(array($this, 'vfsAutoload'), true, true); spl_autoload_register(array($this, 'vfsAutoload'), true, true);
}
if( class_exists('\org\bovigo\vfs\vfsStream') ){
$this->_vfs = Mage::getModel('ecomdev_phpunit/fixture_vfs'); $this->_vfs = Mage::getModel('ecomdev_phpunit/fixture_vfs');
return $this->_vfs; return $this->_vfs;
} }
......
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