open-dsi
/
nextcloud-server
mirror of https://github.com/nextcloud/server
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Remove duplicate fileinfo PHP module check

Browse Source 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
pull/41134/head
Côme Chilliet 3 years ago
parent 3c75075eba
commit f9770b8ef2
No known key found for this signature in database
GPG Key ID: A3E2F658B28C760A
3 changed files with 0 additions and 35 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 5
      apps/settings/lib/Controller/CheckSetupController.php
  2. 6
      apps/settings/tests/Controller/CheckSetupControllerTest.php
  3. 24
      core/js/tests/specs/setupchecksSpec.js

5
apps/settings/lib/Controller/CheckSetupController.php
Unescape View File

@ -562,10 +562,6 @@ Raw output
return str_contains($this->config->getSystemValue('dbtype'), 'sqlite');
}
protected function hasFileinfoInstalled(): bool {
return \OC_Util::fileInfoLoaded();
}
protected function hasWorkingFileLocking(): bool {
return !($this->lockingProvider instanceof NoopLockingProvider);
}
@ -783,7 +779,6 @@ Raw output
public function check() {
return new DataResponse(
[
'hasFileinfoInstalled' => $this->hasFileinfoInstalled(),
'hasWorkingFileLocking' => $this->hasWorkingFileLocking(),
'hasDBFileLocking' => $this->hasDBFileLocking(),
'suggestedOverwriteCliURL' => $this->getSuggestedOverwriteCliURL(),

6
apps/settings/tests/Controller/CheckSetupControllerTest.php
Unescape View File

@ -189,7 +189,6 @@ class CheckSetupControllerTest extends TestCase {
$this->setupCheckManager,
])
->setMethods([
'hasFileinfoInstalled',
'hasWorkingFileLocking',
'hasDBFileLocking',
'getLastCronInfo',
@ -376,10 +375,6 @@ class CheckSetupControllerTest extends TestCase {
$this->checkSetupController
->method('isSqliteUsed')
->willReturn(false);
$this->checkSetupController
->expects($this->once())
->method('hasFileinfoInstalled')
->willReturn(true);
$this->checkSetupController
->expects($this->once())
->method('hasWorkingFileLocking')
@ -479,7 +474,6 @@ class CheckSetupControllerTest extends TestCase {
$expected = new DataResponse(
[
'hasFileinfoInstalled' => true,
'hasWorkingFileLocking' => true,
'hasDBFileLocking' => true,
'suggestedOverwriteCliURL' => '',

24
core/js/tests/specs/setupchecksSpec.js
Unescape View File

@ -223,7 +223,6 @@ describe('OC.SetupChecks tests', function() {
'Content-Type': 'application/json'
},
JSON.stringify({
hasFileinfoInstalled: true,
hasWorkingFileLocking: true,
hasDBFileLocking: false,
suggestedOverwriteCliURL: '',
@ -289,7 +288,6 @@ describe('OC.SetupChecks tests', function() {
'Content-Type': 'application/json'
},
JSON.stringify({
hasFileinfoInstalled: true,
hasWorkingFileLocking: true,
hasDBFileLocking: false,
suggestedOverwriteCliURL: '',
@ -355,7 +353,6 @@ describe('OC.SetupChecks tests', function() {
'Content-Type': 'application/json',
},
JSON.stringify({
hasFileinfoInstalled: true,
hasWorkingFileLocking: true,
hasDBFileLocking: false,
suggestedOverwriteCliURL: '',
@ -417,7 +414,6 @@ describe('OC.SetupChecks tests', function() {
'Content-Type': 'application/json',
},
JSON.stringify({
hasFileinfoInstalled: true,
hasWorkingFileLocking: true,
hasDBFileLocking: false,
suggestedOverwriteCliURL: '',
@ -478,7 +474,6 @@ describe('OC.SetupChecks tests', function() {
'Content-Type': 'application/json',
},
JSON.stringify({
hasFileinfoInstalled: true,
hasWorkingFileLocking: true,
hasDBFileLocking: false,
suggestedOverwriteCliURL: '',
@ -539,7 +534,6 @@ describe('OC.SetupChecks tests', function() {
'Content-Type': 'application/json'
},
JSON.stringify({
hasFileinfoInstalled: true,
hasWorkingFileLocking: false,
hasDBFileLocking: false,
suggestedOverwriteCliURL: '',
@ -600,7 +594,6 @@ describe('OC.SetupChecks tests', function() {
'Content-Type': 'application/json'
},
JSON.stringify({
hasFileinfoInstalled: true,
hasWorkingFileLocking: true,
hasDBFileLocking: true,
suggestedOverwriteCliURL: '',
@ -661,7 +654,6 @@ describe('OC.SetupChecks tests', function() {
'Content-Type': 'application/json',
},
JSON.stringify({
hasFileinfoInstalled: true,
hasWorkingFileLocking: true,
hasDBFileLocking: false,
suggestedOverwriteCliURL: '',
@ -724,7 +716,6 @@ describe('OC.SetupChecks tests', function() {
'Content-Type': 'application/json',
},
JSON.stringify({
hasFileinfoInstalled: true,
hasWorkingFileLocking: true,
hasDBFileLocking: false,
suggestedOverwriteCliURL: '',
@ -785,7 +776,6 @@ describe('OC.SetupChecks tests', function() {
'Content-Type': 'application/json',
},
JSON.stringify({
hasFileinfoInstalled: true,
hasWorkingFileLocking: true,
hasDBFileLocking: false,
suggestedOverwriteCliURL: '',
@ -848,7 +838,6 @@ describe('OC.SetupChecks tests', function() {
'Content-Type': 'application/json',
},
JSON.stringify({
hasFileinfoInstalled: true,
hasWorkingFileLocking: true,
hasDBFileLocking: false,
suggestedOverwriteCliURL: '',
@ -909,7 +898,6 @@ describe('OC.SetupChecks tests', function() {
'Content-Type': 'application/json',
},
JSON.stringify({
hasFileinfoInstalled: true,
hasWorkingFileLocking: true,
hasDBFileLocking: false,
suggestedOverwriteCliURL: '',
@ -990,7 +978,6 @@ describe('OC.SetupChecks tests', function() {
'Content-Type': 'application/json',
},
JSON.stringify({
hasFileinfoInstalled: true,
hasWorkingFileLocking: true,
hasDBFileLocking: false,
suggestedOverwriteCliURL: '',
@ -1058,7 +1045,6 @@ describe('OC.SetupChecks tests', function() {
'Content-Type': 'application/json'
},
JSON.stringify({
hasFileinfoInstalled: true,
hasWorkingFileLocking: true,
hasDBFileLocking: false,
suggestedOverwriteCliURL: '',
@ -1119,7 +1105,6 @@ describe('OC.SetupChecks tests', function() {
'Content-Type': 'application/json'
},
JSON.stringify({
hasFileinfoInstalled: true,
hasWorkingFileLocking: true,
hasDBFileLocking: false,
suggestedOverwriteCliURL: '',
@ -1180,7 +1165,6 @@ describe('OC.SetupChecks tests', function() {
'Content-Type': 'application/json',
},
JSON.stringify({
hasFileinfoInstalled: true,
hasWorkingFileLocking: true,
hasDBFileLocking: false,
suggestedOverwriteCliURL: '',
@ -1245,7 +1229,6 @@ describe('OC.SetupChecks tests', function() {
'Content-Type': 'application/json',
},
JSON.stringify({
hasFileinfoInstalled: true,
hasWorkingFileLocking: true,
hasDBFileLocking: false,
suggestedOverwriteCliURL: '',
@ -1307,7 +1290,6 @@ describe('OC.SetupChecks tests', function() {
'Content-Type': 'application/json',
},
JSON.stringify({
hasFileinfoInstalled: true,
hasWorkingFileLocking: true,
hasDBFileLocking: false,
suggestedOverwriteCliURL: '',
@ -1366,7 +1348,6 @@ describe('OC.SetupChecks tests', function() {
'Content-Type': 'application/json',
},
JSON.stringify({
hasFileinfoInstalled: true,
hasWorkingFileLocking: true,
hasDBFileLocking: false,
suggestedOverwriteCliURL: '',
@ -1428,7 +1409,6 @@ describe('OC.SetupChecks tests', function() {
'Content-Type': 'application/json',
},
JSON.stringify({
hasFileinfoInstalled: true,
hasWorkingFileLocking: true,
hasDBFileLocking: false,
suggestedOverwriteCliURL: '',
@ -1490,7 +1470,6 @@ describe('OC.SetupChecks tests', function() {
'Content-Type': 'application/json',
},
JSON.stringify({
hasFileinfoInstalled: true,
hasWorkingFileLocking: true,
hasDBFileLocking: false,
suggestedOverwriteCliURL: '',
@ -1551,7 +1530,6 @@ describe('OC.SetupChecks tests', function() {
'Content-Type': 'application/json',
},
JSON.stringify({
hasFileinfoInstalled: true,
hasWorkingFileLocking: true,
hasDBFileLocking: false,
suggestedOverwriteCliURL: '',
@ -1612,7 +1590,6 @@ describe('OC.SetupChecks tests', function() {
'Content-Type': 'application/json',
},
JSON.stringify({
hasFileinfoInstalled: true,
hasWorkingFileLocking: true,
hasDBFileLocking: false,
suggestedOverwriteCliURL: '',
@ -1680,7 +1657,6 @@ describe('OC.SetupChecks tests', function() {
'Content-Type': 'application/json',
},
JSON.stringify({
hasFileinfoInstalled: true,
hasWorkingFileLocking: true,
hasDBFileLocking: false,
suggestedOverwriteCliURL: '',

Write Preview
Loading…
Cancel
Save