upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-04-15 22:11:17 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 25

fix(Hooks): Don't use offset null as it's deprecated (and not actually used)

Browse source 
Signed-off-by: Joas Schilling <coding@schilljs.com>
This commit is contained in:
Joas Schilling 2025-12-18 08:06:47 +01:00
parent c27db5fdad
commit 226b7df65e
No known key found for this signature in database
GPG key ID: F72FA5B49FFA96B0
1 changed files with 28 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
tests/lib/Files/ViewTest.php
View file

@ -1811,13 +1811,13 @@ class ViewTest extends \Test\TestCase {
['touch', ['test.txt'], 'test.txt', 'touch', null, null, null],
// ---- no hooks, no locks ---
['is_dir', ['dir'], 'dir', null],
['is_file', ['dir'], 'dir', null],
['is_dir', ['dir'], 'dir', ''],
['is_file', ['dir'], 'dir', ''],
[
'stat',
['dir'],
'dir',
null,
'',
ILockingProvider::LOCK_SHARED,
ILockingProvider::LOCK_SHARED,
ILockingProvider::LOCK_SHARED,
@ -1828,7 +1828,7 @@ class ViewTest extends \Test\TestCase {
'filetype',
['dir'],
'dir',
null,
'',
ILockingProvider::LOCK_SHARED,
ILockingProvider::LOCK_SHARED,
ILockingProvider::LOCK_SHARED,
@ -1839,7 +1839,7 @@ class ViewTest extends \Test\TestCase {
'filesize',
['dir'],
'dir',
null,
'',
ILockingProvider::LOCK_SHARED,
ILockingProvider::LOCK_SHARED,
ILockingProvider::LOCK_SHARED,
@ -1847,17 +1847,17 @@ class ViewTest extends \Test\TestCase {
/* Return an int */
100
],
['isCreatable', ['dir'], 'dir', null],
['isReadable', ['dir'], 'dir', null],
['isUpdatable', ['dir'], 'dir', null],
['isDeletable', ['dir'], 'dir', null],
['isSharable', ['dir'], 'dir', null],
['file_exists', ['dir'], 'dir', null],
['isCreatable', ['dir'], 'dir', ''],
['isReadable', ['dir'], 'dir', ''],
['isUpdatable', ['dir'], 'dir', ''],
['isDeletable', ['dir'], 'dir', ''],
['isSharable', ['dir'], 'dir', ''],
['file_exists', ['dir'], 'dir', ''],
[
'filemtime',
['dir'],
'dir',
null,
'',
ILockingProvider::LOCK_SHARED,
ILockingProvider::LOCK_SHARED,
ILockingProvider::LOCK_SHARED,
@ -1875,23 +1875,23 @@ class ViewTest extends \Test\TestCase {
* @param array $operationArgs arguments for the operation
* @param string $lockedPath path of the locked item to check
* @param string $hookType hook type
* @param int $expectedLockBefore expected lock during pre hooks
* @param int $expectedLockDuring expected lock during operation
* @param int $expectedLockAfter expected lock during post hooks
* @param int $expectedStrayLock expected lock after returning, should
* be null (unlock) for most operations
* @param ?int $expectedLockBefore expected lock during pre hooks
* @param ?int $expectedLockDuring expected lock during operation
* @param ?int $expectedLockAfter expected lock during post hooks
* @param ?int $expectedStrayLock expected lock after returning, should
* be null (unlock) for most operations
*/
#[\PHPUnit\Framework\Attributes\DataProvider('basicOperationProviderForLocks')]
public function testLockBasicOperation(
$operation,
$operationArgs,
$lockedPath,
$hookType,
$expectedLockBefore = ILockingProvider::LOCK_SHARED,
$expectedLockDuring = ILockingProvider::LOCK_SHARED,
$expectedLockAfter = ILockingProvider::LOCK_SHARED,
$expectedStrayLock = null,
$returnValue = true,
string $operation,
array $operationArgs,
string $lockedPath,
string $hookType,
?int $expectedLockBefore = ILockingProvider::LOCK_SHARED,
?int $expectedLockDuring = ILockingProvider::LOCK_SHARED,
?int $expectedLockAfter = ILockingProvider::LOCK_SHARED,
?int $expectedStrayLock = null,
mixed $returnValue = true,
): void {
$view = new View('/' . $this->user . '/files/');
@ -1931,7 +1931,7 @@ class ViewTest extends \Test\TestCase {
// do operation
call_user_func_array([$view, $operation], $operationArgs);
if ($hookType !== null) {
if ($hookType !== '') {
$this->assertEquals($expectedLockBefore, $lockTypePre, 'File locked properly during pre-hook');
$this->assertEquals($expectedLockAfter, $lockTypePost, 'File locked properly during post-hook');
$this->assertEquals($expectedLockDuring, $lockTypeDuring, 'File locked properly during operation');
@ -2530,7 +2530,7 @@ class ViewTest extends \Test\TestCase {
}
);
if ($hookType !== null) {
if ($hookType !== '') {
Util::connectHook(
Filesystem::CLASSNAME,
$hookType,