summaryrefslogtreecommitdiffstats
path: root/lib/private
diff options
context:
space:
mode:
authorArthur Schiwon <blizzz@arthur-schiwon.de>2016-07-25 10:58:03 +0200
committerArthur Schiwon <blizzz@arthur-schiwon.de>2016-07-25 11:05:59 +0200
commit686cb599b61ccad8cd8b0bf23d6870a56313f0eb (patch)
treed49110103aa3412df1385d5417710fe2b362b568 /lib/private
parenta20f4c432b0cee0b968b1c8c3514d1e798f574ef (diff)
downloadnextcloud-server-686cb599b61ccad8cd8b0bf23d6870a56313f0eb.tar.gz
nextcloud-server-686cb599b61ccad8cd8b0bf23d6870a56313f0eb.zip
fix autoloading in LPAP integration tests, resolves #544
Diffstat (limited to 'lib/private')
-rw-r--r--lib/private/legacy/app.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/private/legacy/app.php b/lib/private/legacy/app.php
index 4cfa68cff2d..5395d1daeee 100644
--- a/lib/private/legacy/app.php
+++ b/lib/private/legacy/app.php
@@ -169,7 +169,7 @@ class OC_App {
// Register on PSR-4 composer autoloader
$appNamespace = \OC\AppFramework\App::buildAppNamespace($app);
\OC::$composerAutoloader->addPsr4($appNamespace . '\\', $path . '/lib/', true);
- if (defined('PHPUNIT_RUN')) {
+ if (defined('PHPUNIT_RUN') || defined('CLI_TEST_RUN')) {
\OC::$composerAutoloader->addPsr4($appNamespace . '\\Tests\\', $path . '/tests/', true);
}