feat!: Migrate Sharing events to typed events

Signed-off-by: Joas Schilling <coding@schilljs.com>

2 files changed, 42 insertions, 40 deletions

diff --git a/tests/lib/Share20/LegacyHooksTest.php b/tests/lib/Share20/LegacyHooksTest.php
index 54d8e0be725..596fba7bfad 100644
--- a/tests/lib/Share20/LegacyHooksTest.php
+++ b/tests/lib/Share20/LegacyHooksTest.php
@@ -31,6 +31,8 @@ use OCP\EventDispatcher\IEventDispatcher;
 use OCP\Files\Cache\ICacheEntry;
 use OCP\Files\File;
 use OCP\IServerContainer;
+use OCP\Share\Events\BeforeShareCreatedEvent;
+use OCP\Share\Events\ShareCreatedEvent;
 use OCP\Share\IShare;
 use Psr\Log\LoggerInterface;
 use Symfony\Component\EventDispatcher\GenericEvent;
@@ -51,9 +53,8 @@ class LegacyHooksTest extends TestCase {
 
 		$symfonyDispatcher = new \Symfony\Component\EventDispatcher\EventDispatcher();
 		$logger = $this->createMock(LoggerInterface::class);
-		$eventDispatcher = new \OC\EventDispatcher\EventDispatcher($symfonyDispatcher, \OC::$server->get(IServerContainer::class), $logger);
-		$this->eventDispatcher = new SymfonyAdapter($eventDispatcher, $logger);
-		$this->hooks = new LegacyHooks($eventDispatcher);
+		$this->eventDispatcher = new \OC\EventDispatcher\EventDispatcher($symfonyDispatcher, \OC::$server->get(IServerContainer::class), $logger);
+		$this->hooks = new LegacyHooks($this->eventDispatcher);
 		$this->manager = \OC::$server->getShareManager();
 	}
 
@@ -253,8 +254,8 @@ class LegacyHooksTest extends TestCase {
 			->method('preShare')
 			->with($expected);
 
-		$event = new GenericEvent($share);
-		$this->eventDispatcher->dispatch('OCP\Share::preShare', $event);
+		$event = new BeforeShareCreatedEvent($share);
+		$this->eventDispatcher->dispatchTyped($event);
 	}
 
 	public function testPreShareError() {
@@ -305,11 +306,11 @@ class LegacyHooksTest extends TestCase {
 				$data['error'] = 'I error';
 			});
 
-		$event = new GenericEvent($share);
-		$this->eventDispatcher->dispatch('OCP\Share::preShare', $event);
+		$event = new BeforeShareCreatedEvent($share);
+		$this->eventDispatcher->dispatchTyped($event);
 
 		$this->assertTrue($event->isPropagationStopped());
-		$this->assertSame('I error', $event->getArgument('error'));
+		$this->assertSame('I error', $event->getError());
 	}
 
 	public function testPostShare() {
@@ -355,7 +356,7 @@ class LegacyHooksTest extends TestCase {
 			->method('postShare')
 			->with($expected);
 
-		$event = new GenericEvent($share);
-		$this->eventDispatcher->dispatch('OCP\Share::postShare', $event);
+		$event = new ShareCreatedEvent($share);
+		$this->eventDispatcher->dispatchTyped($event);
 	}
 }
diff --git a/tests/lib/Share20/ManagerTest.php b/tests/lib/Share20/ManagerTest.php
index a23aa6023af..7a0c23ec2b4 100644
--- a/tests/lib/Share20/ManagerTest.php
+++ b/tests/lib/Share20/ManagerTest.php
@@ -51,6 +51,8 @@ use OCP\Mail\IMailer;
 use OCP\Security\Events\ValidatePasswordPolicyEvent;
 use OCP\Security\IHasher;
 use OCP\Security\ISecureRandom;
+use OCP\Share\Events\BeforeShareCreatedEvent;
+use OCP\Share\Events\ShareCreatedEvent;
 use OCP\Share\Exceptions\AlreadySharedException;
 use OCP\Share\Exceptions\ShareNotFound;
 use OCP\Share\IManager;
@@ -2317,14 +2319,13 @@ class ManagerTest extends \Test\TestCase {
 				return $share->setId(42);
 			});
 
