Bladeren bron

Move to single share event. Just emit more if needed

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
tags/v21.0.0beta3
Roeland Jago Douma 3 jaren geleden
bovenliggende
commit
bb411c75c6
No account linked to committer's email address
2 gewijzigde bestanden met toevoegingen van 3 en 22 verwijderingen
  1. 2
    1
      lib/private/Share20/Manager.php
  2. 1
    21
      lib/public/Share/Events/ShareDeletedEvent.php

+ 2
- 1
lib/private/Share20/Manager.php Bestand weergeven

@@ -1138,6 +1138,7 @@ class Manager implements IManager {
$deletedShares = array_merge($deletedShares, $deletedChildren);

$provider->delete($child);
$this->dispatcher->dispatchTyped(new Share\Events\ShareDeletedEvent($child));
$deletedShares[] = $child;
}

@@ -1168,7 +1169,7 @@ class Manager implements IManager {
$provider = $this->factory->getProviderForType($share->getShareType());
$provider->delete($share);

$this->dispatcher->dispatchTyped(new Share\Events\ShareDeletedEvent($share, $deletedShares));
$this->dispatcher->dispatchTyped(new Share\Events\ShareDeletedEvent($share));

// All the deleted shares caused by this delete
$deletedShares[] = $share;

+ 1
- 21
lib/public/Share/Events/ShareDeletedEvent.php Bestand weergeven

@@ -37,9 +37,6 @@ class ShareDeletedEvent extends Event {
/** @var IShare */
private $share;

/** @var IShare[] */
private $children;

/**
*
* @param IShare $share
@@ -47,11 +44,10 @@ class ShareDeletedEvent extends Event {
*
* @since 21.0.0
*/
public function __construct(IShare $share, array $children = []) {
public function __construct(IShare $share) {
parent::__construct();

$this->share = $share;
$this->children = $children;
}

/**
@@ -61,20 +57,4 @@ class ShareDeletedEvent extends Event {
public function getShare(): IShare {
return $this->share;
}

/**
* @return IShare[]
* @since 21.0.0
*/
public function getChildren(): array {
return $this->children;
}

/**
* @return IShare[]
* @since 21.0.0
*/
public function getAllDeletedShares(): array {
return array_merge([$this->share], $this->children);
}
}

Laden…
Annuleren
Opslaan