diff options
7 files changed, 18 insertions, 5 deletions
diff --git a/apps/encryption/lib/Command/FixEncryptedVersion.php b/apps/encryption/lib/Command/FixEncryptedVersion.php index d51f64c8ef9..073c1f1438a 100644 --- a/apps/encryption/lib/Command/FixEncryptedVersion.php +++ b/apps/encryption/lib/Command/FixEncryptedVersion.php @@ -116,10 +116,7 @@ class FixEncryptedVersion extends Command { $user = (string)$input->getArgument('user'); $pathToWalk = "/$user/files"; - /** - * trim() returns an empty string when the argument is an unset/null - */ - $pathOption = \trim($input->getOption('path'), '/'); + $pathOption = \trim(($input->getOption('path') ?? ''), '/'); if ($pathOption !== "") { $pathToWalk = "$pathToWalk/$pathOption"; } diff --git a/apps/encryption/tests/Crypto/EncryptAllTest.php b/apps/encryption/tests/Crypto/EncryptAllTest.php index 4a00b67f0b1..e5c10dd67e8 100644 --- a/apps/encryption/tests/Crypto/EncryptAllTest.php +++ b/apps/encryption/tests/Crypto/EncryptAllTest.php @@ -117,9 +117,12 @@ class EncryptAllTest extends TestCase { $this->userInterface = $this->getMockBuilder(UserInterface::class) ->disableOriginalConstructor()->getMock(); + /* We need format method to return a string */ + $outputFormatter = $this->createMock(OutputFormatterInterface::class); + $outputFormatter->method('format')->willReturnArgument(0); $this->outputInterface->expects($this->any())->method('getFormatter') - ->willReturn($this->createMock(OutputFormatterInterface::class)); + ->willReturn($outputFormatter); $this->userManager->expects($this->any())->method('getBackends')->willReturn([$this->userInterface]); $this->userInterface->expects($this->any())->method('getUsers')->willReturn(['user1', 'user2']); diff --git a/apps/files_sharing/tests/Controller/PublicPreviewControllerTest.php b/apps/files_sharing/tests/Controller/PublicPreviewControllerTest.php index e089cd9e34b..9f852721678 100644 --- a/apps/files_sharing/tests/Controller/PublicPreviewControllerTest.php +++ b/apps/files_sharing/tests/Controller/PublicPreviewControllerTest.php @@ -137,6 +137,8 @@ class PublicPreviewControllerTest extends TestCase { ->willReturn($file); $preview = $this->createMock(ISimpleFile::class); + $preview->method('getName')->willReturn('name'); + $preview->method('getMTime')->willReturn(42); $this->previewManager->method('getPreview') ->with($this->equalTo($file), 10, 10, false) ->willReturn($preview); @@ -192,6 +194,8 @@ class PublicPreviewControllerTest extends TestCase { ->willReturn($file); $preview = $this->createMock(ISimpleFile::class); + $preview->method('getName')->willReturn('name'); + $preview->method('getMTime')->willReturn(42); $this->previewManager->method('getPreview') ->with($this->equalTo($file), 10, 10, false) ->willReturn($preview); diff --git a/apps/files_trashbin/tests/Controller/PreviewControllerTest.php b/apps/files_trashbin/tests/Controller/PreviewControllerTest.php index 1a36473ecf1..441222bea19 100644 --- a/apps/files_trashbin/tests/Controller/PreviewControllerTest.php +++ b/apps/files_trashbin/tests/Controller/PreviewControllerTest.php @@ -144,6 +144,8 @@ class PreviewControllerTest extends TestCase { ->willReturn($file); $preview = $this->createMock(ISimpleFile::class); + $preview->method('getName')->willReturn('name'); + $preview->method('getMTime')->willReturn(42); $this->previewManager->method('getPreview') ->with($this->equalTo($file), 10, 10, true, IPreview::MODE_FILL, 'myMime') ->willReturn($preview); diff --git a/apps/files_versions/tests/Controller/PreviewControllerTest.php b/apps/files_versions/tests/Controller/PreviewControllerTest.php index 64a060e3108..0457d0d5f24 100644 --- a/apps/files_versions/tests/Controller/PreviewControllerTest.php +++ b/apps/files_versions/tests/Controller/PreviewControllerTest.php @@ -141,6 +141,8 @@ class PreviewControllerTest extends TestCase { ->willReturn($file); $preview = $this->createMock(ISimpleFile::class); + $preview->method('getName')->willReturn('name'); + $preview->method('getMTime')->willReturn(42); $this->previewManager->method('getPreview') ->with($this->equalTo($file), 10, 10, true, IPreview::MODE_FILL, 'myMime') ->willReturn($preview); diff --git a/apps/theming/tests/Controller/IconControllerTest.php b/apps/theming/tests/Controller/IconControllerTest.php index 821291427d9..04954782168 100644 --- a/apps/theming/tests/Controller/IconControllerTest.php +++ b/apps/theming/tests/Controller/IconControllerTest.php @@ -91,6 +91,8 @@ class IconControllerTest extends TestCase { $icon->expects($this->any())->method('getContent')->willReturn($data); $icon->expects($this->any())->method('getMimeType')->willReturn('image type'); $icon->expects($this->any())->method('getEtag')->willReturn('my etag'); + $icon->expects($this->any())->method('getName')->willReturn('my name'); + $icon->expects($this->any())->method('getMTime')->willReturn(42); $icon->method('getName')->willReturn($filename); return new SimpleFile($icon); } diff --git a/apps/theming/tests/Controller/ThemingControllerTest.php b/apps/theming/tests/Controller/ThemingControllerTest.php index b85b2bb6ad0..cff2028809d 100644 --- a/apps/theming/tests/Controller/ThemingControllerTest.php +++ b/apps/theming/tests/Controller/ThemingControllerTest.php @@ -748,6 +748,7 @@ class ThemingControllerTest extends TestCase { $this->appManager->expects($this->once())->method('getAppPath')->with('theming')->willReturn(\OC::$SERVERROOT . '/theming'); $file = $this->createMock(ISimpleFile::class); $file->expects($this->any())->method('getName')->willReturn('theming.css'); + $file->expects($this->any())->method('getMTime')->willReturn(42); $file->expects($this->any())->method('getContent')->willReturn('compiled'); $this->scssCacher->expects($this->once())->method('process')->willReturn(true); $this->scssCacher->expects($this->once())->method('getCachedCSS')->willReturn($file); @@ -763,6 +764,7 @@ class ThemingControllerTest extends TestCase { $this->appManager->expects($this->once())->method('getAppPath')->with('theming')->willReturn(\OC::$SERVERROOT . '/theming'); $file = $this->createMock(ISimpleFile::class); $file->expects($this->any())->method('getName')->willReturn('theming.css'); + $file->expects($this->any())->method('getMTime')->willReturn(42); $file->expects($this->any())->method('getContent')->willReturn('compiled'); $this->scssCacher->expects($this->once())->method('process')->willReturn(true); $this->scssCacher->expects($this->once())->method('getCachedCSS')->willThrowException(new NotFoundException()); @@ -776,6 +778,7 @@ class ThemingControllerTest extends TestCase { $this->appManager->expects($this->once())->method('getAppPath')->with('theming')->willReturn('/outside/serverroot/theming'); $file = $this->createMock(ISimpleFile::class); $file->expects($this->any())->method('getName')->willReturn('theming.css'); + $file->expects($this->any())->method('getMTime')->willReturn(42); $file->expects($this->any())->method('getContent')->willReturn('compiled'); $this->scssCacher->expects($this->once())->method('process')->with('/outside/serverroot/theming', 'css/theming.scss', 'theming')->willReturn(true); $this->scssCacher->expects($this->once())->method('getCachedCSS')->willReturn($file); |