nextcloud / server

apps/dav/tests/unit/CalDAV/Activity/Provider/BaseTest.php

Indentation +93 added lines, -93 removed lines

@@ -17,108 +17,108 @@
 use Test\TestCase;
 
 class BaseTest extends TestCase {
-	protected IUserManager&MockObject $userManager;
-	protected IGroupManager&MockObject $groupManager;
-	protected IURLGenerator&MockObject $url;
-	protected Base&MockObject $provider;
+    protected IUserManager&MockObject $userManager;
+    protected IGroupManager&MockObject $groupManager;
+    protected IURLGenerator&MockObject $url;
+    protected Base&MockObject $provider;
 
-	protected function setUp(): void {
-		parent::setUp();
-		$this->userManager = $this->createMock(IUserManager::class);
-		$this->groupManager = $this->createMock(IGroupManager::class);
-		$this->url = $this->createMock(IURLGenerator::class);
-		$this->provider = $this->getMockBuilder(Base::class)
-			->setConstructorArgs([
-				$this->userManager,
-				$this->groupManager,
-				$this->url,
-			])
-			->onlyMethods(['parse'])
-			->getMock();
-	}
+    protected function setUp(): void {
+        parent::setUp();
+        $this->userManager = $this->createMock(IUserManager::class);
+        $this->groupManager = $this->createMock(IGroupManager::class);
+        $this->url = $this->createMock(IURLGenerator::class);
+        $this->provider = $this->getMockBuilder(Base::class)
+            ->setConstructorArgs([
+                $this->userManager,
+                $this->groupManager,
+                $this->url,
+            ])
+            ->onlyMethods(['parse'])
+            ->getMock();
+    }
 
-	public static function dataSetSubjects(): array {
-		return [
-			['abc', []],
-			['{actor} created {calendar}', ['actor' => ['name' => 'abc'], 'calendar' => ['name' => 'xyz']]],
-		];
-	}
+    public static function dataSetSubjects(): array {
+        return [
+            ['abc', []],
+            ['{actor} created {calendar}', ['actor' => ['name' => 'abc'], 'calendar' => ['name' => 'xyz']]],
+        ];
+    }
 
-	/**
-	 * @dataProvider dataSetSubjects
-	 */
-	public function testSetSubjects(string $subject, array $parameters): void {
-		$event = $this->createMock(IEvent::class);
-		$event->expects($this->once())
-			->method('setRichSubject')
-			->with($subject, $parameters)
-			->willReturnSelf();
-		$event->expects($this->never())
-			->method('setParsedSubject');
+    /**
+     * @dataProvider dataSetSubjects
+     */
+    public function testSetSubjects(string $subject, array $parameters): void {
+        $event = $this->createMock(IEvent::class);
+        $event->expects($this->once())
+            ->method('setRichSubject')
+            ->with($subject, $parameters)
+            ->willReturnSelf();
+        $event->expects($this->never())
+            ->method('setParsedSubject');
 
-		$this->invokePrivate($this->provider, 'setSubjects', [$event, $subject, $parameters]);
-	}
+        $this->invokePrivate($this->provider, 'setSubjects', [$event, $subject, $parameters]);
+    }
 
-	public static function dataGenerateCalendarParameter(): array {
-		return [
-			[['id' => 23, 'uri' => 'foo', 'name' => 'bar'], 'bar'],
-			[['id' => 42, 'uri' => 'foo', 'name' => 'Personal'], 'Personal'],
-			[['id' => 42, 'uri' => 'personal', 'name' => 'bar'], 'bar'],
-			[['id' => 42, 'uri' => 'personal', 'name' => 'Personal'], 't(Personal)'],
-		];
-	}
+    public static function dataGenerateCalendarParameter(): array {
+        return [
+            [['id' => 23, 'uri' => 'foo', 'name' => 'bar'], 'bar'],
+            [['id' => 42, 'uri' => 'foo', 'name' => 'Personal'], 'Personal'],
+            [['id' => 42, 'uri' => 'personal', 'name' => 'bar'], 'bar'],
+            [['id' => 42, 'uri' => 'personal', 'name' => 'Personal'], 't(Personal)'],
+        ];
+    }
 
-	/**
-	 * @dataProvider dataGenerateCalendarParameter
-	 */
-	public function testGenerateCalendarParameter(array $data, string $name): void {
-		$l = $this->createMock(IL10N::class);
-		$l->expects($this->any())
-			->method('t')
-			->willReturnCallback(function ($string, $args) {
-				return 't(' . vsprintf($string, $args) . ')';
-			});
+    /**
+     * @dataProvider dataGenerateCalendarParameter
+     */
+    public function testGenerateCalendarParameter(array $data, string $name): void {
+        $l = $this->createMock(IL10N::class);
+        $l->expects($this->any())
+            ->method('t')
+            ->willReturnCallback(function ($string, $args) {
+                return 't(' . vsprintf($string, $args) . ')';
+            });
 
-		$this->assertEquals([
-			'type' => 'calendar',
-			'id' => $data['id'],
-			'name' => $name,
-		], $this->invokePrivate($this->provider, 'generateCalendarParameter', [$data, $l]));
-	}
+        $this->assertEquals([
+            'type' => 'calendar',
+            'id' => $data['id'],
+            'name' => $name,
+        ], $this->invokePrivate($this->provider, 'generateCalendarParameter', [$data, $l]));
+    }
 
-	public static function dataGenerateLegacyCalendarParameter(): array {
-		return [
-			[23, 'c1'],
-			[42, 'c2'],
-		];
-	}
+    public static function dataGenerateLegacyCalendarParameter(): array {
+        return [
+            [23, 'c1'],
+            [42, 'c2'],
+        ];
+    }
 
-	/**
-	 * @dataProvider dataGenerateLegacyCalendarParameter
-	 */
-	public function testGenerateLegacyCalendarParameter(int $id, string $name): void {
-		$this->assertEquals([
-			'type' => 'calendar',
-			'id' => $id,
-			'name' => $name,
-		], $this->invokePrivate($this->provider, 'generateLegacyCalendarParameter', [$id, $name]));
-	}
+    /**
+     * @dataProvider dataGenerateLegacyCalendarParameter
+     */
+    public function testGenerateLegacyCalendarParameter(int $id, string $name): void {
+        $this->assertEquals([
+            'type' => 'calendar',
+            'id' => $id,
+            'name' => $name,
+        ], $this->invokePrivate($this->provider, 'generateLegacyCalendarParameter', [$id, $name]));
+    }
 
-	public static function dataGenerateGroupParameter(): array {
-		return [
-			['g1'],
-			['g2'],
-		];
-	}
+    public static function dataGenerateGroupParameter(): array {
+        return [
+            ['g1'],
+            ['g2'],
+        ];
+    }
 
-	/**
-	 * @dataProvider dataGenerateGroupParameter
-	 */
-	public function testGenerateGroupParameter(string $gid): void {
-		$this->assertEquals([
-			'type' => 'user-group',
-			'id' => $gid,
-			'name' => $gid,
-		], $this->invokePrivate($this->provider, 'generateGroupParameter', [$gid]));
-	}
+    /**
+     * @dataProvider dataGenerateGroupParameter
+     */
+    public function testGenerateGroupParameter(string $gid): void {
+        $this->assertEquals([
+            'type' => 'user-group',
+            'id' => $gid,
+            'name' => $gid,
+        ], $this->invokePrivate($this->provider, 'generateGroupParameter', [$gid]));
+    }
 }

apps/dav/tests/unit/CalDAV/Activity/Setting/GenericTest.php

Indentation +73 added lines, -73 removed lines

