chore(deps): bump nextcloud/coding-standard from 1.2.3 to ^1.3.1 (mai…

…n) (#6367) Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Signed-off-by: Richard Steinmetz <[email protected]> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Richard Steinmetz <[email protected]>
nextcloud · Oct 1, 2024 · 11d0948 · 11d0948
1 parent bc67247
commit 11d0948
Show file tree

Hide file tree

Showing 13 changed files with 97 additions and 34 deletions.
diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
@@ -5,3 +5,6 @@
 
 # Update to coding-standard 1.2.3
 3b3935b4e754ccbc00d3abb71ab6836f3db5b026
+
+# Update to coding-standard 1.3.1
+db4964b631856f514bc08d3da0e86014a18d678f
diff --git a/lib/Controller/AppointmentController.php b/lib/Controller/AppointmentController.php
@@ -38,7 +38,7 @@ public function __construct(IRequest $request,
 		IUserManager $userManager,
 		AppointmentConfigService $configService,
 		IInitialState $initialState,
-		?string $userId
+		?string $userId,
 	) {
 		parent::__construct(Application::APP_ID, $request);
 

diff --git a/lib/Listener/CalendarReferenceListener.php b/lib/Listener/CalendarReferenceListener.php
@@ -21,7 +21,8 @@
  */
 class CalendarReferenceListener implements IEventListener {
 	public function __construct(
-		private CalendarInitialStateService $calendarinitialStateService) {
+		private CalendarInitialStateService $calendarinitialStateService,
+	) {
 		$this->calendarinitialStateService = $calendarinitialStateService;
 	}
 

diff --git a/lib/Reference/ReferenceProvider.php b/lib/Reference/ReferenceProvider.php
@@ -124,7 +124,7 @@ private function getUrlFromLink(string $data, string $type): ?string {
 		if ($type === 'public') {
 			return "{$this->urlGenerator->getWebroot()}/remote.php/dav/public-calendars/{$data}/";
 		} elseif ($type === 'private' && preg_match('/\/remote.php\/dav\/calendars\/([a-zA-Z0-9-]+)\/([a-zA-Z0-9-]+)\//', $data, $output_array)) {
-			return $this->urlGenerator->getWebroot().$output_array[0];
+			return $this->urlGenerator->getWebroot() . $output_array[0];
 		}
 		return null;
 

diff --git a/lib/Service/Appointments/AvailabilityGenerator.php b/lib/Service/Appointments/AvailabilityGenerator.php
@@ -24,7 +24,10 @@ class AvailabilityGenerator {
 	/** @var ITimeFactory */
 	private $timeFactory;
 
-	public function __construct(ITimeFactory $timeFactory, private LoggerInterface $logger) {
+	public function __construct(
+		ITimeFactory $timeFactory,
+		private LoggerInterface $logger,
+	) {
 		$this->timeFactory = $timeFactory;
 	}
 

diff --git a/lib/Service/Appointments/BookingCalendarWriter.php b/lib/Service/Appointments/BookingCalendarWriter.php
@@ -36,12 +36,14 @@ class BookingCalendarWriter {
 
 	private TimezoneGenerator $timezoneGenerator;
 
-	public function __construct(IConfig $config,
+	public function __construct(
+		IConfig $config,
 		IManager $manager,
 		IUserManager $userManager,
 		ISecureRandom $random,
 		TimezoneGenerator $timezoneGenerator,
-		private IFactory $l10nFactory) {
+		private IFactory $l10nFactory,
+	) {
 		$this->config = $config;
 		$this->manager = $manager;
 		$this->userManager = $userManager;
@@ -107,7 +109,7 @@ public function write(AppointmentConfig $config,
 
 		$end = $start->getTimestamp() + $config->getLength();
 		$tz = $this->timezoneGenerator->generateVTimezone($timezone, $start->getTimestamp(), $end);
-		if($tz) {
+		if ($tz) {
 			$vcalendar->add($tz);
 		}
 
@@ -172,7 +174,7 @@ public function write(AppointmentConfig $config,
 		try {
 			$calendar->createFromString($filename . '.ics', $vcalendar->serialize());
 		} catch (CalendarException $e) {
-			throw new RuntimeException('Could not write event  for appointment config id ' . $config->getId(). ' to calendar: ' . $e->getMessage(), 0, $e);
+			throw new RuntimeException('Could not write event  for appointment config id ' . $config->getId() . ' to calendar: ' . $e->getMessage(), 0, $e);
 		}
 
 		if ($config->getPreparationDuration() !== 0) {
@@ -189,7 +191,7 @@ public function write(AppointmentConfig $config,
 				]
 			]);
 			$tz = $this->timezoneGenerator->generateVTimezone($timezone, $prepStart->getTimestamp(), $start->getTimestamp());
-			if($tz) {
+			if ($tz) {
 				$prepCalendar->add($tz);
 			}
 
@@ -202,7 +204,7 @@ public function write(AppointmentConfig $config,
 			try {
 				$calendar->createFromString($prepFileName . '.ics', $prepCalendar->serialize());
 			} catch (CalendarException $e) {
-				throw new RuntimeException('Could not write event  for appointment config id ' . $config->getId(). ' to calendar: ' . $e->getMessage(), 0, $e);
+				throw new RuntimeException('Could not write event  for appointment config id ' . $config->getId() . ' to calendar: ' . $e->getMessage(), 0, $e);
 			}
 		}
 
@@ -222,7 +224,7 @@ public function write(AppointmentConfig $config,
 			]);
 
 			$tz = $this->timezoneGenerator->generateVTimezone($timezone, $followupStart->getTimestamp(), $followUpEnd->getTimestamp());
-			if($tz) {
+			if ($tz) {
 				$followUpCalendar->add($tz);
 			}
 
@@ -235,7 +237,7 @@ public function write(AppointmentConfig $config,
 			try {
 				$calendar->createFromString($followUpFilename . '.ics', $followUpCalendar->serialize());
 			} catch (CalendarException $e) {
-				throw new RuntimeException('Could not write event  for appointment config id ' . $config->getId(). ' to calendar: ' . $e->getMessage(), 0, $e);
+				throw new RuntimeException('Could not write event  for appointment config id ' . $config->getId() . ' to calendar: ' . $e->getMessage(), 0, $e);
 			}
 		}
 		return $vcalendar->serialize();

diff --git a/lib/Service/Appointments/DailyLimitFilter.php b/lib/Service/Appointments/DailyLimitFilter.php
@@ -21,7 +21,10 @@ class DailyLimitFilter {
 	/** @var IManager */
 	private $calendarManger;
 
-	public function __construct(IManager $calendarManger, private LoggerInterface $logger) {
+	public function __construct(
+		IManager $calendarManger,
+		private LoggerInterface $logger,
+	) {
 		$this->calendarManger = $calendarManger;
 	}
 
@@ -33,7 +36,7 @@ public function __construct(IManager $calendarManger, private LoggerInterface $l
 	 */
 	public function filter(AppointmentConfig $config, array $slots): array {
 		$this->logger->debug('Slots before daily limit filtering:' . count($slots), ['app' => 'calendar-appointments']);
-		if(empty($slots)) {
+		if (empty($slots)) {
 			return [];
 		}
 		// 0. If there is no limit then we don't have to filter anything

diff --git a/lib/Service/Appointments/EventConflictFilter.php b/lib/Service/Appointments/EventConflictFilter.php
@@ -39,7 +39,7 @@ public function __construct(IManager $calendarManager,
 	 */
 	public function filter(AppointmentConfig $config, array $slots): array {
 		$this->logger->debug('Slots before event conflict filtering:' . count($slots), ['app' => 'calendar-appointments']);
-		if(empty($slots)) {
+		if (empty($slots)) {
 			return [];
 		}
 		$query = $this->calendarManager->newQuery($config->getPrincipalUri());

diff --git a/lib/Service/Appointments/MailService.php b/lib/Service/Appointments/MailService.php
@@ -46,7 +46,8 @@ class MailService {
 
 	private IManager $notificationManager;
 
-	public function __construct(IMailer $mailer,
+	public function __construct(
+		IMailer $mailer,
 		IUserManager $userManager,
 		IL10N $l10n,
 		Defaults $defaults,
@@ -55,7 +56,8 @@ public function __construct(IMailer $mailer,
 		IDateTimeFormatter $dateFormatter,
 		IFactory $lFactory,
 		IManager $notificationManager,
-		private IConfig $userConfig) {
+		private IConfig $userConfig,
+	) {
 		$this->userManager = $userManager;
 		$this->mailer = $mailer;
 		$this->l10n = $l10n;

diff --git a/lib/Service/Appointments/SlotExtrapolator.php b/lib/Service/Appointments/SlotExtrapolator.php
@@ -12,7 +12,9 @@
 
 class SlotExtrapolator {
 
-	public function __construct(private LoggerInterface $logger) {
+	public function __construct(
+		private LoggerInterface $logger,
+	) {
 
 	}
 	/**
@@ -24,7 +26,7 @@ public function __construct(private LoggerInterface $logger) {
 	public function extrapolate(AppointmentConfig $config,
 		array $availabilityIntervals): array {
 		$this->logger->debug('Intervals before extrapolating:' . count($availabilityIntervals), ['app' => 'calendar-appointments']);
-		if(empty($availabilityIntervals)) {
+		if (empty($availabilityIntervals)) {
 			return [];
 		}
 		foreach ($availabilityIntervals as $availabilityInterval) {

diff --git a/tests/php/unit/bootstrap.php b/tests/php/unit/bootstrap.php
@@ -8,7 +8,7 @@
 	define('PHPUNIT_RUN', 1);
 }
 
-require_once __DIR__.'/../../../../../lib/base.php';
+require_once __DIR__ . '/../../../../../lib/base.php';
 
 \OC::$composerAutoloader->addPsr4('Test\\', OC::$SERVERROOT . '/tests/lib/', true);
 

diff --git a/vendor-bin/cs-fixer/composer.json b/vendor-bin/cs-fixer/composer.json
@@ -6,6 +6,6 @@
         "sort-packages": true
     },
     "require-dev": {
-        "nextcloud/coding-standard": "^1.2.3"
+        "nextcloud/coding-standard": "^1.3.1"
     }
 }
diff --git a/vendor-bin/cs-fixer/composer.lock b/vendor-bin/cs-fixer/composer.lock