diff --git a/.devcontainer/postCreateCommands.sh b/.devcontainer/postCreateCommands.sh index 1195c417..cddaa66d 100755 --- a/.devcontainer/postCreateCommands.sh +++ b/.devcontainer/postCreateCommands.sh @@ -1,7 +1,7 @@ #!/bin/bash -bash -i -c 'nvm install 20' -bash -i -c 'nvm use 20' +bash -i -c 'nvm install v20.18.1' +bash -i -c 'nvm use v20.18.1' echo "setup php-scoper" composer global require humbug/php-scoper diff --git a/Dockerfile.Nextcloud b/Dockerfile.Nextcloud index fb3ae82e..5ec161f0 100644 --- a/Dockerfile.Nextcloud +++ b/Dockerfile.Nextcloud @@ -1,4 +1,4 @@ -ARG NEXTCLOUD_VERSION=30.0.1 +ARG NEXTCLOUD_VERSION=30.0.2 ARG INSTALL_XDEBUG=1 FROM nextcloud:${NEXTCLOUD_VERSION} diff --git a/composer.json b/composer.json index 80e27989..71dd6100 100644 --- a/composer.json +++ b/composer.json @@ -13,11 +13,12 @@ "coduo/php-humanizer": "^5.0" }, "require-dev": { - "nextcloud/ocp": "v30.0.1", + "nextcloud/ocp": "v30.0.2", "psalm/phar": "5.26.1", "nextcloud/coding-standard": "v1.3.2", "phpunit/phpunit": "10.5.38", - "symfony/console": "6.4.13" + "symfony/console": "6.4.13", + "colinodell/psr-testlogger": "1.0.0" }, "autoload": { "psr-4": { diff --git a/tests/unittests/ScanServiceTest.php b/tests/unittests/ScanServiceTest.php index 12747882..09546244 100644 --- a/tests/unittests/ScanServiceTest.php +++ b/tests/unittests/ScanServiceTest.php @@ -15,7 +15,7 @@ use OCP\SystemTag\TagNotFoundException; use PHPUnit\Framework\TestCase; use Psr\Log\LoggerInterface; -use Psr\Log\Test\TestLogger; +use ColinODell\PsrTestLogger\TestLogger; class ScanServiceTest extends TestCase { private LoggerInterface $logger; diff --git a/tests/unittests/TagServiceTest.php b/tests/unittests/TagServiceTest.php index c485529f..44131225 100644 --- a/tests/unittests/TagServiceTest.php +++ b/tests/unittests/TagServiceTest.php @@ -8,7 +8,7 @@ use OCP\SystemTag\ISystemTagManager; use OCP\SystemTag\ISystemTagObjectMapper; use PHPUnit\Framework\TestCase; -use Psr\Log\Test\TestLogger; +use ColinODell\PsrTestLogger\TestLogger; class TagServiceTest extends TestCase { public static int $OBJECT_ID_1 = 1; diff --git a/tests/unittests/VerdictServiceTest.php b/tests/unittests/VerdictServiceTest.php index 8b97059f..384cf333 100644 --- a/tests/unittests/VerdictServiceTest.php +++ b/tests/unittests/VerdictServiceTest.php @@ -10,7 +10,7 @@ use OCP\IAppConfig; use PHPUnit\Framework\TestCase; use Psr\Log\LoggerInterface; -use Psr\Log\Test\TestLogger; +use ColinODell\PsrTestLogger\TestLogger; use VaasSdk\Authentication\ResourceOwnerPasswordGrantAuthenticator; class VerdictServiceTest extends TestCase {