@@ -15,85 +15,85 @@
 use Test\TestCase;
 
 class GenericTest extends TestCase {
-	public static function dataSettings(): array {
-		return [
-			[Calendar::class],
-			[Event::class],
-			[Todo::class],
-		];
-	}
+    public static function dataSettings(): array {
+        return [
+            [Calendar::class],
+            [Event::class],
+            [Todo::class],
+        ];
+    }
 
-	/**
-	 * @dataProvider dataSettings
-	 */
-	public function testImplementsInterface(string $settingClass): void {
-		$setting = Server::get($settingClass);
-		$this->assertInstanceOf(ISetting::class, $setting);
-	}
+    /**
+     * @dataProvider dataSettings
+     */
+    public function testImplementsInterface(string $settingClass): void {
+        $setting = Server::get($settingClass);
+        $this->assertInstanceOf(ISetting::class, $setting);
+    }
 
-	/**
-	 * @dataProvider dataSettings
-	 */
-	public function testGetIdentifier(string $settingClass): void {
-		/** @var ISetting $setting */
-		$setting = Server::get($settingClass);
-		$this->assertIsString($setting->getIdentifier());
-	}
+    /**
+     * @dataProvider dataSettings
+     */
+    public function testGetIdentifier(string $settingClass): void {
+        /** @var ISetting $setting */
+        $setting = Server::get($settingClass);
+        $this->assertIsString($setting->getIdentifier());
+    }
 
-	/**
-	 * @dataProvider dataSettings
-	 */
-	public function testGetName(string $settingClass): void {
-		/** @var ISetting $setting */
-		$setting = Server::get($settingClass);
-		$this->assertIsString($setting->getName());
-	}
+    /**
+     * @dataProvider dataSettings
+     */
+    public function testGetName(string $settingClass): void {
+        /** @var ISetting $setting */
+        $setting = Server::get($settingClass);
+        $this->assertIsString($setting->getName());
+    }
 
-	/**
-	 * @dataProvider dataSettings
-	 */
-	public function testGetPriority(string $settingClass): void {
-		/** @var ISetting $setting */
-		$setting = Server::get($settingClass);
-		$priority = $setting->getPriority();
-		$this->assertIsInt($setting->getPriority());
-		$this->assertGreaterThanOrEqual(0, $priority);
-		$this->assertLessThanOrEqual(100, $priority);
-	}
+    /**
+     * @dataProvider dataSettings
+     */
+    public function testGetPriority(string $settingClass): void {
+        /** @var ISetting $setting */
+        $setting = Server::get($settingClass);
+        $priority = $setting->getPriority();
+        $this->assertIsInt($setting->getPriority());
+        $this->assertGreaterThanOrEqual(0, $priority);
+        $this->assertLessThanOrEqual(100, $priority);
+    }
 
-	/**
-	 * @dataProvider dataSettings
-	 */
-	public function testCanChangeStream(string $settingClass): void {
-		/** @var ISetting $setting */
-		$setting = Server::get($settingClass);
-		$this->assertIsBool($setting->canChangeStream());
-	}
+    /**
+     * @dataProvider dataSettings
+     */
+    public function testCanChangeStream(string $settingClass): void {
+        /** @var ISetting $setting */
+        $setting = Server::get($settingClass);
+        $this->assertIsBool($setting->canChangeStream());
+    }
 
-	/**
-	 * @dataProvider dataSettings
-	 */
-	public function testIsDefaultEnabledStream(string $settingClass): void {
-		/** @var ISetting $setting */
-		$setting = Server::get($settingClass);
-		$this->assertIsBool($setting->isDefaultEnabledStream());
-	}
+    /**
+     * @dataProvider dataSettings
+     */
+    public function testIsDefaultEnabledStream(string $settingClass): void {
+        /** @var ISetting $setting */
+        $setting = Server::get($settingClass);
+        $this->assertIsBool($setting->isDefaultEnabledStream());
+    }
 
-	/**
-	 * @dataProvider dataSettings
-	 */
-	public function testCanChangeMail(string $settingClass): void {
-		/** @var ISetting $setting */
-		$setting = Server::get($settingClass);
-		$this->assertIsBool($setting->canChangeMail());
-	}
+    /**
+     * @dataProvider dataSettings
+     */
+    public function testCanChangeMail(string $settingClass): void {
+        /** @var ISetting $setting */
+        $setting = Server::get($settingClass);
+        $this->assertIsBool($setting->canChangeMail());
+    }
 
-	/**
-	 * @dataProvider dataSettings
-	 */
-	public function testIsDefaultEnabledMail(string $settingClass): void {
-		/** @var ISetting $setting */
-		$setting = Server::get($settingClass);
-		$this->assertIsBool($setting->isDefaultEnabledMail());
-	}
+    /**
+     * @dataProvider dataSettings
+     */
+    public function testIsDefaultEnabledMail(string $settingClass): void {
+        /** @var ISetting $setting */
+        $setting = Server::get($settingClass);
+        $this->assertIsBool($setting->isDefaultEnabledMail());
+    }
 }

apps/dav/tests/unit/CalDAV/Activity/Filter/GenericTest.php

Indentation +65 added lines, -65 removed lines

@@ -17,76 +17,76 @@
  * @group DB
  */
 class GenericTest extends TestCase {
-	public static function dataFilters(): array {
-		return [
-			[Calendar::class],
-			[Todo::class],
-		];
-	}
+    public static function dataFilters(): array {
+        return [
+            [Calendar::class],
+            [Todo::class],
+        ];
+    }
 
-	/**
-	 * @dataProvider dataFilters
-	 */
-	public function testImplementsInterface(string $filterClass): void {
-		$filter = Server::get($filterClass);
-		$this->assertInstanceOf(IFilter::class, $filter);
-	}
+    /**
+     * @dataProvider dataFilters
+     */
+    public function testImplementsInterface(string $filterClass): void {
+        $filter = Server::get($filterClass);
+        $this->assertInstanceOf(IFilter::class, $filter);
+    }
 
-	/**
-	 * @dataProvider dataFilters
-	 */
-	public function testGetIdentifier(string $filterClass): void {
-		/** @var IFilter $filter */
-		$filter = Server::get($filterClass);
-		$this->assertIsString($filter->getIdentifier());
-	}
+    /**
+     * @dataProvider dataFilters
+     */
+    public function testGetIdentifier(string $filterClass): void {
+        /** @var IFilter $filter */
+        $filter = Server::get($filterClass);
+        $this->assertIsString($filter->getIdentifier());
+    }
 
-	/**
-	 * @dataProvider dataFilters
-	 */
-	public function testGetName(string $filterClass): void {
-		/** @var IFilter $filter */
-		$filter = Server::get($filterClass);
-		$this->assertIsString($filter->getName());
-	}
+    /**
+     * @dataProvider dataFilters
+     */
+    public function testGetName(string $filterClass): void {
+        /** @var IFilter $filter */
+        $filter = Server::get($filterClass);
+        $this->assertIsString($filter->getName());
+    }
 
-	/**
-	 * @dataProvider dataFilters
-	 */
-	public function testGetPriority(string $filterClass): void {
-		/** @var IFilter $filter */
-		$filter = Server::get($filterClass);
-		$priority = $filter->getPriority();
-		$this->assertIsInt($filter->getPriority());
-		$this->assertGreaterThanOrEqual(0, $priority);
-		$this->assertLessThanOrEqual(100, $priority);
-	}
+    /**
+     * @dataProvider dataFilters
+     */
+    public function testGetPriority(string $filterClass): void {
+        /** @var IFilter $filter */
+        $filter = Server::get($filterClass);
+        $priority = $filter->getPriority();
+        $this->assertIsInt($filter->getPriority());
+        $this->assertGreaterThanOrEqual(0, $priority);
+        $this->assertLessThanOrEqual(100, $priority);
+    }
 
-	/**
-	 * @dataProvider dataFilters
-	 */
-	public function testGetIcon(string $filterClass): void {
-		/** @var IFilter $filter */
-		$filter = Server::get($filterClass);
-		$this->assertIsString($filter->getIcon());
-		$this->assertStringStartsWith('http', $filter->getIcon());
-	}
+    /**
+     * @dataProvider dataFilters
+     */
+    public function testGetIcon(string $filterClass): void {
+        /** @var IFilter $filter */
+        $filter = Server::get($filterClass);
+        $this->assertIsString($filter->getIcon());
+        $this->assertStringStartsWith('http', $filter->getIcon());
+    }
 
-	/**
-	 * @dataProvider dataFilters
-	 */
-	public function testFilterTypes(string $filterClass): void {
-		/** @var IFilter $filter */
-		$filter = Server::get($filterClass);
-		$this->assertIsArray($filter->filterTypes([]));
-	}
+    /**
+     * @dataProvider dataFilters
+     */
+    public function testFilterTypes(string $filterClass): void {
+        /** @var IFilter $filter */
+        $filter = Server::get($filterClass);
+        $this->assertIsArray($filter->filterTypes([]));
+    }
 
-	/**
-	 * @dataProvider dataFilters
-	 */
-	public function testAllowedApps(string $filterClass): void {
-		/** @var IFilter $filter */
-		$filter = Server::get($filterClass);
-		$this->assertIsArray($filter->allowedApps());
-	}
+    /**
+     * @dataProvider dataFilters
+     */
+    public function testAllowedApps(string $filterClass): void {
+        /** @var IFilter $filter */
+        $filter = Server::get($filterClass);
+        $this->assertIsArray($filter->allowedApps());
+    }
 }

apps/dav/tests/unit/CalDAV/Activity/Filter/TodoTest.php

Indentation +42 added lines, -42 removed lines

@@ -15,53 +15,53 @@
 use Test\TestCase;
 
 class TodoTest extends TestCase {
-	protected IURLGenerator&MockObject $url;
-	protected IFilter $filter;
+    protected IURLGenerator&MockObject $url;
+    protected IFilter $filter;
 
-	protected function setUp(): void {
-		parent::setUp();
-		$this->url = $this->createMock(IURLGenerator::class);
-		$l = $this->createMock(IL10N::class);
-		$l->expects($this->any())
-			->method('t')
-			->willReturnCallback(function ($string, $args) {
-				return vsprintf($string, $args);
-			});
+    protected function setUp(): void {
+        parent::setUp();
+        $this->url = $this->createMock(IURLGenerator::class);
+        $l = $this->createMock(IL10N::class);
+        $l->expects($this->any())
+            ->method('t')
+            ->willReturnCallback(function ($string, $args) {
+                return vsprintf($string, $args);
+            });
 
-		$this->filter = new Todo(
-			$l, $this->url
-		);
-	}
+        $this->filter = new Todo(
+            $l, $this->url
+        );
+    }
 
-	public function testGetIcon(): void {
-		$this->url->expects($this->once())
-			->method('imagePath')
-			->with('core', 'actions/checkmark.svg')
-			->willReturn('path-to-icon');
+    public function testGetIcon(): void {
+        $this->url->expects($this->once())
+            ->method('imagePath')
+            ->with('core', 'actions/checkmark.svg')
+            ->willReturn('path-to-icon');
 
-		$this->url->expects($this->once())
-			->method('getAbsoluteURL')
-			->with('path-to-icon')
-			->willReturn('absolute-path-to-icon');
+        $this->url->expects($this->once())
+            ->method('getAbsoluteURL')
+            ->with('path-to-icon')
+            ->willReturn('absolute-path-to-icon');
 
-		$this->assertEquals('absolute-path-to-icon', $this->filter->getIcon());
-	}
+        $this->assertEquals('absolute-path-to-icon', $this->filter->getIcon());
+    }
 
-	public static function dataFilterTypes(): array {
-		return [
-			[[], []],
-			[['calendar_todo'], ['calendar_todo']],
-			[['calendar', 'calendar_event', 'calendar_todo'], ['calendar_todo']],
-			[['calendar', 'calendar_todo', 'files'], ['calendar_todo']],
-		];
-	}
+    public static function dataFilterTypes(): array {
+        return [
+            [[], []],
+            [['calendar_todo'], ['calendar_todo']],
+            [['calendar', 'calendar_event', 'calendar_todo'], ['calendar_todo']],
+            [['calendar', 'calendar_todo', 'files'], ['calendar_todo']],
+        ];
+    }
 
-	/**
-	 * @dataProvider dataFilterTypes
-	 * @param string[] $types
-	 * @param string[] $expected
-	 */
-	public function testFilterTypes(array $types, array $expected): void {
-		$this->assertEquals($expected, $this->filter->filterTypes($types));
-	}
+    /**
+     * @dataProvider dataFilterTypes
+     * @param string[] $types
+     * @param string[] $expected
+     */
+    public function testFilterTypes(array $types, array $expected): void {
+        $this->assertEquals($expected, $this->filter->filterTypes($types));
+    }
 }

