summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2016-07-25 12:54:50 +0200
committerGitHub <noreply@github.com>2016-07-25 12:54:50 +0200
commit88cbde6a665c611c6efd68ad65fec60e5e3dd207 (patch)
treef10ac672f819ed09304a8a9efe2747a2a41d234a /lib
parent4ad0c383ade90eb2f339daa392828e145f1a3b6b (diff)
parent686cb599b61ccad8cd8b0bf23d6870a56313f0eb (diff)
downloadnextcloud-server-88cbde6a665c611c6efd68ad65fec60e5e3dd207.tar.gz
nextcloud-server-88cbde6a665c611c6efd68ad65fec60e5e3dd207.zip
Merge pull request #550 from nextcloud/ldap-integration-test-autoloader
fix autoloading in LPAP integration tests, resolves #544
Diffstat (limited to 'lib')
-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);
}