Skip to content

Commit 8a7a51e

Browse files
committed
* [FIX] Wrong behavior when bootstrapping the web UI
1 parent 580820e commit 8a7a51e

File tree

4 files changed

+12
-4
lines changed

4 files changed

+12
-4
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ before_script:
2020
- composer self-update
2121
- composer install --prefer-source --no-interaction --dev
2222

23-
script: ./vendor/bin/phpunit -c ./phpunit.xml
23+
script: ./vendor/bin/phpunit -c ./phpunit.xml --testsuite Core
2424

2525
after_script:
2626
- if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then mv ./test/_output/coverage-clover.xml clover.xml && ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT -t clover; fi

app/modules/web/Controllers/BootstrapController.php

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,11 @@ private function getCookiesEnabled()
9494
*/
9595
private function getPlugins()
9696
{
97-
return $this->dic->get(PluginManager::class)->getEnabledPlugins();
97+
if ($this->configData->isInstalled()) {
98+
return $this->dic->get(PluginManager::class)->getEnabledPlugins();
99+
}
100+
101+
return [];
98102
}
99103

100104
/**

lib/SP/Services/Install/Installer.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ final class Installer extends Service
5555
*/
5656
const VERSION = [3, 0, 0];
5757
const VERSION_TEXT = '3.0-beta';
58-
const BUILD = 18080902;
58+
const BUILD = 18080903;
5959

6060
/**
6161
* @var DatabaseSetupInterface

phpunit.xml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,12 @@
99
processIsolation="false"
1010
stopOnFailure="false">
1111
<testsuites>
12-
<testsuite name="Unit">
12+
<testsuite name="Core">
1313
<directory suffix=".php">./test/SP</directory>
14+
<exclude>./test/SP/Modules</exclude>
15+
</testsuite>
16+
<testsuite name="Modules">
17+
<directory suffix=".php">./test/SP/Modules</directory>
1418
</testsuite>
1519
</testsuites>
1620
<filter>

0 commit comments

Comments
 (0)