@@ -15,7 +15,7 @@ discard block |
||
15 | 15 | |
16 | 16 | $configDir = getenv('CONFIG_DIR'); |
17 | 17 | if ($configDir) { |
18 | - define('PHPUNIT_CONFIG_DIR', $configDir); |
|
18 | + define('PHPUNIT_CONFIG_DIR', $configDir); |
|
19 | 19 | } |
20 | 20 | |
21 | 21 | require_once __DIR__ . '/../lib/base.php'; |
@@ -25,20 +25,20 @@ discard block |
||
25 | 25 | |
26 | 26 | $dontLoadApps = getenv('TEST_DONT_LOAD_APPS'); |
27 | 27 | if (!$dontLoadApps) { |
28 | - // load all apps |
|
29 | - $appManager = Server::get(IAppManager::class); |
|
30 | - foreach (new \DirectoryIterator(__DIR__ . '/../apps/') as $file) { |
|
31 | - if ($file->isDot()) { |
|
32 | - continue; |
|
33 | - } |
|
34 | - $appManager->loadApp($file->getFilename()); |
|
35 | - } |
|
28 | + // load all apps |
|
29 | + $appManager = Server::get(IAppManager::class); |
|
30 | + foreach (new \DirectoryIterator(__DIR__ . '/../apps/') as $file) { |
|
31 | + if ($file->isDot()) { |
|
32 | + continue; |
|
33 | + } |
|
34 | + $appManager->loadApp($file->getFilename()); |
|
35 | + } |
|
36 | 36 | } |
37 | 37 | |
38 | 38 | OC_Hook::clear(); |
39 | 39 | |
40 | 40 | set_include_path( |
41 | - get_include_path() . PATH_SEPARATOR |
|
42 | - . '/usr/share/php' . PATH_SEPARATOR |
|
43 | - . __DIR__ . '/..' |
|
41 | + get_include_path() . PATH_SEPARATOR |
|
42 | + . '/usr/share/php' . PATH_SEPARATOR |
|
43 | + . __DIR__ . '/..' |
|
44 | 44 | ); |
@@ -18,16 +18,16 @@ discard block |
||
18 | 18 | define('PHPUNIT_CONFIG_DIR', $configDir); |
19 | 19 | } |
20 | 20 | |
21 | -require_once __DIR__ . '/../lib/base.php'; |
|
22 | -require_once __DIR__ . '/autoload.php'; |
|
21 | +require_once __DIR__.'/../lib/base.php'; |
|
22 | +require_once __DIR__.'/autoload.php'; |
|
23 | 23 | |
24 | -\OC::$composerAutoloader->addPsr4('Tests\\', OC::$SERVERROOT . '/tests/', true); |
|
24 | +\OC::$composerAutoloader->addPsr4('Tests\\', OC::$SERVERROOT.'/tests/', true); |
|
25 | 25 | |
26 | 26 | $dontLoadApps = getenv('TEST_DONT_LOAD_APPS'); |
27 | 27 | if (!$dontLoadApps) { |
28 | 28 | // load all apps |
29 | 29 | $appManager = Server::get(IAppManager::class); |
30 | - foreach (new \DirectoryIterator(__DIR__ . '/../apps/') as $file) { |
|
30 | + foreach (new \DirectoryIterator(__DIR__.'/../apps/') as $file) { |
|
31 | 31 | if ($file->isDot()) { |
32 | 32 | continue; |
33 | 33 | } |
@@ -38,7 +38,7 @@ discard block |
||
38 | 38 | OC_Hook::clear(); |
39 | 39 | |
40 | 40 | set_include_path( |
41 | - get_include_path() . PATH_SEPARATOR |
|
42 | - . '/usr/share/php' . PATH_SEPARATOR |
|
43 | - . __DIR__ . '/..' |
|
41 | + get_include_path().PATH_SEPARATOR |
|
42 | + . '/usr/share/php'.PATH_SEPARATOR |
|
43 | + . __DIR__.'/..' |
|
44 | 44 | ); |