-		$this->eventDispatcher->expects($this->exactly(2))
-			->method('dispatch')
+		$this->dispatcher->expects($this->exactly(2))
+			->method('dispatchTyped')
 			->withConsecutive(
 				// Pre share
-				[$this->equalTo('OCP\Share::preShare'),
-					$this->callback(function (GenericEvent $e) use ($path, $date) {
-						/** @var IShare $share */
-						$share = $e->getSubject();
+				[
+					$this->callback(function (BeforeShareCreatedEvent $e) use ($path, $date) {
+						$share = $e->getShare();
 
 						return $share->getShareType() === IShare::TYPE_LINK &&
 							$share->getNode() === $path &&
@@ -2333,12 +2334,12 @@ class ManagerTest extends \Test\TestCase {
 							$share->getExpirationDate() === $date &&
 							$share->getPassword() === 'hashed' &&
 							$share->getToken() === 'token';
-					})],
+					})
+				],
 				// Post share
-				[$this->equalTo('OCP\Share::postShare'),
-					$this->callback(function (GenericEvent $e) use ($path, $date) {
-						/** @var IShare $share */
-						$share = $e->getSubject();
+				[
+					$this->callback(function (ShareCreatedEvent $e) use ($path, $date) {
+						$share = $e->getShare();
 
 						return $share->getShareType() === IShare::TYPE_LINK &&
 							$share->getNode() === $path &&
@@ -2349,7 +2350,8 @@ class ManagerTest extends \Test\TestCase {
 							$share->getToken() === 'token' &&
 							$share->getId() === '42' &&
 							$share->getTarget() === '/target';
-					})]
+					})
+				]
 			);
 
 		/** @var IShare $share */
@@ -2424,13 +2426,12 @@ class ManagerTest extends \Test\TestCase {
 				return $share->setId(42);
 			});
 
-		$this->eventDispatcher->expects($this->exactly(2))
-			->method('dispatch')
+		$this->dispatcher->expects($this->exactly(2))
+			->method('dispatchTyped')
 			->withConsecutive(
-				[$this->equalTo('OCP\Share::preShare'),
-					$this->callback(function (GenericEvent $e) use ($path) {
-						/** @var IShare $share */
-						$share = $e->getSubject();
+				[
+					$this->callback(function (BeforeShareCreatedEvent $e) use ($path) {
+						$share = $e->getShare();
 
 						return $share->getShareType() === IShare::TYPE_EMAIL &&
 							$share->getNode() === $path &&
@@ -2439,11 +2440,11 @@ class ManagerTest extends \Test\TestCase {
 							$share->getExpirationDate() === null &&
 							$share->getPassword() === null &&
 							$share->getToken() === 'token';
-					})],
-				[$this->equalTo('OCP\Share::postShare'),
-					$this->callback(function (GenericEvent $e) use ($path) {
-						/** @var IShare $share */
-						$share = $e->getSubject();
+					})
+				],
+				[
+					$this->callback(function (ShareCreatedEvent $e) use ($path) {
+						$share = $e->getShare();
 
 						return $share->getShareType() === IShare::TYPE_EMAIL &&
 							$share->getNode() === $path &&
@@ -2454,7 +2455,8 @@ class ManagerTest extends \Test\TestCase {
 							$share->getToken() === 'token' &&
 							$share->getId() === '42' &&
 							$share->getTarget() === '/target';
-					})],
+					})
+				],
 			);
 
 		/** @var IShare $share */
@@ -2521,13 +2523,12 @@ class ManagerTest extends \Test\TestCase {
 			->with('/target');
 
 		// Pre share
-		$this->eventDispatcher->expects($this->once())
-			->method('dispatch')
+		$this->dispatcher->expects($this->once())
+			->method('dispatchTyped')
 			->with(
-				$this->equalTo('OCP\Share::preShare'),
-				$this->isInstanceOf(GenericEvent::class)
-			)->willReturnCallback(function ($name, GenericEvent $e) {
-				$e->setArgument('error', 'I won\'t let you share!');
+				$this->isInstanceOf(BeforeShareCreatedEvent::class)
+			)->willReturnCallback(function (BeforeShareCreatedEvent $e) {
+				$e->setError('I won\'t let you share!');
 				$e->stopPropagation();
 			}
 			);