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

Revert "feat: Implement Directory Check" 

This reverts commit feae8ba16a.
pull/54250/head
Joas Schilling 2025-08-05 11:18:50 +07:00
parent ccda64fc66
commit 78dcf3744d
No known key found for this signature in database
GPG Key ID: F72FA5B49FFA96B0
7 changed files with 0 additions and 144 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
apps/workflowengine/composer/composer/autoload_classmap.php
Unescape Escape View File

@ -10,7 +10,6 @@ return array(
'OCA\\WorkflowEngine\\AppInfo\\Application' => $baseDir . '/../lib/AppInfo/Application.php',
'OCA\\WorkflowEngine\\BackgroundJobs\\Rotate' => $baseDir . '/../lib/BackgroundJobs/Rotate.php',
'OCA\\WorkflowEngine\\Check\\AbstractStringCheck' => $baseDir . '/../lib/Check/AbstractStringCheck.php',
'OCA\\WorkflowEngine\\Check\\Directory' => $baseDir . '/../lib/Check/Directory.php',
'OCA\\WorkflowEngine\\Check\\FileMimeType' => $baseDir . '/../lib/Check/FileMimeType.php',
'OCA\\WorkflowEngine\\Check\\FileName' => $baseDir . '/../lib/Check/FileName.php',
'OCA\\WorkflowEngine\\Check\\FileSize' => $baseDir . '/../lib/Check/FileSize.php',

1
apps/workflowengine/composer/composer/autoload_static.php
Unescape Escape View File

@ -25,7 +25,6 @@ class ComposerStaticInitWorkflowEngine
'OCA\\WorkflowEngine\\AppInfo\\Application' => __DIR__ . '/..' . '/../lib/AppInfo/Application.php',
'OCA\\WorkflowEngine\\BackgroundJobs\\Rotate' => __DIR__ . '/..' . '/../lib/BackgroundJobs/Rotate.php',
'OCA\\WorkflowEngine\\Check\\AbstractStringCheck' => __DIR__ . '/..' . '/../lib/Check/AbstractStringCheck.php',
'OCA\\WorkflowEngine\\Check\\Directory' => __DIR__ . '/..' . '/../lib/Check/Directory.php',
'OCA\\WorkflowEngine\\Check\\FileMimeType' => __DIR__ . '/..' . '/../lib/Check/FileMimeType.php',
'OCA\\WorkflowEngine\\Check\\FileName' => __DIR__ . '/..' . '/../lib/Check/FileName.php',
'OCA\\WorkflowEngine\\Check\\FileSize' => __DIR__ . '/..' . '/../lib/Check/FileSize.php',

58
apps/workflowengine/lib/Check/Directory.php
Unescape Escape View File

@ -1,58 +0,0 @@
<?php
declare(strict_types=1);
/**
* SPDX-FileCopyrightText: 2025 Nextcloud GmbH and Nextcloud contributors
* SPDX-License-Identifier: AGPL-3.0-or-later
*/
namespace OCA\WorkflowEngine\Check;
use OCA\WorkflowEngine\Entity\File;
use OCP\IL10N;
use OCP\WorkflowEngine\IFileCheck;
class Directory extends AbstractStringCheck implements IFileCheck {
use TFileCheck;
/**
* @param IL10N $l
*/
public function __construct(
IL10N $l,
) {
parent::__construct($l);
}
/**
* @return string
*/
protected function getActualValue(): string {
if ($this->path === null) {
return '';
}
// files/some/path -> some/path
return preg_replace('/^files\//', '', pathinfo($this->path, PATHINFO_DIRNAME));
}
/**
* @param string $operator
* @param string $checkValue
* @param string $actualValue
* @return bool
*/
protected function executeStringCheck($operator, $checkValue, $actualValue) {
if ($operator === 'is' || $operator === '!is') {
$checkValue = ltrim(rtrim($checkValue, '/'), '/');
}
return parent::executeStringCheck($operator, $checkValue, $actualValue);
}
public function supportedEntities(): array {
return [ File::class ];
}
public function isAvailableForScope(int $scope): bool {
return true;
}
}

2
apps/workflowengine/lib/Manager.php
Unescape Escape View File

@ -8,7 +8,6 @@ namespace OCA\WorkflowEngine;
use Doctrine\DBAL\Exception;
use OCA\WorkflowEngine\AppInfo\Application;
use OCA\WorkflowEngine\Check\Directory;
use OCA\WorkflowEngine\Check\FileMimeType;
use OCA\WorkflowEngine\Check\FileName;
use OCA\WorkflowEngine\Check\FileSize;
@ -693,7 +692,6 @@ class Manager implements IManager {
protected function getBuildInChecks(): array {
try {
return [
$this->container->query(Directory::class),
$this->container->query(FileMimeType::class),
$this->container->query(FileName::class),
$this->container->query(FileSize::class),

13
apps/workflowengine/src/components/Checks/file.js
Unescape Escape View File

@ -31,19 +31,6 @@ const FileChecks = [
validate: stringValidator,
},
{
class: 'OCA\\WorkflowEngine\\Check\\Directory',
name: t('workflowengine', 'Directory'),
operators: stringOrRegexOperators,
placeholder: (check) => {
if (check.operator === 'matches' || check.operator === '!matches') {
return '/^myfolder/.+$/i'
}
return 'myfolder/subfolder'
},
validate: stringValidator,
},
{
class: 'OCA\\WorkflowEngine\\Check\\FileMimeType',
name: t('workflowengine', 'File MIME type'),

68
apps/workflowengine/tests/Check/DirectoryTest.php
Unescape Escape View File

@ -1,68 +0,0 @@
<?php
declare(strict_types=1);
/**
* SPDX-FileCopyrightText: 2025 Nextcloud GmbH and Nextcloud contributors
* SPDX-License-Identifier: AGPL-3.0-or-later
*/
namespace OCA\WorkflowEngine\Tests\Check;
use OCA\WorkflowEngine\Check\Directory;
use OCA\WorkflowEngine\Entity\File;
use OCP\Files\Storage\IStorage;
use OCP\IL10N;
use Test\TestCase;
class DirectoryTest extends TestCase {
/** @var IL10N */
private $l10n;
/** @var IStorage */
private $storage;
/** @var Directory */
private $directory;
protected function setUp(): void {
parent::setUp();
$this->l10n = $this->createMock(IL10N::class);
$this->storage = $this->createMock(IStorage::class);
$this->directory = new Directory($this->l10n);
}
/**
* @dataProvider dataProviderCheck
*/
public function testExecuteStringCheck(string $operator, string $configuredDirectoryPath, string $filePath, bool $expectedResult): void {
$this->directory->setFileInfo($this->storage, $filePath);
$result = $this->directory->executeCheck($operator, $configuredDirectoryPath);
$this->assertEquals($expectedResult, $result);
}
public function testSupportedEntities(): void {
$this->assertSame([File::class], $this->directory->supportedEntities());
}
public function testIsAvailableForScope(): void {
$this->assertTrue($this->directory->isAvailableForScope(1));
}
public function dataProviderCheck(): array {
return [
['is', 'some/path', 'files/some/path/file.txt', true],
['is', '/some/path/', 'files/some/path/file.txt', true],
['!is', 'some/path', 'files/some/path/file.txt', false],
['!is', 'some/path/', 'files/someother/path/file.txt', true],
['matches', '/^some\/path\/.+$/i', 'files/SomE/PATH/subfolder/file.txt', true],
['matches', '/some\/path\/.*\/sub2/', 'files/some/path/subfolder1/sub2/anotherfile.pdf', true],
['!matches', '/some\/path/', 'files/some/path/file.txt', false],
['!matches', '/some\/path/', 'files/another/path/file.txt', true],
];
}
}

1
build/psalm-baseline.xml
Unescape Escape View File

@ -2783,7 +2783,6 @@
<code><![CDATA[query]]></code>
<code><![CDATA[query]]></code>
<code><![CDATA[query]]></code>
<code><![CDATA[query]]></code>
</DeprecatedMethod>
<InvalidArgument>
<code><![CDATA[$missingCheck]]></code>