apps/dav/tests/unit/CalDAV/Activity/Filter/CalendarTest.php

Indentation +42 added lines, -42 removed lines

@@ -15,53 +15,53 @@
 use Test\TestCase;
 
 class CalendarTest extends TestCase {
-	protected IURLGenerator&MockObject $url;
-	protected IFilter $filter;
+    protected IURLGenerator&MockObject $url;
+    protected IFilter $filter;
 
-	protected function setUp(): void {
-		parent::setUp();
-		$this->url = $this->createMock(IURLGenerator::class);
-		$l = $this->createMock(IL10N::class);
-		$l->expects($this->any())
-			->method('t')
-			->willReturnCallback(function ($string, $args) {
-				return vsprintf($string, $args);
-			});
+    protected function setUp(): void {
+        parent::setUp();
+        $this->url = $this->createMock(IURLGenerator::class);
+        $l = $this->createMock(IL10N::class);
+        $l->expects($this->any())
+            ->method('t')
+            ->willReturnCallback(function ($string, $args) {
+                return vsprintf($string, $args);
+            });
 
-		$this->filter = new Calendar(
-			$l, $this->url
-		);
-	}
+        $this->filter = new Calendar(
+            $l, $this->url
+        );
+    }
 
-	public function testGetIcon(): void {
-		$this->url->expects($this->once())
-			->method('imagePath')
-			->with('core', 'places/calendar.svg')
-			->willReturn('path-to-icon');
+    public function testGetIcon(): void {
+        $this->url->expects($this->once())
+            ->method('imagePath')
+            ->with('core', 'places/calendar.svg')
+            ->willReturn('path-to-icon');
 
-		$this->url->expects($this->once())
-			->method('getAbsoluteURL')
-			->with('path-to-icon')
-			->willReturn('absolute-path-to-icon');
+        $this->url->expects($this->once())
+            ->method('getAbsoluteURL')
+            ->with('path-to-icon')
+            ->willReturn('absolute-path-to-icon');
 
-		$this->assertEquals('absolute-path-to-icon', $this->filter->getIcon());
-	}
+        $this->assertEquals('absolute-path-to-icon', $this->filter->getIcon());
+    }
 
-	public static function dataFilterTypes(): array {
-		return [
-			[[], []],
-			[['calendar', 'calendar_event'], ['calendar', 'calendar_event']],
-			[['calendar', 'calendar_event', 'calendar_todo'], ['calendar', 'calendar_event']],
-			[['calendar', 'calendar_event', 'files'], ['calendar', 'calendar_event']],
-		];
-	}
+    public static function dataFilterTypes(): array {
+        return [
+            [[], []],
+            [['calendar', 'calendar_event'], ['calendar', 'calendar_event']],
+            [['calendar', 'calendar_event', 'calendar_todo'], ['calendar', 'calendar_event']],
+            [['calendar', 'calendar_event', 'files'], ['calendar', 'calendar_event']],
+        ];
+    }
 
-	/**
-	 * @dataProvider dataFilterTypes
-	 * @param string[] $types
-	 * @param string[] $expected
-	 */
-	public function testFilterTypes(array $types, array $expected): void {
-		$this->assertEquals($expected, $this->filter->filterTypes($types));
-	}
+    /**
+     * @dataProvider dataFilterTypes
+     * @param string[] $types
+     * @param string[] $expected
+     */
+    public function testFilterTypes(array $types, array $expected): void {
+        $this->assertEquals($expected, $this->filter->filterTypes($types));
+    }
 }

apps/dav/tests/unit/CalDAV/Activity/BackendTest.php

Indentation +331 added lines, -331 removed lines

