aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCôme Chilliet <come.chilliet@nextcloud.com>2023-10-26 15:06:30 +0200
committerCôme Chilliet <come.chilliet@nextcloud.com>2023-11-07 12:14:03 +0100
commitf9770b8ef27cfa503e06708e127a014c3c08828b (patch)
tree1429e1de158bdc3a2ea41a47f7fcd59ea0222ee9
parent3c75075eba3414da7b3c4db9aefe22da074cdcd9 (diff)
downloadnextcloud-server-f9770b8ef27cfa503e06708e127a014c3c08828b.tar.gz
nextcloud-server-f9770b8ef27cfa503e06708e127a014c3c08828b.zip
Remove duplicate fileinfo PHP module check
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
-rw-r--r--apps/settings/lib/Controller/CheckSetupController.php5
-rw-r--r--apps/settings/tests/Controller/CheckSetupControllerTest.php6
-rw-r--r--core/js/tests/specs/setupchecksSpec.js24
3 files changed, 0 insertions, 35 deletions
diff --git a/apps/settings/lib/Controller/CheckSetupController.php b/apps/settings/lib/Controller/CheckSetupController.php
index dc36e8208e3..4abef63dc7b 100644
--- a/apps/settings/lib/Controller/CheckSetupController.php
+++ b/apps/settings/lib/Controller/CheckSetupController.php
@@ -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(),
diff --git a/apps/settings/tests/Controller/CheckSetupControllerTest.php b/apps/settings/tests/Controller/CheckSetupControllerTest.php
index b08c639f45f..661deddb913 100644
--- a/apps/settings/tests/Controller/CheckSetupControllerTest.php
+++ b/apps/settings/tests/Controller/CheckSetupControllerTest.php
@@ -189,7 +189,6 @@ class CheckSetupControllerTest extends TestCase {
$this->setupCheckManager,
])
->setMethods([
- 'hasFileinfoInstalled',
'hasWorkingFileLocking',
'hasDBFileLocking',
'getLastCronInfo',
@@ -378,10 +377,6 @@ class CheckSetupControllerTest extends TestCase {
->willReturn(false);
$this->checkSetupController
->expects($this->once())
- ->method('hasFileinfoInstalled')
- ->willReturn(true);
- $this->checkSetupController
- ->expects($this->once())
->method('hasWorkingFileLocking')
->willReturn(true);
$this->checkSetupController
@@ -479,7 +474,6 @@ class CheckSetupControllerTest extends TestCase {
$expected = new DataResponse(
[
- 'hasFileinfoInstalled' => true,
'hasWorkingFileLocking' => true,
'hasDBFileLocking' => true,
'suggestedOverwriteCliURL' => '',
diff --git a/core/js/tests/specs/setupchecksSpec.js b/core/js/tests/specs/setupchecksSpec.js
index 306813c90f9..357e111e3ee 100644
--- a/core/js/tests/specs/setupchecksSpec.js
+++ b/core/js/tests/specs/setupchecksSpec.js
@@ -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: '',