Skip to content

Commit cffbae6

Browse files
chore: make php-cs happy
Signed-off-by: Josh <[email protected]>
1 parent f5c8977 commit cffbae6

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

lib/private/Setup.php

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -245,8 +245,8 @@ private function createHtaccessTestFile(string $dataDir): string|false {
245245
/**
246246
* Check whether the .htaccess protection is effective for the given data directory.
247247
*
248-
* Creates a temporary file (htaccesstest.txt) under $dataDir and performs an HTTP
249-
* probe. Bypassed under some scenarios (see code) when unnecessary or to avoid false
248+
* Creates a temporary file (htaccesstest.txt) under $dataDir and performs an HTTP
249+
* probe. Bypassed under some scenarios (see code) when unnecessary or to avoid false
250250
* negatives.
251251
*
252252
* @return bool True when .htaccess protection appears to work, false otherwise.
@@ -272,7 +272,7 @@ public function isHtaccessWorking(string $dataDir): bool {
272272
// Create a temporary htaccess test file
273273
$testContent = $this->createHtaccessTestFile($dataDir);
274274
if ($testContent === false) { // File already exists for some reason
275-
// Note: createHtaccessTestFile() passes up a HintException for most real-world
275+
// Note: createHtaccessTestFile() passes up a HintException for most real-world
276276
// failure scenarios which we currently expect our caller to handle.
277277
return false;
278278
}
@@ -557,10 +557,10 @@ private static function findWebRoot(SystemConfig $config): string {
557557
}
558558

559559
/**
560-
* Update the default (installation provided) .htaccess by inserting or overwriting
561-
* the non-static section (ErrorDocument and optional front end controller) while
560+
* Update the default (installation provided) .htaccess by inserting or overwriting
561+
* the non-static section (ErrorDocument and optional front end controller) while
562562
* preserving all static (install artifact) content above the preservation marker.
563-
*
563+
*
564564
* Runs regardless of web server in use, but only effective on Apache web servers.
565565
*
566566
* TODO: Make this no longer static (looks easy; few calls)
@@ -574,7 +574,7 @@ public static function updateHtaccess(): bool {
574574
// The distributed .htaccess file is required
575575
if (!is_writable($htaccessPath)
576576
|| !is_readable($htaccessPath)
577-
) {
577+
) {
578578
// cannot update .htaccess (bad permissions or it is missing)
579579
return false;
580580
}
@@ -610,21 +610,21 @@ public static function updateHtaccess(): bool {
610610
$newContent .= "\nErrorDocument 403 " . $webRoot . '/index.php/error/403';
611611
$newContent .= "\nErrorDocument 404 " . $webRoot . '/index.php/error/404';
612612

613-
// RewriteBase tells mod_rewrite the URL base for the rules in this
613+
// RewriteBase tells mod_rewrite the URL base for the rules in this
614614
// .htaccess file. It is required when Nextcloud is served from a subpath (so the
615615
// rewrite rules generate and match the correct prefixed request paths). It
616616
// also enables "pretty" URLs by routing most requests to the primary front
617617
// controller (index.php).
618618
//
619619
// When served from the document root, RewriteBase is usually not required,
620-
// though some specific server setups may still need it. In Nextcloud, setting
620+
// though some specific server setups may still need it. In Nextcloud, setting
621621
// htaccess.RewriteBase to '/' (instead of leaving it empty or unconfigured) is
622622
// the trigger that causes updateHtaccess() to write the bundled rewrite rules
623623
// and thus enable "pretty" URLs for root installs.
624624

625625
$rewriteBase = $config->getValue('htaccess.RewriteBase', '');
626626
// Notes:
627-
// - Equivalent handling may be provided by the web server (e.g. nginx location
627+
// - Equivalent handling may be provided by the web server (e.g. nginx location
628628
// / Apache vhost blocks) even without this.
629629
// - This is not the entire Nextcloud .htaccess file; these are merely appended
630630
// to the base file distributed with each release.

0 commit comments

Comments
 (0)