@@ -21,335 +21,335 @@
 use Test\TestCase;
 
 class BackendTest extends TestCase {
-	protected IManager&MockObject $activityManager;
-	protected IGroupManager&MockObject $groupManager;
-	protected IUserSession&MockObject $userSession;
-	protected IAppManager&MockObject $appManager;
-	protected IUserManager&MockObject $userManager;
-
-	protected function setUp(): void {
-		parent::setUp();
-		$this->activityManager = $this->createMock(IManager::class);
-		$this->groupManager = $this->createMock(IGroupManager::class);
-		$this->userSession = $this->createMock(IUserSession::class);
-		$this->appManager = $this->createMock(IAppManager::class);
-		$this->userManager = $this->createMock(IUserManager::class);
-	}
-
-	/**
-	 * @return Backend|(Backend&MockObject)
-	 */
-	protected function getBackend(array $methods = []): Backend {
-		if (empty($methods)) {
-			return new Backend(
-				$this->activityManager,
-				$this->groupManager,
-				$this->userSession,
-				$this->appManager,
-				$this->userManager
-			);
-		} else {
-			return $this->getMockBuilder(Backend::class)
-				->setConstructorArgs([
-					$this->activityManager,
-					$this->groupManager,
-					$this->userSession,
-					$this->appManager,
-					$this->userManager
-				])
-				->onlyMethods($methods)
-				->getMock();
-		}
-	}
-
-	public static function dataCallTriggerCalendarActivity(): array {
-		return [
-			['onCalendarAdd', [['data']], Calendar::SUBJECT_ADD, [['data'], [], []]],
-			['onCalendarUpdate', [['data'], ['shares'], ['changed-properties']], Calendar::SUBJECT_UPDATE, [['data'], ['shares'], ['changed-properties']]],
-			['onCalendarDelete', [['data'], ['shares']], Calendar::SUBJECT_DELETE, [['data'], ['shares'], []]],
-			['onCalendarPublication', [['data'], true], Calendar::SUBJECT_PUBLISH, [['data'], [], []]],
-		];
-	}
-
-	/**
-	 * @dataProvider dataCallTriggerCalendarActivity
-	 */
-	public function testCallTriggerCalendarActivity(string $method, array $payload, string $expectedSubject, array $expectedPayload): void {
-		$backend = $this->getBackend(['triggerCalendarActivity']);
-		$backend->expects($this->once())
-			->method('triggerCalendarActivity')
-			->willReturnCallback(function () use ($expectedPayload, $expectedSubject): void {
-				$arguments = func_get_args();
-				$this->assertSame($expectedSubject, array_shift($arguments));
-				$this->assertEquals($expectedPayload, $arguments);
-			});
-
-		call_user_func_array([$backend, $method], $payload);
-	}
-
-	public static function dataTriggerCalendarActivity(): array {
-		return [
-			// Add calendar
-			[Calendar::SUBJECT_ADD, [], [], [], '', '', null, []],
-			[Calendar::SUBJECT_ADD, [
-				'principaluri' => 'principal/user/admin',
-				'id' => 42,
-				'uri' => 'this-uri',
-				'{DAV:}displayname' => 'Name of calendar',
-			], [], [], '', 'admin', null, ['admin']],
-			[Calendar::SUBJECT_ADD, [
-				'principaluri' => 'principal/user/admin',
-				'id' => 42,
-				'uri' => 'this-uri',
-				'{DAV:}displayname' => 'Name of calendar',
-			], [], [], 'test2', 'test2', null, ['admin']],
-
-			// Update calendar
-			[Calendar::SUBJECT_UPDATE, [], [], [], '', '', null, []],
-			// No visible change - owner only
-			[Calendar::SUBJECT_UPDATE, [
-				'principaluri' => 'principal/user/admin',
-				'id' => 42,
-				'uri' => 'this-uri',
-				'{DAV:}displayname' => 'Name of calendar',
-			], ['shares'], [], '', 'admin', null, ['admin']],
-			// Visible change
-			[Calendar::SUBJECT_UPDATE, [
-				'principaluri' => 'principal/user/admin',
-				'id' => 42,
-				'uri' => 'this-uri',
-				'{DAV:}displayname' => 'Name of calendar',
-			], ['shares'], ['{DAV:}displayname' => 'Name'], '', 'admin', ['user1'], ['user1', 'admin']],
-			[Calendar::SUBJECT_UPDATE, [
-				'principaluri' => 'principal/user/admin',
-				'id' => 42,
-				'uri' => 'this-uri',
-				'{DAV:}displayname' => 'Name of calendar',
-			], ['shares'], ['{DAV:}displayname' => 'Name'], 'test2', 'test2', ['user1'], ['user1', 'admin']],
-
-			// Delete calendar
-			[Calendar::SUBJECT_DELETE, [], [], [], '', '', null, []],
-			[Calendar::SUBJECT_DELETE, [
-				'principaluri' => 'principal/user/admin',
-				'id' => 42,
-				'uri' => 'this-uri',
-				'{DAV:}displayname' => 'Name of calendar',
-			], ['shares'], [], '', 'admin', [], ['admin']],
-			[Calendar::SUBJECT_DELETE, [
-				'principaluri' => 'principal/user/admin',
-				'id' => 42,
-				'uri' => 'this-uri',
-				'{DAV:}displayname' => 'Name of calendar',
-			], ['shares'], [], '', 'admin', ['user1'], ['user1', 'admin']],
-			[Calendar::SUBJECT_DELETE, [
-				'principaluri' => 'principal/user/admin',
-				'id' => 42,
-				'uri' => 'this-uri',
-				'{DAV:}displayname' => 'Name of calendar',
-			], ['shares'], [], 'test2', 'test2', ['user1'], ['user1', 'admin']],
-
-			// Publish calendar
-			[Calendar::SUBJECT_PUBLISH, [], [], [], '', '', null, []],
-			[Calendar::SUBJECT_PUBLISH, [
-				'principaluri' => 'principal/user/admin',
-				'id' => 42,
-				'uri' => 'this-uri',
-				'{DAV:}displayname' => 'Name of calendar',
-			], ['shares'], [], '', 'admin', [], ['admin']],
-
-			// Unpublish calendar
-			[Calendar::SUBJECT_UNPUBLISH, [], [], [], '', '', null, []],
-			[Calendar::SUBJECT_UNPUBLISH, [
-				'principaluri' => 'principal/user/admin',
-				'id' => 42,
-				'uri' => 'this-uri',
-				'{DAV:}displayname' => 'Name of calendar',
-			], ['shares'], [], '', 'admin', [], ['admin']],
-		];
-	}
-
-	/**
-	 * @dataProvider dataTriggerCalendarActivity
-	 */
-	public function testTriggerCalendarActivity(string $action, array $data, array $shares, array $changedProperties, string $currentUser, string $author, ?array $shareUsers, array $users): void {
-		$backend = $this->getBackend(['getUsersForShares']);
-
-		if ($shareUsers === null) {
-			$backend->expects($this->never())
-				->method('getUsersForShares');
-		} else {
-			$backend->expects($this->once())
-				->method('getUsersForShares')
-				->with($shares)
-				->willReturn($shareUsers);
-		}
-
-		if ($author !== '') {
-			if ($currentUser !== '') {
-				$this->userSession->expects($this->once())
-					->method('getUser')
-					->willReturn($this->getUserMock($currentUser));
-			} else {
-				$this->userSession->expects($this->once())
-					->method('getUser')
-					->willReturn(null);
-			}
-
-			$event = $this->createMock(IEvent::class);
-			$this->activityManager->expects($this->once())
-				->method('generateEvent')
-				->willReturn($event);
-
-			$event->expects($this->once())
-				->method('setApp')
-				->with('dav')
-				->willReturnSelf();
-			$event->expects($this->once())
-				->method('setObject')
-				->with('calendar', $data['id'])
-				->willReturnSelf();
-			$event->expects($this->once())
-				->method('setType')
-				->with('calendar')
-				->willReturnSelf();
-			$event->expects($this->once())
-				->method('setAuthor')
-				->with($author)
-				->willReturnSelf();
-
-			$this->userManager->expects($action === Calendar::SUBJECT_DELETE ? $this->exactly(sizeof($users)) : $this->never())
-				->method('userExists')
-				->willReturn(true);
-
-			$event->expects($this->exactly(sizeof($users)))
-				->method('setAffectedUser')
-				->willReturnSelf();
-			$event->expects($this->exactly(sizeof($users)))
-				->method('setSubject')
-				->willReturnSelf();
-			$this->activityManager->expects($this->exactly(sizeof($users)))
-				->method('publish')
-				->with($event);
-		} else {
-			$this->activityManager->expects($this->never())
-				->method('generateEvent');
-		}
-
-		$this->invokePrivate($backend, 'triggerCalendarActivity', [$action, $data, $shares, $changedProperties]);
-	}
-
-	public function testUserDeletionDoesNotCreateActivity(): void {
-		$backend = $this->getBackend();
-
-		$this->userManager->expects($this->once())
-			->method('userExists')
-			->willReturn(false);
-
-		$this->activityManager->expects($this->never())
-			->method('publish');
-
-		$this->invokePrivate($backend, 'triggerCalendarActivity', [Calendar::SUBJECT_DELETE, [
-			'principaluri' => 'principal/user/admin',
-			'id' => 42,
-			'uri' => 'this-uri',
-			'{DAV:}displayname' => 'Name of calendar',
-		], [], []]);
-	}
-
-	public static function dataGetUsersForShares(): array {
-		return [
-			[
-				[],
-				[],
-				[],
-			],
-			[
-				[
-					['{http://owncloud.org/ns}principal' => 'principal/users/user1'],
-					['{http://owncloud.org/ns}principal' => 'principal/users/user2'],
-					['{http://owncloud.org/ns}principal' => 'principal/users/user2'],
-					['{http://owncloud.org/ns}principal' => 'principal/users/user2'],
-					['{http://owncloud.org/ns}principal' => 'principal/users/user3'],
-				],
-				[],
-				['user1', 'user2', 'user3'],
-			],
-			[
-				[
-					['{http://owncloud.org/ns}principal' => 'principal/users/user1'],
-					['{http://owncloud.org/ns}principal' => 'principal/users/user2'],
-					['{http://owncloud.org/ns}principal' => 'principal/users/user2'],
-					['{http://owncloud.org/ns}principal' => 'principal/groups/group2'],
-					['{http://owncloud.org/ns}principal' => 'principal/groups/group3'],
-				],
-				['group2' => null, 'group3' => null],
-				['user1', 'user2'],
-			],
-			[
-				[
-					['{http://owncloud.org/ns}principal' => 'principal/users/user1'],
-					['{http://owncloud.org/ns}principal' => 'principal/users/user2'],
-					['{http://owncloud.org/ns}principal' => 'principal/users/user2'],
-					['{http://owncloud.org/ns}principal' => 'principal/groups/group2'],
-					['{http://owncloud.org/ns}principal' => 'principal/groups/group3'],
-				],
-				['group2' => ['user1', 'user2', 'user3'], 'group3' => ['user2', 'user3', 'user4']],
-				['user1', 'user2', 'user3', 'user4'],
-			],
-		];
-	}
-
-	/**
-	 * @dataProvider dataGetUsersForShares
-	 */
-	public function testGetUsersForShares(array $shares, array $groups, array $expected): void {
-		$backend = $this->getBackend();
-
-		$getGroups = [];
-		foreach ($groups as $gid => $members) {
-			if ($members === null) {
-				$getGroups[] = [$gid, null];
-				continue;
-			}
-
-			$group = $this->createMock(IGroup::class);
-			$group->expects($this->once())
-				->method('getUsers')
-				->willReturn($this->getUsers($members));
-
-			$getGroups[] = [$gid, $group];
-		}
-
-		$this->groupManager->expects($this->exactly(sizeof($getGroups)))
-			->method('get')
-			->willReturnMap($getGroups);
-
-		$users = $this->invokePrivate($backend, 'getUsersForShares', [$shares]);
-		sort($users);
-		$this->assertEquals($expected, $users);
-	}
-
-	/**
-	 * @param string[] $users
-	 * @return IUser[]&MockObject[]
-	 */
-	protected function getUsers(array $users) {
-		$list = [];
-		foreach ($users as $user) {
-			$list[] = $this->getUserMock($user);
-		}
-		return $list;
-	}
-
-	/**
-	 * @param string $uid
-	 * @return IUser&MockObject
-	 */
-	protected function getUserMock($uid) {
-		$user = $this->createMock(IUser::class);
-		$user->expects($this->once())
-			->method('getUID')
-			->willReturn($uid);
-		return $user;
-	}
+    protected IManager&MockObject $activityManager;
+    protected IGroupManager&MockObject $groupManager;
+    protected IUserSession&MockObject $userSession;
+    protected IAppManager&MockObject $appManager;
+    protected IUserManager&MockObject $userManager;
+
+    protected function setUp(): void {
+        parent::setUp();
+        $this->activityManager = $this->createMock(IManager::class);
+        $this->groupManager = $this->createMock(IGroupManager::class);
+        $this->userSession = $this->createMock(IUserSession::class);
+        $this->appManager = $this->createMock(IAppManager::class);
+        $this->userManager = $this->createMock(IUserManager::class);
+    }
+
+    /**
+     * @return Backend|(Backend&MockObject)
+     */
+    protected function getBackend(array $methods = []): Backend {
+        if (empty($methods)) {
+            return new Backend(
+                $this->activityManager,
+                $this->groupManager,
+                $this->userSession,
+                $this->appManager,
+                $this->userManager
+            );
+        } else {
+            return $this->getMockBuilder(Backend::class)
+                ->setConstructorArgs([
+                    $this->activityManager,
+                    $this->groupManager,
+                    $this->userSession,
+                    $this->appManager,
+                    $this->userManager
+                ])
+                ->onlyMethods($methods)
+                ->getMock();
+        }
+    }
+
+    public static function dataCallTriggerCalendarActivity(): array {
+        return [
+            ['onCalendarAdd', [['data']], Calendar::SUBJECT_ADD, [['data'], [], []]],
+            ['onCalendarUpdate', [['data'], ['shares'], ['changed-properties']], Calendar::SUBJECT_UPDATE, [['data'], ['shares'], ['changed-properties']]],
+            ['onCalendarDelete', [['data'], ['shares']], Calendar::SUBJECT_DELETE, [['data'], ['shares'], []]],
+            ['onCalendarPublication', [['data'], true], Calendar::SUBJECT_PUBLISH, [['data'], [], []]],
+        ];
+    }
+
+    /**
+     * @dataProvider dataCallTriggerCalendarActivity
+     */
+    public function testCallTriggerCalendarActivity(string $method, array $payload, string $expectedSubject, array $expectedPayload): void {
+        $backend = $this->getBackend(['triggerCalendarActivity']);
+        $backend->expects($this->once())
+            ->method('triggerCalendarActivity')
+            ->willReturnCallback(function () use ($expectedPayload, $expectedSubject): void {
+                $arguments = func_get_args();
+                $this->assertSame($expectedSubject, array_shift($arguments));
+                $this->assertEquals($expectedPayload, $arguments);
+            });
+
+        call_user_func_array([$backend, $method], $payload);
+    }
+
+    public static function dataTriggerCalendarActivity(): array {
+        return [
+            // Add calendar
+            [Calendar::SUBJECT_ADD, [], [], [], '', '', null, []],
+            [Calendar::SUBJECT_ADD, [
+                'principaluri' => 'principal/user/admin',
+                'id' => 42,
+                'uri' => 'this-uri',
+                '{DAV:}displayname' => 'Name of calendar',
+            ], [], [], '', 'admin', null, ['admin']],
+            [Calendar::SUBJECT_ADD, [
+                'principaluri' => 'principal/user/admin',
+                'id' => 42,
+                'uri' => 'this-uri',
+                '{DAV:}displayname' => 'Name of calendar',
+            ], [], [], 'test2', 'test2', null, ['admin']],
+
+            // Update calendar
+            [Calendar::SUBJECT_UPDATE, [], [], [], '', '', null, []],
+            // No visible change - owner only
+            [Calendar::SUBJECT_UPDATE, [
+                'principaluri' => 'principal/user/admin',
+                'id' => 42,
+                'uri' => 'this-uri',
+                '{DAV:}displayname' => 'Name of calendar',
+            ], ['shares'], [], '', 'admin', null, ['admin']],
+            // Visible change
+            [Calendar::SUBJECT_UPDATE, [
+                'principaluri' => 'principal/user/admin',
+                'id' => 42,
+                'uri' => 'this-uri',
+                '{DAV:}displayname' => 'Name of calendar',
+            ], ['shares'], ['{DAV:}displayname' => 'Name'], '', 'admin', ['user1'], ['user1', 'admin']],
+            [Calendar::SUBJECT_UPDATE, [
+                'principaluri' => 'principal/user/admin',
+                'id' => 42,
+                'uri' => 'this-uri',
+                '{DAV:}displayname' => 'Name of calendar',
+            ], ['shares'], ['{DAV:}displayname' => 'Name'], 'test2', 'test2', ['user1'], ['user1', 'admin']],
+
+            // Delete calendar
+            [Calendar::SUBJECT_DELETE, [], [], [], '', '', null, []],
+            [Calendar::SUBJECT_DELETE, [
+                'principaluri' => 'principal/user/admin',
+                'id' => 42,
+                'uri' => 'this-uri',
+                '{DAV:}displayname' => 'Name of calendar',
+            ], ['shares'], [], '', 'admin', [], ['admin']],
+            [Calendar::SUBJECT_DELETE, [
+                'principaluri' => 'principal/user/admin',
+                'id' => 42,
+                'uri' => 'this-uri',
+                '{DAV:}displayname' => 'Name of calendar',
+            ], ['shares'], [], '', 'admin', ['user1'], ['user1', 'admin']],
+            [Calendar::SUBJECT_DELETE, [
+                'principaluri' => 'principal/user/admin',
+                'id' => 42,
+                'uri' => 'this-uri',
+                '{DAV:}displayname' => 'Name of calendar',
+            ], ['shares'], [], 'test2', 'test2', ['user1'], ['user1', 'admin']],
+
+            // Publish calendar
+            [Calendar::SUBJECT_PUBLISH, [], [], [], '', '', null, []],
+            [Calendar::SUBJECT_PUBLISH, [
+                'principaluri' => 'principal/user/admin',
+                'id' => 42,
+                'uri' => 'this-uri',
+                '{DAV:}displayname' => 'Name of calendar',
+            ], ['shares'], [], '', 'admin', [], ['admin']],
+
+            // Unpublish calendar
+            [Calendar::SUBJECT_UNPUBLISH, [], [], [], '', '', null, []],
+            [Calendar::SUBJECT_UNPUBLISH, [
+                'principaluri' => 'principal/user/admin',
+                'id' => 42,
+                'uri' => 'this-uri',
+                '{DAV:}displayname' => 'Name of calendar',
+            ], ['shares'], [], '', 'admin', [], ['admin']],
+        ];
+    }
+
+    /**
+     * @dataProvider dataTriggerCalendarActivity
+     */
+    public function testTriggerCalendarActivity(string $action, array $data, array $shares, array $changedProperties, string $currentUser, string $author, ?array $shareUsers, array $users): void {
+        $backend = $this->getBackend(['getUsersForShares']);
+
+        if ($shareUsers === null) {
+            $backend->expects($this->never())
+                ->method('getUsersForShares');
+        } else {
+            $backend->expects($this->once())
+                ->method('getUsersForShares')
+                ->with($shares)
+                ->willReturn($shareUsers);
+        }
+
+        if ($author !== '') {
+            if ($currentUser !== '') {
+                $this->userSession->expects($this->once())
+                    ->method('getUser')
+                    ->willReturn($this->getUserMock($currentUser));
+            } else {
+                $this->userSession->expects($this->once())
+                    ->method('getUser')
+                    ->willReturn(null);
+            }
+
+            $event = $this->createMock(IEvent::class);
+            $this->activityManager->expects($this->once())
+                ->method('generateEvent')
+                ->willReturn($event);
+
+            $event->expects($this->once())
+                ->method('setApp')
+                ->with('dav')
+                ->willReturnSelf();
+            $event->expects($this->once())
+                ->method('setObject')
+                ->with('calendar', $data['id'])
+                ->willReturnSelf();
+            $event->expects($this->once())
+                ->method('setType')
+                ->with('calendar')
+                ->willReturnSelf();
+            $event->expects($this->once())
+                ->method('setAuthor')
+                ->with($author)
+                ->willReturnSelf();
+
+            $this->userManager->expects($action === Calendar::SUBJECT_DELETE ? $this->exactly(sizeof($users)) : $this->never())
+                ->method('userExists')
+                ->willReturn(true);
+
+            $event->expects($this->exactly(sizeof($users)))
+                ->method('setAffectedUser')
+                ->willReturnSelf();
+            $event->expects($this->exactly(sizeof($users)))
+                ->method('setSubject')
+                ->willReturnSelf();
+            $this->activityManager->expects($this->exactly(sizeof($users)))
+                ->method('publish')
+                ->with($event);
+        } else {
+            $this->activityManager->expects($this->never())
+                ->method('generateEvent');
+        }
+
+        $this->invokePrivate($backend, 'triggerCalendarActivity', [$action, $data, $shares, $changedProperties]);
+    }
+
+    public function testUserDeletionDoesNotCreateActivity(): void {
+        $backend = $this->getBackend();
+
+        $this->userManager->expects($this->once())
+            ->method('userExists')
+            ->willReturn(false);
+
+        $this->activityManager->expects($this->never())
+            ->method('publish');
+
+        $this->invokePrivate($backend, 'triggerCalendarActivity', [Calendar::SUBJECT_DELETE, [
+            'principaluri' => 'principal/user/admin',
+            'id' => 42,
+            'uri' => 'this-uri',
+            '{DAV:}displayname' => 'Name of calendar',
+        ], [], []]);
+    }
+
+    public static function dataGetUsersForShares(): array {
+        return [
+            [
+                [],
+                [],
+                [],
+            ],
+            [
+                [
+                    ['{http://owncloud.org/ns}principal' => 'principal/users/user1'],
+                    ['{http://owncloud.org/ns}principal' => 'principal/users/user2'],
+                    ['{http://owncloud.org/ns}principal' => 'principal/users/user2'],
+                    ['{http://owncloud.org/ns}principal' => 'principal/users/user2'],
+                    ['{http://owncloud.org/ns}principal' => 'principal/users/user3'],
+                ],
+                [],
+                ['user1', 'user2', 'user3'],
+            ],
+            [
+                [
+                    ['{http://owncloud.org/ns}principal' => 'principal/users/user1'],
+                    ['{http://owncloud.org/ns}principal' => 'principal/users/user2'],
+                    ['{http://owncloud.org/ns}principal' => 'principal/users/user2'],
+                    ['{http://owncloud.org/ns}principal' => 'principal/groups/group2'],
+                    ['{http://owncloud.org/ns}principal' => 'principal/groups/group3'],
+                ],
+                ['group2' => null, 'group3' => null],
+                ['user1', 'user2'],
+            ],
+            [
+                [
+                    ['{http://owncloud.org/ns}principal' => 'principal/users/user1'],
+                    ['{http://owncloud.org/ns}principal' => 'principal/users/user2'],
+                    ['{http://owncloud.org/ns}principal' => 'principal/users/user2'],
+                    ['{http://owncloud.org/ns}principal' => 'principal/groups/group2'],
+                    ['{http://owncloud.org/ns}principal' => 'principal/groups/group3'],
+                ],
+                ['group2' => ['user1', 'user2', 'user3'], 'group3' => ['user2', 'user3', 'user4']],
+                ['user1', 'user2', 'user3', 'user4'],
+            ],
+        ];
+    }
+
+    /**
+     * @dataProvider dataGetUsersForShares
+     */
+    public function testGetUsersForShares(array $shares, array $groups, array $expected): void {
+        $backend = $this->getBackend();
+
+        $getGroups = [];
+        foreach ($groups as $gid => $members) {
+            if ($members === null) {
+                $getGroups[] = [$gid, null];
+                continue;
+            }
+
+            $group = $this->createMock(IGroup::class);
+            $group->expects($this->once())
+                ->method('getUsers')
+                ->willReturn($this->getUsers($members));
+
+            $getGroups[] = [$gid, $group];
+        }
+
+        $this->groupManager->expects($this->exactly(sizeof($getGroups)))
+            ->method('get')
+            ->willReturnMap($getGroups);
+
+        $users = $this->invokePrivate($backend, 'getUsersForShares', [$shares]);
+        sort($users);
+        $this->assertEquals($expected, $users);
+    }
+
+    /**
+     * @param string[] $users
+     * @return IUser[]&MockObject[]
+     */
+    protected function getUsers(array $users) {
+        $list = [];
+        foreach ($users as $user) {
+            $list[] = $this->getUserMock($user);
+        }
+        return $list;
+    }
+
+    /**
+     * @param string $uid
+     * @return IUser&MockObject
+     */
+    protected function getUserMock($uid) {
+        $user = $this->createMock(IUser::class);
+        $user->expects($this->once())
+            ->method('getUID')
+            ->willReturn($uid);
+        return $user;
+    }
 }

