mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #25664 from nextcloud/fix/psalm/dav_casts 

Fix some RedundantCast in dav code
This commit is contained in:
Roeland Jago Douma 2021-02-15 22:04:46 +01:00 committed by GitHub
parent 4a801f39ee df4c2508d6
commit d6e34b5045
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/dav/lib/CalDAV/CalDavBackend.php
View File

@ -2158,10 +2158,10 @@ class CalDavBackend extends AbstractBackend implements SyncSupport, Subscription
->values($valuesToInsert) ->values($valuesToInsert)
->execute(); ->execute();
$subscriptionId = $this->db->lastInsertId('*PREFIX*calendarsubscriptions'); $subscriptionId = $query->getLastInsertId();
$subscriptionRow = $this->getSubscriptionById($subscriptionId); $subscriptionRow = $this->getSubscriptionById($subscriptionId);
$this->dispatcher->dispatchTyped(new SubscriptionCreatedEvent((int)$subscriptionId, $subscriptionRow)); $this->dispatcher->dispatchTyped(new SubscriptionCreatedEvent($subscriptionId, $subscriptionRow));
$this->legacyDispatcher->dispatch('\OCA\DAV\CalDAV\CalDavBackend::createSubscription', new GenericEvent( $this->legacyDispatcher->dispatch('\OCA\DAV\CalDAV\CalDavBackend::createSubscription', new GenericEvent(
'\OCA\DAV\CalDAV\CalDavBackend::createSubscription', '\OCA\DAV\CalDAV\CalDavBackend::createSubscription',
[ [

2
apps/dav/lib/Provisioning/Apple/AppleProvisioningPlugin.php
View File

@ -130,7 +130,7 @@ class AppleProvisioningPlugin extends ServerPlugin {
$absoluteURL = $this->urlGenerator->getBaseUrl(); $absoluteURL = $this->urlGenerator->getBaseUrl();
$parsedUrl = parse_url($absoluteURL); $parsedUrl = parse_url($absoluteURL);
if (isset($parsedUrl['port'])) { if (isset($parsedUrl['port'])) {
$serverPort = (int) $parsedUrl['port']; $serverPort = $parsedUrl['port'];
} else { } else {
$serverPort = 443; $serverPort = 443;
} }