Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions apps/dav/appinfo/v1/publicwebdav.php
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,9 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>
*
*/

use Psr\Log\LoggerInterface;

// load needed apps
$RUNTIME_APPTYPES = ['filesystem', 'authentication', 'logging'];

Expand All @@ -49,6 +52,7 @@
$serverFactory = new OCA\DAV\Connector\Sabre\ServerFactory(
\OC::$server->getConfig(),
\OC::$server->getLogger(),
\OC::$server->get(LoggerInterface::class),
\OC::$server->getDatabaseConnection(),
\OC::$server->getUserSession(),
\OC::$server->getMountManager(),
Expand Down
4 changes: 4 additions & 0 deletions apps/dav/appinfo/v1/webdav.php
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,9 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>
*
*/

use Psr\Log\LoggerInterface;

// no php execution timeout for webdav
if (strpos(@ini_get('disable_functions'), 'set_time_limit') === false) {
@set_time_limit(0);
Expand All @@ -40,6 +43,7 @@
$serverFactory = new \OCA\DAV\Connector\Sabre\ServerFactory(
\OC::$server->getConfig(),
\OC::$server->getLogger(),
\OC::$server->get(LoggerInterface::class),
\OC::$server->getDatabaseConnection(),
\OC::$server->getUserSession(),
\OC::$server->getMountManager(),
Expand Down
4 changes: 4 additions & 0 deletions apps/dav/lib/Connector/Sabre/FilesPlugin.php
Original file line number Diff line number Diff line change
Expand Up @@ -361,6 +361,10 @@ public function handleGetProperties(PropFind $propFind, \Sabre\DAV\INode $node)
return json_encode($ocmPermissions);
});

$propFind->handle(self::SHARE_ATTRIBUTES_PROPERTYNAME, function () use ($node, $httpRequest): string {
return json_encode($node->getShareAttributes());
});

$propFind->handle(self::GETETAG_PROPERTYNAME, function () use ($node) {
return $node->getETag();
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
use Test\TestCase;
use Test\Traits\MountProviderTrait;
use Test\Traits\UserTrait;
use Psr\Log\LoggerInterface;

abstract class RequestTestCase extends TestCase {
use UserTrait;
Expand All @@ -61,6 +62,7 @@ protected function setUp(): void {
$this->serverFactory = new ServerFactory(
\OC::$server->getConfig(),
\OC::$server->getLogger(),
\OC::$server->get(LoggerInterface::class),
\OC::$server->getDatabaseConnection(),
\OC::$server->getUserSession(),
\OC::$server->getMountManager(),
Expand Down
6 changes: 3 additions & 3 deletions apps/dav/tests/unit/Controller/DirectControllerTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
use OCP\Files\Folder;
use OCP\Files\IRootFolder;
use OCP\IRequest;
use OCP\IUrlGenerator;
use OCP\IURLGenerator;
use OCP\Security\ISecureRandom;
use Test\TestCase;

Expand All @@ -57,7 +57,7 @@ class DirectControllerTest extends TestCase {
/** @var ITimeFactory|\PHPUnit\Framework\MockObject\MockObject */
private $timeFactory;

/** @var IUrlGenerator|\PHPUnit\Framework\MockObject\MockObject */
/** @var IURlGenerator|\PHPUnit\Framework\MockObject\MockObject */
private $urlGenerator;

/** @var IEventDispatcher|\PHPUnit\Framework\MockObject\MockObject */
Expand All @@ -72,7 +72,7 @@ protected function setUp(): void {
$this->directMapper = $this->createMock(DirectMapper::class);
$this->random = $this->createMock(ISecureRandom::class);
$this->timeFactory = $this->createMock(ITimeFactory::class);
$this->urlGenerator = $this->createMock(IUrlGenerator::class);
$this->urlGenerator = $this->createMock(IURLGenerator::class);
$this->eventDispatcher = $this->createMock(IEventDispatcher::class);

$this->controller = new DirectController(
Expand Down
4 changes: 2 additions & 2 deletions dist/core-files_client.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/core-files_client.js.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dist/core-files_fileinfo.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/core-files_fileinfo.js.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions dist/files-sidebar.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/files-sidebar.js.map

Large diffs are not rendered by default.

Loading