upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-02-18 18:28:50 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

Merge pull request #56816 from nextcloud/jtr/chore-legacy-drop-mac-checker

Browse source
This commit is contained in:
Kate 2025-12-05 17:42:38 +01:00 committed by GitHub
commit 842df498e0
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 5 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib/private/Setup.php
View file

@ -185,10 +185,11 @@ class Setup {
}
}
if (\OC_Util::runningOnMac()) {
// Check if running directly on macOS (note: Linux containers on macOS will not trigger this)
if (PHP_OS_FAMILY === 'Darwin') {
$errors[] = [
'error' => $this->l10n->t(
'Mac OS X is not supported and %s will not work properly on this platform. '
'macOS is not supported and %s will not work properly on this platform. '
. 'Use it at your own risk!',
[$this->defaults->getProductName()]
),

9
lib/private/legacy/OC_Util.php
View file

@ -732,15 +732,6 @@ class OC_Util {
}
}
/**
* Checks whether the server is running on Mac OS X
*
* @return bool true if running on Mac OS X, false otherwise
*/
public static function runningOnMac() {
return (strtoupper(substr(PHP_OS, 0, 6)) === 'DARWIN');
}
/**
* Handles the case that there may not be a theme, then check if a "default"
* theme exists and take that one

8
tests/lib/Files/ViewTest.php
View file

@ -805,15 +805,11 @@ class ViewTest extends \Test\TestCase {
$ds = DIRECTORY_SEPARATOR;
/*
* 4096 is the maximum path length in file_cache.path in *nix
* 1024 is the max path length in mac
*/
$folderName = 'abcdefghijklmnopqrstuvwxyz012345678901234567890123456789';
$tmpdirLength = strlen(Server::get(ITempManager::class)->getTemporaryFolder());
if (\OC_Util::runningOnMac()) {
$depth = ((1024 - $tmpdirLength) / 57);
} else {
$depth = ((4000 - $tmpdirLength) / 57);
}
$depth = ((4000 - $tmpdirLength) / 57);
foreach (range(0, $depth - 1) as $i) {
$longPath .= $ds . $folderName;
$result = $rootView->mkdir($longPath);