wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Don't assume the admin didn't configure Opcache correctly...

Browse source 
Signed-off-by: Joas Schilling <coding@schilljs.com>
This commit is contained in:
Joas Schilling 2017-04-20 13:17:21 +02:00
parent 8c703c954d
commit 06e60f88c5
No known key found for this signature in database
GPG key ID: E166FD8976B3BAC8
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
settings/Controller/CheckSetupController.php
View file

@ -373,7 +373,7 @@ Raw output
* Checks whether a PHP opcache is properly set up
* @return bool
*/
private function isOpcacheProperlySetup() {
protected function isOpcacheProperlySetup() {
$iniWrapper = new IniGetWrapper();
$isOpcacheProperlySetUp = true;

8
tests/Settings/Controller/CheckSetupControllerTest.php
View file

@ -68,8 +68,6 @@ class CheckSetupControllerTest extends TestCase {
->disableOriginalConstructor()->getMock();
$this->config = $this->getMockBuilder('\OCP\IConfig')
->disableOriginalConstructor()->getMock();
$this->config = $this->getMockBuilder('\OCP\IConfig')
->disableOriginalConstructor()->getMock();
$this->clientService = $this->getMockBuilder('\OCP\Http\Client\IClientService')
->disableOriginalConstructor()->getMock();
$this->util = $this->getMockBuilder('\OC_Util')
@ -98,7 +96,7 @@ class CheckSetupControllerTest extends TestCase {
$this->checker,
$this->logger
])
->setMethods(['getCurlVersion', 'isPhpOutdated'])->getMock();
->setMethods(['getCurlVersion', 'isPhpOutdated', 'isOpcacheProperlySetup'])->getMock();
}
public function testIsInternetConnectionWorkingDisabledViaConfig() {
@ -307,6 +305,10 @@ class CheckSetupControllerTest extends TestCase {
->expects($this->once())
->method('isPhpOutdated')
->willReturn(true);
$this->checkSetupController
->expects($this->once())
->method('isOpcacheProperlySetup')
->willReturn(false);
$this->urlGenerator->expects($this->at(2))
->method('linkToDocs')
->with('admin-reverse-proxy')