apps/dav/tests/unit/CalDAV/Export/ExportServiceTest.php

Indentation +53 added lines, -53 removed lines

@@ -16,66 +16,66 @@
 use Sabre\VObject\Component\VCalendar;
 
 class ExportServiceTest extends \Test\TestCase {
-	private ServerVersion&MockObject $serverVersion;
-	private ExportService $service;
-	private ICalendarExport&MockObject $calendar;
-	private array $mockExportCollection;
+    private ServerVersion&MockObject $serverVersion;
+    private ExportService $service;
+    private ICalendarExport&MockObject $calendar;
+    private array $mockExportCollection;
 
-	protected function setUp(): void {
-		parent::setUp();
+    protected function setUp(): void {
+        parent::setUp();
 
-		$this->serverVersion = $this->createMock(ServerVersion::class);
-		$this->serverVersion->method('getVersionString')
-			->willReturn('32.0.0.0');
-		$this->service = new ExportService($this->serverVersion);
-		$this->calendar = $this->createMock(ICalendarExport::class);
+        $this->serverVersion = $this->createMock(ServerVersion::class);
+        $this->serverVersion->method('getVersionString')
+            ->willReturn('32.0.0.0');
+        $this->service = new ExportService($this->serverVersion);
+        $this->calendar = $this->createMock(ICalendarExport::class);
 
-	}
+    }
 
-	protected function mockGenerator(): Generator {
-		foreach ($this->mockExportCollection as $entry) {
-			yield $entry;
-		}
-	}
+    protected function mockGenerator(): Generator {
+        foreach ($this->mockExportCollection as $entry) {
+            yield $entry;
+        }
+    }
 
-	public function testExport(): void {
-		// Arrange
-		// construct calendar with a 1 hour event and same start/end time zones
-		$vCalendar = new VCalendar();
-		/** @var \Sabre\VObject\Component\VEvent $vEvent */
-		$vEvent = $vCalendar->add('VEVENT', []);
-		$vEvent->UID->setValue('96a0e6b1-d886-4a55-a60d-152b31401dcc');
-		$vEvent->add('DTSTART', '20240701T080000', ['TZID' => 'America/Toronto']);
-		$vEvent->add('DTEND', '20240701T090000', ['TZID' => 'America/Toronto']);
-		$vEvent->add('SUMMARY', 'Test Recurrence Event');
-		$vEvent->add('ORGANIZER', 'mailto:organizer@testing.com', ['CN' => 'Organizer']);
-		$vEvent->add('ATTENDEE', 'mailto:attendee1@testing.com', [
-			'CN' => 'Attendee One',
-			'CUTYPE' => 'INDIVIDUAL',
-			'PARTSTAT' => 'NEEDS-ACTION',
-			'ROLE' => 'REQ-PARTICIPANT',
-			'RSVP' => 'TRUE'
-		]);
-		// construct calendar return
-		$options = new CalendarExportOptions();
-		$this->mockExportCollection[] = $vCalendar;
-		$this->calendar->expects($this->once())
-			->method('export')
-			->with($options)
-			->willReturn($this->mockGenerator());
+    public function testExport(): void {
+        // Arrange
+        // construct calendar with a 1 hour event and same start/end time zones
+        $vCalendar = new VCalendar();
+        /** @var \Sabre\VObject\Component\VEvent $vEvent */
+        $vEvent = $vCalendar->add('VEVENT', []);
+        $vEvent->UID->setValue('96a0e6b1-d886-4a55-a60d-152b31401dcc');
+        $vEvent->add('DTSTART', '20240701T080000', ['TZID' => 'America/Toronto']);
+        $vEvent->add('DTEND', '20240701T090000', ['TZID' => 'America/Toronto']);
+        $vEvent->add('SUMMARY', 'Test Recurrence Event');
+        $vEvent->add('ORGANIZER', 'mailto:organizer@testing.com', ['CN' => 'Organizer']);
+        $vEvent->add('ATTENDEE', 'mailto:attendee1@testing.com', [
+            'CN' => 'Attendee One',
+            'CUTYPE' => 'INDIVIDUAL',
+            'PARTSTAT' => 'NEEDS-ACTION',
+            'ROLE' => 'REQ-PARTICIPANT',
+            'RSVP' => 'TRUE'
+        ]);
+        // construct calendar return
+        $options = new CalendarExportOptions();
+        $this->mockExportCollection[] = $vCalendar;
+        $this->calendar->expects($this->once())
+            ->method('export')
+            ->with($options)
+            ->willReturn($this->mockGenerator());
 
-		// Act
-		$document = '';
-		foreach ($this->service->export($this->calendar, $options) as $chunk) {
-			$document .= $chunk;
-		}
+        // Act
+        $document = '';
+        foreach ($this->service->export($this->calendar, $options) as $chunk) {
+            $document .= $chunk;
+        }
 
-		// Assert
-		$this->assertStringContainsString('BEGIN:VCALENDAR', $document, 'Exported document calendar start missing');
-		$this->assertStringContainsString('BEGIN:VEVENT', $document, 'Exported document event start missing');
-		$this->assertStringContainsString('END:VEVENT', $document, 'Exported document event end missing');
-		$this->assertStringContainsString('END:VCALENDAR', $document, 'Exported document calendar end missing');
+        // Assert
+        $this->assertStringContainsString('BEGIN:VCALENDAR', $document, 'Exported document calendar start missing');
+        $this->assertStringContainsString('BEGIN:VEVENT', $document, 'Exported document event start missing');
+        $this->assertStringContainsString('END:VEVENT', $document, 'Exported document event end missing');
+        $this->assertStringContainsString('END:VCALENDAR', $document, 'Exported document calendar end missing');
 
-	}
+    }
 
 }

