Completed
Push — master ( 14f798...42f450 )
by
unknown
31:50 queued 14s
created
apps/files_versions/tests/VersioningTest.php 1 patch
Spacing   +59 added lines, -59 removed lines patch added patch discarded remove patch
@@ -86,7 +86,7 @@  discard block
 block discarded – undo
86 86
 		$mockConfig = $this->createMock(IConfig::class);
87 87
 		$mockConfig->expects($this->any())
88 88
 			->method('getSystemValue')
89
-			->willReturnCallback(function ($key, $default) use ($config) {
89
+			->willReturnCallback(function($key, $default) use ($config) {
90 90
 				if ($key === 'filesystem_check_changes') {
91 91
 					return Watcher::CHECK_ONCE;
92 92
 				} else {
@@ -121,10 +121,10 @@  discard block
 block discarded – undo
121 121
 		$this->restoreService(AllConfig::class);
122 122
 
123 123
 		if ($this->rootView) {
124
-			$this->rootView->deleteAll(self::TEST_VERSIONS_USER . '/files/');
125
-			$this->rootView->deleteAll(self::TEST_VERSIONS_USER2 . '/files/');
126
-			$this->rootView->deleteAll(self::TEST_VERSIONS_USER . '/files_versions/');
127
-			$this->rootView->deleteAll(self::TEST_VERSIONS_USER2 . '/files_versions/');
124
+			$this->rootView->deleteAll(self::TEST_VERSIONS_USER.'/files/');
125
+			$this->rootView->deleteAll(self::TEST_VERSIONS_USER2.'/files/');
126
+			$this->rootView->deleteAll(self::TEST_VERSIONS_USER.'/files_versions/');
127
+			$this->rootView->deleteAll(self::TEST_VERSIONS_USER2.'/files_versions/');
128 128
 		}
129 129
 
130 130
 		\OC_Hook::clear();
@@ -292,10 +292,10 @@  discard block
 block discarded – undo
292 292
 		$t2 = $t1 - 60 * 60 * 24 * 14;
293 293
 
294 294
 		// create some versions
295
-		$v1 = self::USERS_VERSIONS_ROOT . '/test.txt.v' . $t1;
296
-		$v2 = self::USERS_VERSIONS_ROOT . '/test.txt.v' . $t2;
297
-		$v1Renamed = self::USERS_VERSIONS_ROOT . '/test2.txt.v' . $t1;
298
-		$v2Renamed = self::USERS_VERSIONS_ROOT . '/test2.txt.v' . $t2;
295
+		$v1 = self::USERS_VERSIONS_ROOT.'/test.txt.v'.$t1;
296
+		$v2 = self::USERS_VERSIONS_ROOT.'/test.txt.v'.$t2;
297
+		$v1Renamed = self::USERS_VERSIONS_ROOT.'/test2.txt.v'.$t1;
298
+		$v2Renamed = self::USERS_VERSIONS_ROOT.'/test2.txt.v'.$t2;
299 299
 
300 300
 		$this->rootView->file_put_contents($v1, 'version1');
301 301
 		$this->rootView->file_put_contents($v2, 'version2');
@@ -322,12 +322,12 @@  discard block
 block discarded – undo
322 322
 		// version will be expired
323 323
 		$t2 = $t1 - 60 * 60 * 24 * 14;
324 324
 
325
-		$this->rootView->mkdir(self::USERS_VERSIONS_ROOT . '/folder1');
325
+		$this->rootView->mkdir(self::USERS_VERSIONS_ROOT.'/folder1');
326 326
 		// create some versions
327
-		$v1 = self::USERS_VERSIONS_ROOT . '/folder1/test.txt.v' . $t1;
328
-		$v2 = self::USERS_VERSIONS_ROOT . '/folder1/test.txt.v' . $t2;
329
-		$v1Renamed = self::USERS_VERSIONS_ROOT . '/folder1/folder2/test.txt.v' . $t1;
330
-		$v2Renamed = self::USERS_VERSIONS_ROOT . '/folder1/folder2/test.txt.v' . $t2;
327
+		$v1 = self::USERS_VERSIONS_ROOT.'/folder1/test.txt.v'.$t1;
328
+		$v2 = self::USERS_VERSIONS_ROOT.'/folder1/test.txt.v'.$t2;
329
+		$v1Renamed = self::USERS_VERSIONS_ROOT.'/folder1/folder2/test.txt.v'.$t1;
330
+		$v2Renamed = self::USERS_VERSIONS_ROOT.'/folder1/folder2/test.txt.v'.$t2;
331 331
 
332 332
 		$this->rootView->file_put_contents($v1, 'version1');
333 333
 		$this->rootView->file_put_contents($v2, 'version2');
@@ -373,11 +373,11 @@  discard block
 block discarded – undo
373 373
 		$t2 = $t1 - 60 * 60 * 24 * 14;
374 374
 
375 375
 		// create some versions
376
-		$this->rootView->mkdir(self::USERS_VERSIONS_ROOT . '/folder1');
377
-		$v1 = self::USERS_VERSIONS_ROOT . '/folder1/test.txt.v' . $t1;
378
-		$v2 = self::USERS_VERSIONS_ROOT . '/folder1/test.txt.v' . $t2;
379
-		$v1Renamed = self::USERS_VERSIONS_ROOT . '/folder2/folder1/test.txt.v' . $t1;
380
-		$v2Renamed = self::USERS_VERSIONS_ROOT . '/folder2/folder1/test.txt.v' . $t2;
376
+		$this->rootView->mkdir(self::USERS_VERSIONS_ROOT.'/folder1');
377
+		$v1 = self::USERS_VERSIONS_ROOT.'/folder1/test.txt.v'.$t1;
378
+		$v2 = self::USERS_VERSIONS_ROOT.'/folder1/test.txt.v'.$t2;
379
+		$v1Renamed = self::USERS_VERSIONS_ROOT.'/folder2/folder1/test.txt.v'.$t1;
380
+		$v2Renamed = self::USERS_VERSIONS_ROOT.'/folder2/folder1/test.txt.v'.$t2;
381 381
 
382 382
 		$this->rootView->file_put_contents($v1, 'version1');
383 383
 		$this->rootView->file_put_contents($v2, 'version2');
@@ -410,7 +410,7 @@  discard block
 block discarded – undo
410 410
 		Server::get(\OCP\Share\IManager::class)->acceptShare($share, self::TEST_VERSIONS_USER2);
411 411
 
412 412
 		self::loginHelper(self::TEST_VERSIONS_USER2);
413
-		$versionsFolder2 = '/' . self::TEST_VERSIONS_USER2 . '/files_versions';
413
+		$versionsFolder2 = '/'.self::TEST_VERSIONS_USER2.'/files_versions';
414 414
 		Filesystem::file_put_contents('test.txt', 'test file');
415 415
 
416 416
 		$t1 = time();
@@ -420,8 +420,8 @@  discard block
 block discarded – undo
420 420
 
421 421
 		$this->rootView->mkdir($versionsFolder2);
422 422
 		// create some versions
423
-		$v1 = $versionsFolder2 . '/test.txt.v' . $t1;
424
-		$v2 = $versionsFolder2 . '/test.txt.v' . $t2;
423
+		$v1 = $versionsFolder2.'/test.txt.v'.$t1;
424
+		$v2 = $versionsFolder2.'/test.txt.v'.$t2;
425 425
 
426 426
 		$this->rootView->file_put_contents($v1, 'version1');
427 427
 		$this->rootView->file_put_contents($v2, 'version2');
@@ -434,10 +434,10 @@  discard block
 block discarded – undo
434 434
 
435 435
 		self::loginHelper(self::TEST_VERSIONS_USER);
436 436
 
437
-		$versionsFolder1 = '/' . self::TEST_VERSIONS_USER . '/files_versions';
437
+		$versionsFolder1 = '/'.self::TEST_VERSIONS_USER.'/files_versions';
438 438
 
439
-		$v1Renamed = $versionsFolder1 . '/folder1/test.txt.v' . $t1;
440
-		$v2Renamed = $versionsFolder1 . '/folder1/test.txt.v' . $t2;
439
+		$v1Renamed = $versionsFolder1.'/folder1/test.txt.v'.$t1;
440
+		$v2Renamed = $versionsFolder1.'/folder1/test.txt.v'.$t2;
441 441
 
442 442
 		$this->assertTrue($this->rootView->file_exists($v1Renamed));
443 443
 		$this->assertTrue($this->rootView->file_exists($v2Renamed));
@@ -459,7 +459,7 @@  discard block
 block discarded – undo
459 459
 		Server::get(\OCP\Share\IManager::class)->acceptShare($share, self::TEST_VERSIONS_USER2);
460 460
 
461 461
 		self::loginHelper(self::TEST_VERSIONS_USER2);
462
-		$versionsFolder2 = '/' . self::TEST_VERSIONS_USER2 . '/files_versions';
462
+		$versionsFolder2 = '/'.self::TEST_VERSIONS_USER2.'/files_versions';
463 463
 		Filesystem::mkdir('folder2');
464 464
 		Filesystem::file_put_contents('folder2/test.txt', 'test file');
465 465
 
@@ -469,10 +469,10 @@  discard block
 block discarded – undo
469 469
 		$t2 = $t1 - 60 * 60 * 24 * 14;
470 470
 
471 471
 		$this->rootView->mkdir($versionsFolder2);
472
-		$this->rootView->mkdir($versionsFolder2 . '/folder2');
472
+		$this->rootView->mkdir($versionsFolder2.'/folder2');
473 473
 		// create some versions
474
-		$v1 = $versionsFolder2 . '/folder2/test.txt.v' . $t1;
475
-		$v2 = $versionsFolder2 . '/folder2/test.txt.v' . $t2;
474
+		$v1 = $versionsFolder2.'/folder2/test.txt.v'.$t1;
475
+		$v2 = $versionsFolder2.'/folder2/test.txt.v'.$t2;
476 476
 
477 477
 		$this->rootView->file_put_contents($v1, 'version1');
478 478
 		$this->rootView->file_put_contents($v2, 'version2');
@@ -485,10 +485,10 @@  discard block
 block discarded – undo
485 485
 
486 486
 		self::loginHelper(self::TEST_VERSIONS_USER);
487 487
 
488
-		$versionsFolder1 = '/' . self::TEST_VERSIONS_USER . '/files_versions';
488
+		$versionsFolder1 = '/'.self::TEST_VERSIONS_USER.'/files_versions';
489 489
 
490
-		$v1Renamed = $versionsFolder1 . '/folder1/folder2/test.txt.v' . $t1;
491
-		$v2Renamed = $versionsFolder1 . '/folder1/folder2/test.txt.v' . $t2;
490
+		$v1Renamed = $versionsFolder1.'/folder1/folder2/test.txt.v'.$t1;
491
+		$v2Renamed = $versionsFolder1.'/folder1/folder2/test.txt.v'.$t2;
492 492
 
493 493
 		$this->assertTrue($this->rootView->file_exists($v1Renamed));
494 494
 		$this->assertTrue($this->rootView->file_exists($v2Renamed));
@@ -506,11 +506,11 @@  discard block
 block discarded – undo
506 506
 
507 507
 		$this->rootView->mkdir(self::USERS_VERSIONS_ROOT);
508 508
 		// create some versions
509
-		$v1 = self::USERS_VERSIONS_ROOT . '/test.txt.v' . $t1;
510
-		$v2 = self::USERS_VERSIONS_ROOT . '/test.txt.v' . $t2;
509
+		$v1 = self::USERS_VERSIONS_ROOT.'/test.txt.v'.$t1;
510
+		$v2 = self::USERS_VERSIONS_ROOT.'/test.txt.v'.$t2;
511 511
 		// the renamed versions should not exist! Because we only moved the mount point!
512
-		$v1Renamed = self::USERS_VERSIONS_ROOT . '/test2.txt.v' . $t1;
513
-		$v2Renamed = self::USERS_VERSIONS_ROOT . '/test2.txt.v' . $t2;
512
+		$v1Renamed = self::USERS_VERSIONS_ROOT.'/test2.txt.v'.$t1;
513
+		$v2Renamed = self::USERS_VERSIONS_ROOT.'/test2.txt.v'.$t2;
514 514
 
515 515
 		$this->rootView->file_put_contents($v1, 'version1');
516 516
 		$this->rootView->file_put_contents($v2, 'version2');
@@ -554,10 +554,10 @@  discard block
 block discarded – undo
554 554
 		$t2 = $t1 - 60 * 60 * 24 * 14;
555 555
 
556 556
 		// create some versions
557
-		$v1 = self::USERS_VERSIONS_ROOT . '/test.txt.v' . $t1;
558
-		$v2 = self::USERS_VERSIONS_ROOT . '/test.txt.v' . $t2;
559
-		$v1Copied = self::USERS_VERSIONS_ROOT . '/test2.txt.v' . $t1;
560
-		$v2Copied = self::USERS_VERSIONS_ROOT . '/test2.txt.v' . $t2;
557
+		$v1 = self::USERS_VERSIONS_ROOT.'/test.txt.v'.$t1;
558
+		$v2 = self::USERS_VERSIONS_ROOT.'/test.txt.v'.$t2;
559
+		$v1Copied = self::USERS_VERSIONS_ROOT.'/test2.txt.v'.$t1;
560
+		$v2Copied = self::USERS_VERSIONS_ROOT.'/test2.txt.v'.$t2;
561 561
 
562 562
 		$this->rootView->file_put_contents($v1, 'version1');
563 563
 		$this->rootView->file_put_contents($v2, 'version2');
@@ -585,10 +585,10 @@  discard block
 block discarded – undo
585 585
 		$t2 = $t1 - 60 * 60 * 24 * 14;
586 586
 
587 587
 		// create some versions
588
-		$v1 = self::USERS_VERSIONS_ROOT . '/subfolder/test.txt.v' . $t1;
589
-		$v2 = self::USERS_VERSIONS_ROOT . '/subfolder/test.txt.v' . $t2;
588
+		$v1 = self::USERS_VERSIONS_ROOT.'/subfolder/test.txt.v'.$t1;
589
+		$v2 = self::USERS_VERSIONS_ROOT.'/subfolder/test.txt.v'.$t2;
590 590
 
591
-		$this->rootView->mkdir(self::USERS_VERSIONS_ROOT . '/subfolder/');
591
+		$this->rootView->mkdir(self::USERS_VERSIONS_ROOT.'/subfolder/');
592 592
 
593 593
 		$this->rootView->file_put_contents($v1, 'version1');
594 594
 		$this->rootView->file_put_contents($v2, 'version2');
@@ -604,7 +604,7 @@  discard block
 block discarded – undo
604 604
 		}
605 605
 
606 606
 		//cleanup
607
-		$this->rootView->deleteAll(self::USERS_VERSIONS_ROOT . '/subfolder');
607
+		$this->rootView->deleteAll(self::USERS_VERSIONS_ROOT.'/subfolder');
608 608
 	}
609 609
 
610 610
 	/**
@@ -647,7 +647,7 @@  discard block
 block discarded – undo
647 647
 
648 648
 	public function testRestoreCrossStorage(): void {
649 649
 		$storage2 = new Temporary([]);
650
-		Filesystem::mount($storage2, [], self::TEST_VERSIONS_USER . '/files/sub');
650
+		Filesystem::mount($storage2, [], self::TEST_VERSIONS_USER.'/files/sub');
651 651
 
652 652
 		$this->doTestRestore();
653 653
 	}
@@ -746,7 +746,7 @@  discard block
 block discarded – undo
746 746
 		$eventHandler->expects($this->any())
747 747
 			->method('callback')
748 748
 			->willReturnCallback(
749
-				function ($p) use (&$params): void {
749
+				function($p) use (&$params): void {
750 750
 					$params = $p;
751 751
 				}
752 752
 			);
@@ -760,7 +760,7 @@  discard block
 block discarded – undo
760 760
 	}
761 761
 
762 762
 	private function doTestRestore() {
763
-		$filePath = self::TEST_VERSIONS_USER . '/files/sub/test.txt';
763
+		$filePath = self::TEST_VERSIONS_USER.'/files/sub/test.txt';
764 764
 		$this->rootView->file_put_contents($filePath, 'test file');
765 765
 
766 766
 		$fileInfo = $this->rootView->getFileInfo($filePath);
@@ -772,10 +772,10 @@  discard block
 block discarded – undo
772 772
 		$t2 = $t1 - 60 * 60 * 24 * 14;
773 773
 
774 774
 		// create some versions
775
-		$v1 = self::USERS_VERSIONS_ROOT . '/sub/test.txt.v' . $t1;
776
-		$v2 = self::USERS_VERSIONS_ROOT . '/sub/test.txt.v' . $t2;
775
+		$v1 = self::USERS_VERSIONS_ROOT.'/sub/test.txt.v'.$t1;
776
+		$v2 = self::USERS_VERSIONS_ROOT.'/sub/test.txt.v'.$t2;
777 777
 
778
-		$this->rootView->mkdir(self::USERS_VERSIONS_ROOT . '/sub');
778
+		$this->rootView->mkdir(self::USERS_VERSIONS_ROOT.'/sub');
779 779
 
780 780
 		$this->rootView->file_put_contents($v1, 'version1');
781 781
 		$fileInfoV1 = $this->rootView->getFileInfo($v1);
@@ -808,7 +808,7 @@  discard block
 block discarded – undo
808 808
 
809 809
 		$eventDispatcher = Server::get(IEventDispatcher::class);
810 810
 		$eventFired = false;
811
-		$eventDispatcher->addListener(VersionRestoredEvent::class, function ($event) use (&$eventFired, $t2): void {
811
+		$eventDispatcher->addListener(VersionRestoredEvent::class, function($event) use (&$eventFired, $t2): void {
812 812
 			$eventFired = true;
813 813
 			$this->assertEquals('/sub/test.txt', $event->getVersion()->getVersionPath());
814 814
 			$this->assertTrue($event->getVersion()->getRevisionId() > 0);
@@ -816,7 +816,7 @@  discard block
 block discarded – undo
816 816
 
817 817
 		$versionManager = Server::get(IVersionManager::class);
818 818
 		$versions = $versionManager->getVersionsForFile($this->user1, $info1);
819
-		$version = array_filter($versions, function ($version) use ($t2) {
819
+		$version = array_filter($versions, function($version) use ($t2) {
820 820
 			return $version->getRevisionId() === $t2;
821 821
 		});
822 822
 		$this->assertTrue($versionManager->rollback(current($version)));
@@ -847,7 +847,7 @@  discard block
 block discarded – undo
847 847
 		);
848 848
 
849 849
 		$this->assertTrue(
850
-			$this->rootView->file_exists(self::USERS_VERSIONS_ROOT . '/sub/test.txt.v' . $t0),
850
+			$this->rootView->file_exists(self::USERS_VERSIONS_ROOT.'/sub/test.txt.v'.$t0),
851 851
 			'A version file was created for the file before restoration'
852 852
 		);
853 853
 		$this->assertTrue(
@@ -862,15 +862,15 @@  discard block
 block discarded – undo
862 862
 		$this->assertCount(2, $newVersions, 'Additional version created');
863 863
 
864 864
 		$this->assertTrue(
865
-			isset($newVersions[$t0 . '#' . 'test.txt']),
865
+			isset($newVersions[$t0.'#'.'test.txt']),
866 866
 			'A version was created for the file before restoration'
867 867
 		);
868 868
 		$this->assertTrue(
869
-			isset($newVersions[$t1 . '#' . 'test.txt']),
869
+			isset($newVersions[$t1.'#'.'test.txt']),
870 870
 			'Untouched version is still there'
871 871
 		);
872 872
 		$this->assertFalse(
873
-			isset($newVersions[$t2 . '#' . 'test.txt']),
873
+			isset($newVersions[$t2.'#'.'test.txt']),
874 874
 			'Restored version is not in the list any more'
875 875
 		);
876 876
 	}
@@ -930,7 +930,7 @@  discard block
 block discarded – undo
930 930
 		// needed to make the hooks fire
931 931
 		\OC_Util::setupFS(self::TEST_VERSIONS_USER);
932 932
 
933
-		$userView = new View('/' . self::TEST_VERSIONS_USER . '/files');
933
+		$userView = new View('/'.self::TEST_VERSIONS_USER.'/files');
934 934
 		$this->createAndCheckVersions(
935 935
 			$userView,
936 936
 			'test.txt'
@@ -949,11 +949,11 @@  discard block
 block discarded – undo
949 949
 		$this->loginAsUser(self::TEST_VERSIONS_USER);
950 950
 
951 951
 		// need to scan for the versions
952
-		[$rootStorage,] = $this->rootView->resolvePath(self::TEST_VERSIONS_USER . '/files_versions');
952
+		[$rootStorage, ] = $this->rootView->resolvePath(self::TEST_VERSIONS_USER.'/files_versions');
953 953
 		$rootStorage->getScanner()->scan('files_versions');
954 954
 
955 955
 		$versions = Storage::getVersions(
956
-			self::TEST_VERSIONS_USER, '/' . $path
956
+			self::TEST_VERSIONS_USER, '/'.$path
957 957
 		);
958 958
 
959 959
 		// note: we cannot predict how many versions are created due to
Please login to merge, or discard this patch.
apps/files_trashbin/lib/Command/CleanUp.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -92,12 +92,12 @@
 block discarded – undo
92 92
 	protected function removeDeletedFiles(string $uid, OutputInterface $output, bool $verbose): void {
93 93
 		\OC_Util::tearDownFS();
94 94
 		\OC_Util::setupFS($uid);
95
-		$path = '/' . $uid . '/files_trashbin';
95
+		$path = '/'.$uid.'/files_trashbin';
96 96
 		if ($this->rootFolder->nodeExists($path)) {
97 97
 			$node = $this->rootFolder->get($path);
98 98
 
99 99
 			if ($verbose) {
100
-				$output->writeln('Deleting <info>' . Util::humanFileSize($node->getSize()) . "</info> in trash for <info>$uid</info>.");
100
+				$output->writeln('Deleting <info>'.Util::humanFileSize($node->getSize())."</info> in trash for <info>$uid</info>.");
101 101
 			}
102 102
 			$node->delete();
103 103
 			if ($this->rootFolder->nodeExists($path)) {
Please login to merge, or discard this patch.
apps/files_trashbin/lib/Command/Size.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -52,10 +52,10 @@  discard block
 block discarded – undo
52 52
 				return -1;
53 53
 			}
54 54
 			if ($user) {
55
-				$this->config->setUserValue($user, 'files_trashbin', 'trashbin_size', (string)$parsedSize);
55
+				$this->config->setUserValue($user, 'files_trashbin', 'trashbin_size', (string) $parsedSize);
56 56
 				$this->commandBus->push(new Expire($user));
57 57
 			} else {
58
-				$this->config->setAppValue('files_trashbin', 'trashbin_size', (string)$parsedSize);
58
+				$this->config->setAppValue('files_trashbin', 'trashbin_size', (string) $parsedSize);
59 59
 				$output->writeln('<info>Warning: changing the default trashbin size will automatically trigger cleanup of existing trashbins,</info>');
60 60
 				$output->writeln('<info>a users trashbin can exceed the configured size until they move a new file to the trashbin.</info>');
61 61
 			}
@@ -67,7 +67,7 @@  discard block
 block discarded – undo
67 67
 	}
68 68
 
69 69
 	private function printTrashbinSize(InputInterface $input, OutputInterface $output, ?string $user) {
70
-		$globalSize = (int)$this->config->getAppValue('files_trashbin', 'trashbin_size', '-1');
70
+		$globalSize = (int) $this->config->getAppValue('files_trashbin', 'trashbin_size', '-1');
71 71
 		if ($globalSize < 0) {
72 72
 			$globalHumanSize = 'default (50% of available space)';
73 73
 		} else {
@@ -75,7 +75,7 @@  discard block
 block discarded – undo
75 75
 		}
76 76
 
77 77
 		if ($user) {
78
-			$userSize = (int)$this->config->getUserValue($user, 'files_trashbin', 'trashbin_size', '-1');
78
+			$userSize = (int) $this->config->getUserValue($user, 'files_trashbin', 'trashbin_size', '-1');
79 79
 
80 80
 			if ($userSize < 0) {
81 81
 				$userHumanSize = ($globalSize < 0) ? $globalHumanSize : "default($globalHumanSize)";
@@ -96,7 +96,7 @@  discard block
 block discarded – undo
96 96
 			}
97 97
 		} else {
98 98
 			$users = [];
99
-			$this->userManager->callForSeenUsers(function (IUser $user) use (&$users): void {
99
+			$this->userManager->callForSeenUsers(function(IUser $user) use (&$users): void {
100 100
 				$users[] = $user->getUID();
101 101
 			});
102 102
 			$userValues = $this->config->getUserValueForUsers('files_trashbin', 'trashbin_size', $users);
@@ -106,7 +106,7 @@  discard block
 block discarded – undo
106 106
 				$output->writeln('');
107 107
 				if (count($userValues)) {
108 108
 					$output->writeln('Per-user sizes:');
109
-					$this->writeArrayInOutputFormat($input, $output, array_map(function ($size) {
109
+					$this->writeArrayInOutputFormat($input, $output, array_map(function($size) {
110 110
 						return Util::humanFileSize($size);
111 111
 					}, $userValues));
112 112
 				} else {
Please login to merge, or discard this patch.
apps/dav/lib/CalDAV/ResourceBooking/AbstractPrincipalBackend.php 1 patch
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -44,9 +44,9 @@  discard block
 block discarded – undo
44 44
 		string $dbPrefix,
45 45
 		private string $cuType,
46 46
 	) {
47
-		$this->dbTableName = 'calendar_' . $dbPrefix . 's';
48
-		$this->dbMetaDataTableName = $this->dbTableName . '_md';
49
-		$this->dbForeignKeyName = $dbPrefix . '_id';
47
+		$this->dbTableName = 'calendar_'.$dbPrefix.'s';
48
+		$this->dbMetaDataTableName = $this->dbTableName.'_md';
49
+		$this->dbForeignKeyName = $dbPrefix.'_id';
50 50
 	}
51 51
 
52 52
 	use PrincipalProxyTrait;
@@ -216,7 +216,7 @@  discard block
 block discarded – undo
216 216
 					$query = $this->db->getQueryBuilder();
217 217
 					$query->select(['id', 'backend_id', 'resource_id', 'email', 'displayname', 'group_restrictions'])
218 218
 						->from($this->dbTableName)
219
-						->where($query->expr()->iLike('email', $query->createNamedParameter('%' . $this->db->escapeLikeParameter($value) . '%')));
219
+						->where($query->expr()->iLike('email', $query->createNamedParameter('%'.$this->db->escapeLikeParameter($value).'%')));
220 220
 
221 221
 					$stmt = $query->execute();
222 222
 					$principals = [];
@@ -235,7 +235,7 @@  discard block
 block discarded – undo
235 235
 					$query = $this->db->getQueryBuilder();
236 236
 					$query->select(['id', 'backend_id', 'resource_id', 'email', 'displayname', 'group_restrictions'])
237 237
 						->from($this->dbTableName)
238
-						->where($query->expr()->iLike('displayname', $query->createNamedParameter('%' . $this->db->escapeLikeParameter($value) . '%')));
238
+						->where($query->expr()->iLike('displayname', $query->createNamedParameter('%'.$this->db->escapeLikeParameter($value).'%')));
239 239
 
240 240
 					$stmt = $query->execute();
241 241
 					$principals = [];
@@ -314,7 +314,7 @@  discard block
 block discarded – undo
314 314
 	 */
315 315
 	private function searchPrincipalsByMetadataKey(string $key, string $value, array $usersGroups = []): array {
316 316
 		$query = $this->getMetadataQuery($key);
317
-		$query->andWhere($query->expr()->iLike('value', $query->createNamedParameter('%' . $this->db->escapeLikeParameter($value) . '%')));
317
+		$query->andWhere($query->expr()->iLike('value', $query->createNamedParameter('%'.$this->db->escapeLikeParameter($value).'%')));
318 318
 		return $this->getRows($query, $usersGroups);
319 319
 	}
320 320
 
@@ -331,7 +331,7 @@  discard block
 block discarded – undo
331 331
 	private function searchPrincipalsByRoomFeature(string $key, string $value, array $usersGroups = []): array {
332 332
 		$query = $this->getMetadataQuery($key);
333 333
 		foreach (explode(',', $value) as $v) {
334
-			$query->andWhere($query->expr()->iLike('value', $query->createNamedParameter('%' . $this->db->escapeLikeParameter($v) . '%')));
334
+			$query->andWhere($query->expr()->iLike('value', $query->createNamedParameter('%'.$this->db->escapeLikeParameter($v).'%')));
335 335
 		}
336 336
 		return $this->getRows($query, $usersGroups);
337 337
 	}
@@ -361,7 +361,7 @@  discard block
 block discarded – undo
361 361
 		try {
362 362
 			$stmt = $query->executeQuery();
363 363
 		} catch (Exception $e) {
364
-			$this->logger->error('Could not search resources: ' . $e->getMessage(), ['exception' => $e]);
364
+			$this->logger->error('Could not search resources: '.$e->getMessage(), ['exception' => $e]);
365 365
 		}
366 366
 
367 367
 		$rows = [];
@@ -376,11 +376,11 @@  discard block
 block discarded – undo
376 376
 
377 377
 		$stmt->closeCursor();
378 378
 
379
-		$filteredRows = array_filter($rows, function ($row) use ($usersGroups) {
379
+		$filteredRows = array_filter($rows, function($row) use ($usersGroups) {
380 380
 			return $this->isAllowedToAccessResource($row, $usersGroups);
381 381
 		});
382 382
 
383
-		return array_map(static function ($row): string {
383
+		return array_map(static function($row): string {
384 384
 			return $row['uri'];
385 385
 		}, $filteredRows);
386 386
 	}
@@ -457,7 +457,7 @@  discard block
 block discarded – undo
457 457
 	 */
458 458
 	private function rowToPrincipal(array $row, array $metadata = []): array {
459 459
 		return array_merge([
460
-			'uri' => $this->principalPrefix . '/' . $row['backend_id'] . '-' . $row['resource_id'],
460
+			'uri' => $this->principalPrefix.'/'.$row['backend_id'].'-'.$row['resource_id'],
461 461
 			'{DAV:}displayname' => $row['displayname'],
462 462
 			'{http://sabredav.org/ns}email-address' => $row['email'],
463 463
 			'{urn:ietf:params:xml:ns:caldav}calendar-user-type' => $this->cuType,
@@ -479,7 +479,7 @@  discard block
 block discarded – undo
479 479
 		// group restrictions contains something, but not parsable, deny access and log warning
480 480
 		$json = json_decode($row['group_restrictions'], null, 512, JSON_THROW_ON_ERROR);
481 481
 		if (!\is_array($json)) {
482
-			$this->logger->info('group_restrictions field could not be parsed for ' . $this->dbTableName . '::' . $row['id'] . ', denying access to resource');
482
+			$this->logger->info('group_restrictions field could not be parsed for '.$this->dbTableName.'::'.$row['id'].', denying access to resource');
483 483
 			return false;
484 484
 		}
485 485
 
Please login to merge, or discard this patch.