Merge pull request #14 from magento-extensibility/MAGETWO-30808-remove-include-path

vpelipenko · vpelipenko · commit 9c19d10e3afb · 2015-01-08T14:30:00.000+02:00
[Extensibility] Magetwo 30808 remove include path
diff --git a/composer.json b/composer.json
@@ -184,9 +184,6 @@
             "tinymce/tinymce": "lib/web/tiny_mce"
         }
     },
-    "config": {
-        "use-include-path": true
-    },
     "autoload": {
         "psr-4": {
             "Magento\\Framework\\": "lib/internal/Magento/Framework/"
diff --git a/composer.lock b/composer.lock
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Api/Code/Generator/DataBuilderTest.php b/dev/tests/integration/testsuite/Magento/Framework/Api/Code/Generator/DataBuilderTest.php
@@ -16,7 +16,8 @@ class DataBuilderTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        \Magento\Framework\Filesystem\FileResolver::addIncludePath([__DIR__ . '/../../_files']);
+        $autoloadWrapper = \Magento\Framework\Autoload\AutoloaderRegistry::getAutoloader();
+        $autoloadWrapper->addPsr4('Magento\\Wonderland\\', realpath(__DIR__ . '/../../_files/Magento/Wonderland'));
         $this->_objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
         $this->_objectManager->configure(
             [

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,8 @@ class DataBuilderTest extends \PHPUnit_Framework_TestCase`
`16`	`16`
`17`	`17`	`protected function setUp()`
`18`	`18`	`{`
`19`		`- \Magento\Framework\Filesystem\FileResolver::addIncludePath([__DIR__ . '/../../_files']);`
	`19`	`+ $autoloadWrapper = \Magento\Framework\Autoload\AutoloaderRegistry::getAutoloader();`
	`20`	`+ $autoloadWrapper->addPsr4('Magento\\Wonderland\\', realpath(__DIR__ . '/../../_files/Magento/Wonderland'));`
`20`	`21`	`$this->_objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();`
`21`	`22`	`$this->_objectManager->configure(`
`22`	`23`	`[`