Merge pull request #21593 from owncloud/strict_autoloader
Stricter autoloader
This commit is contained in:
commit
94cf9e56b6
|
@ -488,9 +488,10 @@ class OC {
|
||||||
OC::$SERVERROOT . '/settings',
|
OC::$SERVERROOT . '/settings',
|
||||||
OC::$SERVERROOT . '/ocs',
|
OC::$SERVERROOT . '/ocs',
|
||||||
OC::$SERVERROOT . '/ocs-provider',
|
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'));
|
spl_autoload_register(array(self::$loader, 'load'));
|
||||||
$loaderEnd = microtime(true);
|
$loaderEnd = microtime(true);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue