Merge pull request #21593 from owncloud/strict_autoloader

Stricter autoloader
This commit is contained in:
Thomas Müller 2016-01-11 11:24:11 +01:00
commit 94cf9e56b6
1 changed files with 3 additions and 2 deletions

View File

@ -488,9 +488,10 @@ class OC {
OC::$SERVERROOT . '/settings',
OC::$SERVERROOT . '/ocs',
OC::$SERVERROOT . '/ocs-provider',
OC::$SERVERROOT . '/3rdparty',
OC::$SERVERROOT . '/tests',
]);
if (defined('PHPUNIT_RUN')) {
self::$loader->addValidRoot(OC::$SERVERROOT . '/tests');
}
spl_autoload_register(array(self::$loader, 'load'));
$loaderEnd = microtime(true);