Merge pull request #40383 from nextcloud/backport/36830/stable27

[stable27] fix: Avoid failing with duplicate checks

2 files changed, 4 insertions, 10 deletions

diff --git a/apps/workflowengine/lib/Check/FileMimeType.php b/apps/workflowengine/lib/Check/FileMimeType.php
index 991d7ebc739..dfcfed9466b 100644
--- a/apps/workflowengine/lib/Check/FileMimeType.php
+++ b/apps/workflowengine/lib/Check/FileMimeType.php
@@ -107,13 +107,7 @@ class FileMimeType extends AbstractStringCheck implements IFileCheck {
 	 * @return bool
 	 */
 	public function executeCheck($operator, $value) {
-		$actualValue = $this->getActualValue();
-		$plainMimetypeResult = $this->executeStringCheck($operator, $value, $actualValue);
-		if ($actualValue === 'httpd/unix-directory') {
-			return $plainMimetypeResult;
-		}
-		$detectMimetypeBasedOnFilenameResult = $this->executeStringCheck($operator, $value, $this->mimeTypeDetector->detectPath($this->path));
-		return $plainMimetypeResult || $detectMimetypeBasedOnFilenameResult;
+		return $this->executeStringCheck($operator, $value, $this->getActualValue());
 	}
 
 	/**
diff --git a/apps/workflowengine/tests/Check/FileMimeTypeTest.php b/apps/workflowengine/tests/Check/FileMimeTypeTest.php
index 3ebcaa8f4b3..e5a4c99269f 100644
--- a/apps/workflowengine/tests/Check/FileMimeTypeTest.php
+++ b/apps/workflowengine/tests/Check/FileMimeTypeTest.php
@@ -127,7 +127,7 @@ class FileMimeTypeTest extends TestCase {
 		$check = new FileMimeType($this->l10n, $this->request, $this->mimeDetector);
 		$check->setFileInfo($storage, 'foo/bar.txt');
 
-		$this->assertTrue($check->executeCheck('is', 'text/plain-path-detected'));
+		$this->assertTrue($check->executeCheck('is', 'text/plain-content-detected'));
 	}
 
 	public function testFallback() {
@@ -142,7 +142,7 @@ class FileMimeTypeTest extends TestCase {
 	public function testFromCacheCached() {
 		$storage = new Temporary([]);
 		$storage->mkdir('foo');
-		$storage->file_put_contents('foo/bar.txt', 'asd');
+		$storage->file_put_contents('foo/bar.txt', 'text-content');
 		$storage->getScanner()->scan('');
 
 		$check = new FileMimeType($this->l10n, $this->request, $this->mimeDetector);
@@ -156,7 +156,7 @@ class FileMimeTypeTest extends TestCase {
 
 		$newCheck = new FileMimeType($this->l10n, $this->request, $this->mimeDetector);
 		$newCheck->setFileInfo($storage, 'foo/bar.txt');
-		$this->assertTrue($newCheck->executeCheck('is', 'text/plain-path-detected'));
+		$this->assertTrue($newCheck->executeCheck('is', 'text/plain-content-detected'));
 	}
 
 	public function testExistsCached() {