vfsStream now can even be used if autoload was configured from extern

19683a2f · Daniel Fahlke · ccf93cc0 · 19683a2f
Commit 19683a2f authored May 15, 2013 by Daniel Fahlke
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 0 deletions

app/code/community/EcomDev/PHPUnit/Model/Fixture.php app/code/community/EcomDev/PHPUnit/Model/Fixture.php +3 -0

No files found.
--- a/app/code/community/EcomDev/PHPUnit/Model/Fixture.php
+++ b/app/code/community/EcomDev/PHPUnit/Model/Fixture.php
@@ -739,6 +739,9 @@ class EcomDev_PHPUnit_Model_Fixture

        if (is_dir(Mage::getBaseDir('lib')  . DS . 'vfsStream' . DS . 'src')) {
            spl_autoload_register(array($this, 'vfsAutoload'), true, true);
+        }
+
+        if( class_exists('\org\bovigo\vfs\vfsStream') ){
            $this->_vfs = Mage::getModel('ecomdev_phpunit/fixture_vfs');
            return $this->_vfs;
        }