apps/dav/tests/unit/CalDAV/AppCalendar/AppCalendarTest.php

Indentation +100 added lines, -100 removed lines

@@ -17,104 +17,104 @@
 use function rewind;
 
 class AppCalendarTest extends TestCase {
-	private string $principal = 'principals/users/foo';
-
-	private AppCalendar $appCalendar;
-	private AppCalendar $writeableAppCalendar;
-
-	private ICalendar&MockObject $calendar;
-	private ICalendar&MockObject $writeableCalendar;
-
-	protected function setUp(): void {
-		parent::setUp();
-
-		$this->calendar = $this->getMockBuilder(ICalendar::class)->getMock();
-		$this->calendar->method('getPermissions')
-			->willReturn(Constants::PERMISSION_READ);
-
-		$this->writeableCalendar = $this->getMockBuilder(ICreateFromString::class)->getMock();
-		$this->writeableCalendar->method('getPermissions')
-			->willReturn(Constants::PERMISSION_READ | Constants::PERMISSION_CREATE);
-
-		$this->appCalendar = new AppCalendar('dav-wrapper', $this->calendar, $this->principal);
-		$this->writeableAppCalendar = new AppCalendar('dav-wrapper', $this->writeableCalendar, $this->principal);
-	}
-
-	public function testGetPrincipal():void {
-		// Check that the correct name is returned
-		$this->assertEquals($this->principal, $this->appCalendar->getOwner());
-		$this->assertEquals($this->principal, $this->writeableAppCalendar->getOwner());
-	}
-
-	public function testDelete(): void {
-		$this->expectException(\Sabre\DAV\Exception\Forbidden::class);
-		$this->expectExceptionMessage('Deleting an entry is not implemented');
-
-		$this->appCalendar->delete();
-	}
-
-	public function testCreateFile(): void {
-		$calls = [
-			['some-name', 'data'],
-			['other-name', ''],
-			['name', 'some data'],
-		];
-		$this->writeableCalendar->expects($this->exactly(3))
-			->method('createFromString')
-			->willReturnCallback(function () use (&$calls) {
-				$expected = array_shift($calls);
-				$this->assertEquals($expected, func_get_args());
-			});
-
-		// pass data
-		$this->assertNull($this->writeableAppCalendar->createFile('some-name', 'data'));
-		// null is empty string
-		$this->assertNull($this->writeableAppCalendar->createFile('other-name', null));
-		// resource to data
-		$fp = fopen('php://memory', 'r+');
-		fwrite($fp, 'some data');
-		rewind($fp);
-		$this->assertNull($this->writeableAppCalendar->createFile('name', $fp));
-		fclose($fp);
-	}
-
-	public function testCreateFile_readOnly(): void {
-		// If writing is not supported
-		$this->expectException(\Sabre\DAV\Exception\Forbidden::class);
-		$this->expectExceptionMessage('Creating a new entry is not allowed');
-
-		$this->appCalendar->createFile('some-name', 'data');
-	}
-
-	public function testSetACL(): void {
-		$this->expectException(\Sabre\DAV\Exception\Forbidden::class);
-		$this->expectExceptionMessage('Setting ACL is not supported on this node');
-
-		$this->appCalendar->setACL([]);
-	}
-
-	public function testGetACL():void {
-		$expectedRO = [
-			[
-				'privilege' => '{DAV:}read',
-				'principal' => $this->principal,
-				'protected' => true,
-			],
-			[
-				'privilege' => '{DAV:}write-properties',
-				'principal' => $this->principal,
-				'protected' => true,
-			]
-		];
-		$expectedRW = $expectedRO;
-		$expectedRW[] = [
-			'privilege' => '{DAV:}write',
-			'principal' => $this->principal,
-			'protected' => true,
-		];
-
-		// Check that the correct ACL is returned (default be only readable)
-		$this->assertEquals($expectedRO, $this->appCalendar->getACL());
-		$this->assertEquals($expectedRW, $this->writeableAppCalendar->getACL());
-	}
+    private string $principal = 'principals/users/foo';
+
+    private AppCalendar $appCalendar;
+    private AppCalendar $writeableAppCalendar;
+
+    private ICalendar&MockObject $calendar;
+    private ICalendar&MockObject $writeableCalendar;
+
+    protected function setUp(): void {
+        parent::setUp();
+
+        $this->calendar = $this->getMockBuilder(ICalendar::class)->getMock();
+        $this->calendar->method('getPermissions')
+            ->willReturn(Constants::PERMISSION_READ);
+
+        $this->writeableCalendar = $this->getMockBuilder(ICreateFromString::class)->getMock();
+        $this->writeableCalendar->method('getPermissions')
+            ->willReturn(Constants::PERMISSION_READ | Constants::PERMISSION_CREATE);
+
+        $this->appCalendar = new AppCalendar('dav-wrapper', $this->calendar, $this->principal);
+        $this->writeableAppCalendar = new AppCalendar('dav-wrapper', $this->writeableCalendar, $this->principal);
+    }
+
+    public function testGetPrincipal():void {
+        // Check that the correct name is returned
+        $this->assertEquals($this->principal, $this->appCalendar->getOwner());
+        $this->assertEquals($this->principal, $this->writeableAppCalendar->getOwner());
+    }
+
+    public function testDelete(): void {
+        $this->expectException(\Sabre\DAV\Exception\Forbidden::class);
+        $this->expectExceptionMessage('Deleting an entry is not implemented');
+
+        $this->appCalendar->delete();
+    }
+
+    public function testCreateFile(): void {
+        $calls = [
+            ['some-name', 'data'],
+            ['other-name', ''],
+            ['name', 'some data'],
+        ];
+        $this->writeableCalendar->expects($this->exactly(3))
+            ->method('createFromString')
+            ->willReturnCallback(function () use (&$calls) {
+                $expected = array_shift($calls);
+                $this->assertEquals($expected, func_get_args());
+            });
+
+        // pass data
+        $this->assertNull($this->writeableAppCalendar->createFile('some-name', 'data'));
+        // null is empty string
+        $this->assertNull($this->writeableAppCalendar->createFile('other-name', null));
+        // resource to data
+        $fp = fopen('php://memory', 'r+');
+        fwrite($fp, 'some data');
+        rewind($fp);
+        $this->assertNull($this->writeableAppCalendar->createFile('name', $fp));
+        fclose($fp);
+    }
+
+    public function testCreateFile_readOnly(): void {
+        // If writing is not supported
+        $this->expectException(\Sabre\DAV\Exception\Forbidden::class);
+        $this->expectExceptionMessage('Creating a new entry is not allowed');
+
+        $this->appCalendar->createFile('some-name', 'data');
+    }
+
+    public function testSetACL(): void {
+        $this->expectException(\Sabre\DAV\Exception\Forbidden::class);
+        $this->expectExceptionMessage('Setting ACL is not supported on this node');
+
+        $this->appCalendar->setACL([]);
+    }
+
+    public function testGetACL():void {
+        $expectedRO = [
+            [
+                'privilege' => '{DAV:}read',
+                'principal' => $this->principal,
+                'protected' => true,
+            ],
+            [
+                'privilege' => '{DAV:}write-properties',
+                'principal' => $this->principal,
+                'protected' => true,
+            ]
+        ];
+        $expectedRW = $expectedRO;
+        $expectedRW[] = [
+            'privilege' => '{DAV:}write',
+            'principal' => $this->principal,
+            'protected' => true,
+        ];
+
+        // Check that the correct ACL is returned (default be only readable)
+        $this->assertEquals($expectedRO, $this->appCalendar->getACL());
+        $this->assertEquals($expectedRW, $this->writeableAppCalendar->getACL());
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -61,7 +61,7 @@
 		];
 		$this->writeableCalendar->expects($this->exactly(3))
 			->method('createFromString')
-			->willReturnCallback(function () use (&$calls) {
+			->willReturnCallback(function() use (&$calls) {
 				$expected = array_shift($calls);
 				$this->assertEquals($expected, func_get_args());
 			});

apps/dav/tests/unit/CalDAV/AppCalendar/CalendarObjectTest.php

Indentation +150 added lines, -150 removed lines

@@ -17,154 +17,154 @@
 use Test\TestCase;
 
 class CalendarObjectTest extends TestCase {
-	private CalendarObject $calendarObject;
-	private AppCalendar&MockObject $calendar;
-	private ICalendar&MockObject $backend;
-	private VCalendar&MockObject $vobject;
-
-	protected function setUp(): void {
-		parent::setUp();
-
-		$this->calendar = $this->createMock(AppCalendar::class);
-		$this->calendar->method('getOwner')->willReturn('owner');
-		$this->calendar->method('getGroup')->willReturn('group');
-
-		$this->backend = $this->createMock(ICalendar::class);
-		$this->vobject = $this->createMock(VCalendar::class);
-		$this->calendarObject = new CalendarObject($this->calendar, $this->backend, $this->vobject);
-	}
-
-	public function testGetOwner(): void {
-		$this->assertEquals($this->calendarObject->getOwner(), 'owner');
-	}
-
-	public function testGetGroup(): void {
-		$this->assertEquals($this->calendarObject->getGroup(), 'group');
-	}
-
-	public function testGetACL(): void {
-		$this->calendar->expects($this->exactly(2))
-			->method('getPermissions')
-			->willReturnOnConsecutiveCalls(Constants::PERMISSION_READ, Constants::PERMISSION_ALL);
-
-		// read only
-		$this->assertEquals($this->calendarObject->getACL(), [
-			[
-				'privilege' => '{DAV:}read',
-				'principal' => 'owner',
-				'protected' => true,
-			]
-		]);
-
-		// write permissions
-		$this->assertEquals($this->calendarObject->getACL(), [
-			[
-				'privilege' => '{DAV:}read',
-				'principal' => 'owner',
-				'protected' => true,
-			],
-			[
-				'privilege' => '{DAV:}write-content',
-				'principal' => 'owner',
-				'protected' => true,
-			]
-		]);
-	}
-
-	public function testSetACL(): void {
-		$this->expectException(\Sabre\DAV\Exception\Forbidden::class);
-		$this->calendarObject->setACL([]);
-	}
-
-	public function testPut_readOnlyBackend(): void {
-		$this->expectException(\Sabre\DAV\Exception\Forbidden::class);
-		$this->calendarObject->put('foo');
-	}
-
-	public function testPut_noPermissions(): void {
-		$this->expectException(\Sabre\DAV\Exception\Forbidden::class);
-
-		$backend = $this->createMock(ICreateFromString::class);
-		$calendarObject = new CalendarObject($this->calendar, $backend, $this->vobject);
-
-		$this->calendar->expects($this->once())
-			->method('getPermissions')
-			->willReturn(Constants::PERMISSION_READ);
-
-		$calendarObject->put('foo');
-	}
-
-	public function testPut(): void {
-		$backend = $this->createMock(ICreateFromString::class);
-		$calendarObject = new CalendarObject($this->calendar, $backend, $this->vobject);
-
-		$this->vobject->expects($this->once())
-			->method('getBaseComponent')
-			->willReturn((object)['UID' => 'someid']);
-		$this->calendar->expects($this->once())
-			->method('getPermissions')
-			->willReturn(Constants::PERMISSION_ALL);
-
-		$backend->expects($this->once())
-			->method('createFromString')
-			->with('someid.ics', 'foo');
-		$calendarObject->put('foo');
-	}
-
-	public function testGet(): void {
-		$this->vobject->expects($this->once())
-			->method('serialize')
-			->willReturn('foo');
-		$this->assertEquals($this->calendarObject->get(), 'foo');
-	}
-
-	public function testDelete_notWriteable(): void {
-		$this->expectException(\Sabre\DAV\Exception\Forbidden::class);
-		$this->calendarObject->delete();
-	}
-
-	public function testDelete_noPermission(): void {
-		$backend = $this->createMock(ICreateFromString::class);
-		$calendarObject = new CalendarObject($this->calendar, $backend, $this->vobject);
-
-		$this->expectException(\Sabre\DAV\Exception\Forbidden::class);
-		$calendarObject->delete();
-	}
-
-	public function testDelete(): void {
-		$backend = $this->createMock(ICreateFromString::class);
-		$calendarObject = new CalendarObject($this->calendar, $backend, $this->vobject);
-
-		$components = [(new VCalendar(['VEVENT' => ['UID' => 'someid']]))->getBaseComponent()];
-
-		$this->calendar->expects($this->once())
-			->method('getPermissions')
-			->willReturn(Constants::PERMISSION_DELETE);
-		$this->vobject->expects($this->once())
-			->method('getBaseComponents')
-			->willReturn($components);
-		$this->vobject->expects($this->once())
-			->method('getBaseComponent')
-			->willReturn($components[0]);
-
-		$backend->expects($this->once())
-			->method('createFromString')
-			->with('someid.ics', self::callback(fn ($data): bool => preg_match('/BEGIN:VEVENT(.|\r\n)+STATUS:CANCELLED/', $data) === 1));
-
-		$calendarObject->delete();
-	}
-
-	public function testGetName(): void {
-		$this->vobject->expects($this->exactly(2))
-			->method('getBaseComponent')
-			->willReturnOnConsecutiveCalls((object)['UID' => 'someid'], (object)['UID' => 'someid', 'X-FILENAME' => 'real-filename.ics']);
-
-		$this->assertEquals($this->calendarObject->getName(), 'someid.ics');
-		$this->assertEquals($this->calendarObject->getName(), 'real-filename.ics');
-	}
-
-	public function testSetName(): void {
-		$this->expectException(\Sabre\DAV\Exception\Forbidden::class);
-		$this->calendarObject->setName('Some name');
-	}
+    private CalendarObject $calendarObject;
+    private AppCalendar&MockObject $calendar;
+    private ICalendar&MockObject $backend;
+    private VCalendar&MockObject $vobject;
+
+    protected function setUp(): void {
+        parent::setUp();
+
+        $this->calendar = $this->createMock(AppCalendar::class);
+        $this->calendar->method('getOwner')->willReturn('owner');
+        $this->calendar->method('getGroup')->willReturn('group');
+
+        $this->backend = $this->createMock(ICalendar::class);
+        $this->vobject = $this->createMock(VCalendar::class);
+        $this->calendarObject = new CalendarObject($this->calendar, $this->backend, $this->vobject);
+    }
+
+    public function testGetOwner(): void {
+        $this->assertEquals($this->calendarObject->getOwner(), 'owner');
+    }
+
+    public function testGetGroup(): void {
+        $this->assertEquals($this->calendarObject->getGroup(), 'group');
+    }
+
+    public function testGetACL(): void {
+        $this->calendar->expects($this->exactly(2))
+            ->method('getPermissions')
+            ->willReturnOnConsecutiveCalls(Constants::PERMISSION_READ, Constants::PERMISSION_ALL);
+
+        // read only
+        $this->assertEquals($this->calendarObject->getACL(), [
+            [
+                'privilege' => '{DAV:}read',
+                'principal' => 'owner',
+                'protected' => true,
+            ]
+        ]);
+
+        // write permissions
+        $this->assertEquals($this->calendarObject->getACL(), [
+            [
+                'privilege' => '{DAV:}read',
+                'principal' => 'owner',
+                'protected' => true,
+            ],
+            [
+                'privilege' => '{DAV:}write-content',
+                'principal' => 'owner',
+                'protected' => true,
+            ]
+        ]);
+    }
+
+    public function testSetACL(): void {
+        $this->expectException(\Sabre\DAV\Exception\Forbidden::class);
+        $this->calendarObject->setACL([]);
+    }
+
+    public function testPut_readOnlyBackend(): void {
+        $this->expectException(\Sabre\DAV\Exception\Forbidden::class);
+        $this->calendarObject->put('foo');
+    }
+
+    public function testPut_noPermissions(): void {
+        $this->expectException(\Sabre\DAV\Exception\Forbidden::class);
+
+        $backend = $this->createMock(ICreateFromString::class);
+        $calendarObject = new CalendarObject($this->calendar, $backend, $this->vobject);
+
+        $this->calendar->expects($this->once())
+            ->method('getPermissions')
+            ->willReturn(Constants::PERMISSION_READ);
+
+        $calendarObject->put('foo');
+    }
+
+    public function testPut(): void {
+        $backend = $this->createMock(ICreateFromString::class);
+        $calendarObject = new CalendarObject($this->calendar, $backend, $this->vobject);
+
+        $this->vobject->expects($this->once())
+            ->method('getBaseComponent')
+            ->willReturn((object)['UID' => 'someid']);
+        $this->calendar->expects($this->once())
+            ->method('getPermissions')
+            ->willReturn(Constants::PERMISSION_ALL);
+
+        $backend->expects($this->once())
+            ->method('createFromString')
+            ->with('someid.ics', 'foo');
+        $calendarObject->put('foo');
+    }
+
+    public function testGet(): void {
+        $this->vobject->expects($this->once())
+            ->method('serialize')
+            ->willReturn('foo');
+        $this->assertEquals($this->calendarObject->get(), 'foo');
+    }
+
+    public function testDelete_notWriteable(): void {
+        $this->expectException(\Sabre\DAV\Exception\Forbidden::class);
+        $this->calendarObject->delete();
+    }
+
+    public function testDelete_noPermission(): void {
+        $backend = $this->createMock(ICreateFromString::class);
+        $calendarObject = new CalendarObject($this->calendar, $backend, $this->vobject);
+
+        $this->expectException(\Sabre\DAV\Exception\Forbidden::class);
+        $calendarObject->delete();
+    }
+
+    public function testDelete(): void {
+        $backend = $this->createMock(ICreateFromString::class);
+        $calendarObject = new CalendarObject($this->calendar, $backend, $this->vobject);
+
+        $components = [(new VCalendar(['VEVENT' => ['UID' => 'someid']]))->getBaseComponent()];
+
+        $this->calendar->expects($this->once())
+            ->method('getPermissions')
+            ->willReturn(Constants::PERMISSION_DELETE);
+        $this->vobject->expects($this->once())
+            ->method('getBaseComponents')
+            ->willReturn($components);
+        $this->vobject->expects($this->once())
+            ->method('getBaseComponent')
+            ->willReturn($components[0]);
+
+        $backend->expects($this->once())
+            ->method('createFromString')
+            ->with('someid.ics', self::callback(fn ($data): bool => preg_match('/BEGIN:VEVENT(.|\r\n)+STATUS:CANCELLED/', $data) === 1));
+
+        $calendarObject->delete();
+    }
+
+    public function testGetName(): void {
+        $this->vobject->expects($this->exactly(2))
+            ->method('getBaseComponent')
+            ->willReturnOnConsecutiveCalls((object)['UID' => 'someid'], (object)['UID' => 'someid', 'X-FILENAME' => 'real-filename.ics']);
+
+        $this->assertEquals($this->calendarObject->getName(), 'someid.ics');
+        $this->assertEquals($this->calendarObject->getName(), 'real-filename.ics');
+    }
+
+    public function testSetName(): void {
+        $this->expectException(\Sabre\DAV\Exception\Forbidden::class);
+        $this->calendarObject->setName('Some name');
+    }
 }

Spacing +2 added lines, -2 removed lines

@@ -100,7 +100,7 @@ 
 
 		$this->vobject->expects($this->once())
 			->method('getBaseComponent')
-			->willReturn((object)['UID' => 'someid']);
+			->willReturn((object) ['UID' => 'someid']);
 		$this->calendar->expects($this->once())
 			->method('getPermissions')
 			->willReturn(Constants::PERMISSION_ALL);
@@ -157,7 +157,7 @@ 
 	public function testGetName(): void {
 		$this->vobject->expects($this->exactly(2))
 			->method('getBaseComponent')
-			->willReturnOnConsecutiveCalls((object)['UID' => 'someid'], (object)['UID' => 'someid', 'X-FILENAME' => 'real-filename.ics']);
+			->willReturnOnConsecutiveCalls((object) ['UID' => 'someid'], (object) ['UID' => 'someid', 'X-FILENAME' => 'real-filename.ics']);
 
 		$this->assertEquals($this->calendarObject->getName(), 'someid.ics');
 		$this->assertEquals($this->calendarObject->getName(), 'real-filename.ics');