[stable25] Fix 32bit support and add workflow for 32bits testing

This backports most changes from: #36120 Excludes union type, supported by PHP 8.x only replaced with phpdoc in case. Signed-off-by: MichaIng <[email protected]>
nextcloud · Apr 24, 2023 · 2a0d48e · 2a0d48e
1 parent 0a1f9bc
commit 2a0d48e
Show file tree

Hide file tree

Showing 56 changed files with 223 additions and 91 deletions.
diff --git a/apps/dav/lib/Connector/Sabre/Node.php b/apps/dav/lib/Connector/Sabre/Node.php
@@ -44,14 +44,13 @@
 use OCP\Files\FileInfo;
 use OCP\Files\IRootFolder;
 use OCP\Files\StorageNotAvailableException;
-use OCP\Share\IShare;
 use OCP\Share\Exceptions\ShareNotFound;
 use OCP\Share\IManager;
 
 abstract class Node implements \Sabre\DAV\INode {
 
 	/**
-	 * @var \OC\Files\View
+	 * @var View
 	 */
 	protected $fileView;
 
@@ -70,7 +69,7 @@ abstract class Node implements \Sabre\DAV\INode {
 	protected $property_cache = null;
 
 	/**
-	 * @var \OCP\Files\FileInfo
+	 * @var FileInfo
 	 */
 	protected $info;
 
@@ -84,8 +83,8 @@ abstract class Node implements \Sabre\DAV\INode {
 	/**
 	 * Sets up the node, expects a full path name
 	 *
-	 * @param \OC\Files\View $view
-	 * @param \OCP\Files\FileInfo $info
+	 * @param View $view
+	 * @param FileInfo $info
 	 * @param IManager $shareManager
 	 */
 	public function __construct(View $view, FileInfo $info, IManager $shareManager = null) {
@@ -109,8 +108,12 @@ public function __construct(View $view, FileInfo $info, IManager $shareManager =
 		}
 	}
 
-	protected function refreshInfo() {
-		$this->info = $this->fileView->getFileInfo($this->path);
+	protected function refreshInfo(): void {
+		$info = $this->fileView->getFileInfo($this->path);
+		if ($info === false) {
+			throw new \Sabre\DAV\Exception('Failed to get fileinfo for '. $this->path);
+		}
+		$this->info = $info;
 		$root = \OC::$server->get(IRootFolder::class);
 		if ($this->info->getType() === FileInfo::TYPE_FOLDER) {
 			$this->node = new Folder($root, $this->fileView, $this->path, $this->info);
@@ -233,7 +236,8 @@ public function setUploadTime(int $time) {
 	/**
 	 * Returns the size of the node, in bytes
 	 *
-	 * @return integer
+	 * @psalm-suppress ImplementedReturnTypeMismatch \Sabre\DAV\IFile::getSize signature does not support 32bit
+	 * @return int|float
 	 */
 	public function getSize() {
 		return $this->info->getSize();

diff --git a/apps/dav/lib/Connector/Sabre/QuotaPlugin.php b/apps/dav/lib/Connector/Sabre/QuotaPlugin.php
@@ -178,7 +178,7 @@ public function beforeCopy(string $sourcePath, string $destinationPath): bool {
 	 * This method is called before any HTTP method and validates there is enough free space to store the file
 	 *
 	 * @param string $path relative to the users home
-	 * @param int $length
+	 * @param int|float|null $length
 	 * @throws InsufficientStorage
 	 * @return bool
 	 */

diff --git a/apps/dav/lib/Direct/DirectFile.php b/apps/dav/lib/Direct/DirectFile.php
@@ -77,6 +77,10 @@ public function getETag() {
 		return $this->file->getEtag();
 	}
 
+	/**
+	 * @psalm-suppress ImplementedReturnTypeMismatch \Sabre\DAV\IFile::getSize signature does not support 32bit
+	 * @return int|float
+	 */
 	public function getSize() {
 		$this->getFile();
 

diff --git a/apps/dav/lib/Upload/UploadFile.php b/apps/dav/lib/Upload/UploadFile.php
@@ -29,7 +29,6 @@
 use Sabre\DAV\IFile;
 
 class UploadFile implements IFile {
-
 	/**  @var File */
 	private $file;
 
@@ -53,6 +52,10 @@ public function getETag() {
 		return $this->file->getETag();
 	}
 
+	/**
+	 * @psalm-suppress ImplementedReturnTypeMismatch \Sabre\DAV\IFile::getSize signature does not support 32bit
+	 * @return int|float
+	 */
 	public function getSize() {
 		return $this->file->getSize();
 	}

diff --git a/apps/dav/tests/unit/CalDAV/CalDavBackendTest.php b/apps/dav/tests/unit/CalDAV/CalDavBackendTest.php
@@ -423,7 +423,12 @@ public function testCalendarQuery($expectedEventsInResult, $propFilters, $compFi
 		$events[0] = $this->createEvent($calendarId, '20130912T130000Z', '20130912T140000Z');
 		$events[1] = $this->createEvent($calendarId, '20130912T150000Z', '20130912T170000Z');
 		$events[2] = $this->createEvent($calendarId, '20130912T173000Z', '20130912T220000Z');
-		$events[3] = $this->createEvent($calendarId, '21130912T130000Z', '22130912T130000Z');
+		if (PHP_INT_SIZE > 8) {
+			$events[3] = $this->createEvent($calendarId, '21130912T130000Z', '22130912T130000Z');
+		} else {
+			/* On 32bit we do not support events after 2038 */
+			$events[3] = $this->createEvent($calendarId, '20370912T130000Z', '20370912T130000Z');
+		}
 
 		$result = $this->backend->calendarQuery($calendarId, [
 			'name' => '',
@@ -471,7 +476,7 @@ public function providesCalendarQueryParameters() {
 			'only-events' => [[0, 1, 2, 3], [], [['name' => 'VEVENT', 'is-not-defined' => false, 'comp-filters' => [], 'time-range' => ['start' => null, 'end' => null], 'prop-filters' => []]],],
 			'start' => [[1, 2, 3], [], [['name' => 'VEVENT', 'is-not-defined' => false, 'comp-filters' => [], 'time-range' => ['start' => new DateTime('2013-09-12 14:00:00', new DateTimeZone('UTC')), 'end' => null], 'prop-filters' => []]],],
 			'end' => [[0], [], [['name' => 'VEVENT', 'is-not-defined' => false, 'comp-filters' => [], 'time-range' => ['start' => null, 'end' => new DateTime('2013-09-12 14:00:00', new DateTimeZone('UTC'))], 'prop-filters' => []]],],
-			'future' => [[3], [], [['name' => 'VEVENT', 'is-not-defined' => false, 'comp-filters' => [], 'time-range' => ['start' => new DateTime('2099-09-12 14:00:00', new DateTimeZone('UTC')), 'end' => null], 'prop-filters' => []]],],
+			'future' => [[3], [], [['name' => 'VEVENT', 'is-not-defined' => false, 'comp-filters' => [], 'time-range' => ['start' => new DateTime('2036-09-12 14:00:00', new DateTimeZone('UTC')), 'end' => null], 'prop-filters' => []]],],
 		];
 	}
 
@@ -648,8 +653,15 @@ public function testScheduling($objectData) {
 	 * @dataProvider providesCalDataForGetDenormalizedData
 	 */
 	public function testGetDenormalizedData($expected, $key, $calData) {
-		$actual = $this->backend->getDenormalizedData($calData);
-		$this->assertEquals($expected, $actual[$key]);
+		try {
+			$actual = $this->backend->getDenormalizedData($calData);
+			$this->assertEquals($expected, $actual[$key]);
+		} catch (\ValueError $e) {
+			if (($e->getMessage() === 'Epoch doesn\'t fit in a PHP integer') && (PHP_INT_SIZE < 8)) {
+				$this->markTestSkipped('This fail on 32bits because of PHP limitations in DateTime');
+			}
+			throw $e;
+		}
 	}
 
 	public function providesCalDataForGetDenormalizedData() {

diff --git a/apps/dav/tests/unit/Connector/Sabre/FilesPluginTest.php b/apps/dav/tests/unit/Connector/Sabre/FilesPluginTest.php
@@ -228,13 +228,13 @@ public function testGetPropertiesForFile() {
 		$this->assertEquals('00000123instanceid', $propFind->get(self::FILEID_PROPERTYNAME));
 		$this->assertEquals('123', $propFind->get(self::INTERNAL_FILEID_PROPERTYNAME));
 		$this->assertEquals('1973-11-29T21:33:09+00:00', $propFind->get(self::CREATIONDATE_PROPERTYNAME));
-		$this->assertEquals(null, $propFind->get(self::SIZE_PROPERTYNAME));
+		$this->assertEquals(0, $propFind->get(self::SIZE_PROPERTYNAME));
 		$this->assertEquals('DWCKMSR', $propFind->get(self::PERMISSIONS_PROPERTYNAME));
 		$this->assertEquals('http://example.com/', $propFind->get(self::DOWNLOADURL_PROPERTYNAME));
 		$this->assertEquals('foo', $propFind->get(self::OWNER_ID_PROPERTYNAME));
 		$this->assertEquals('M. Foo', $propFind->get(self::OWNER_DISPLAY_NAME_PROPERTYNAME));
 		$this->assertEquals('my_fingerprint', $propFind->get(self::DATA_FINGERPRINT_PROPERTYNAME));
-		$this->assertEquals([self::SIZE_PROPERTYNAME], $propFind->get404Properties());
+		$this->assertEquals([], $propFind->get404Properties());
 	}
 
 	public function testGetPropertiesStorageNotAvailable() {

diff --git a/apps/dav/tests/unit/Connector/Sabre/FilesReportPluginTest.php b/apps/dav/tests/unit/Connector/Sabre/FilesReportPluginTest.php
@@ -259,6 +259,8 @@ public function testOnReport() {
 		$filesNode2 = $this->getMockBuilder(File::class)
 			->disableOriginalConstructor()
 			->getMock();
+		$filesNode2->method('getSize')
+			->willReturn(10);
 
 		$this->userFolder->expects($this->at(0))
 			->method('getById')

diff --git a/apps/files/appinfo/routes.php b/apps/files/appinfo/routes.php
@@ -40,7 +40,7 @@
 use OCA\Files\Controller\OpenLocalEditorController;
 
 /** @var Application $application */
-$application = \OC::$server->query(Application::class);
+$application = \OC::$server->get(Application::class);
 $application->registerRoutes(
 	$this,
 	[

diff --git a/apps/files/tests/HelperTest.php b/apps/files/tests/HelperTest.php
@@ -93,7 +93,10 @@ public function sortDataProvider() {
 	/**
 	 * @dataProvider sortDataProvider
 	 */
-	public function testSortByName($sort, $sortDescending, $expectedOrder) {
+	public function testSortByName(string $sort, bool $sortDescending, array $expectedOrder) {
+		if (($sort === 'mtime') && (PHP_INT_SIZE < 8)) {
+			$this->markTestSkipped('Skip mtime sorting on 32bit');
+		}
 		$files = self::getTestFileList();
 		$files = \OCA\Files\Helper::sortFiles($files, $sort, $sortDescending);
 		$fileNames = [];

diff --git a/apps/files_external/lib/Lib/Storage/FTP.php b/apps/files_external/lib/Lib/Storage/FTP.php
@@ -140,6 +140,9 @@ public function filemtime($path) {
 		}
 	}
 
+	/**
+	 * @return false|int|float
+	 */
 	public function filesize($path) {
 		$result = $this->getConnection()->size($this->buildPath($path));
 		if ($result === -1) {

diff --git a/apps/files_sharing/tests/ApiTest.php b/apps/files_sharing/tests/ApiTest.php
@@ -205,6 +205,9 @@ public function testCreateShareGroupFolder() {
 		$ocs->cleanup();
 	}
 
+	/**
+	 * @group RoutingWeirdness
+	 */
 	public function testCreateShareLink() {
 		$ocs = $this->createOCS(self::TEST_FILES_SHARING_API_USER1);
 		$result = $ocs->createShare($this->folder, \OCP\Constants::PERMISSION_ALL, IShare::TYPE_LINK);
@@ -228,6 +231,9 @@ public function testCreateShareLink() {
 		$ocs->cleanup();
 	}
 
+	/**
+	 * @group RoutingWeirdness
+	 */
 	public function testCreateShareLinkPublicUpload() {
 		$ocs = $this->createOCS(self::TEST_FILES_SHARING_API_USER1);
 		$result = $ocs->createShare($this->folder, \OCP\Constants::PERMISSION_ALL, IShare::TYPE_LINK, null, 'true');
@@ -420,6 +426,7 @@ public function testGetAllSharesWithMe() {
 
 	/**
 	 * @medium
+	 * @group RoutingWeirdness
 	 */
 	public function testPublicLinkUrl() {
 		$ocs = $this->createOCS(self::TEST_FILES_SHARING_API_USER1);
@@ -1291,6 +1298,7 @@ public function datesProvider() {
 	 * Make sure only ISO 8601 dates are accepted
 	 *
 	 * @dataProvider datesProvider
+	 * @group RoutingWeirdness
 	 */
 	public function testPublicLinkExpireDate($date, $valid) {
 		$ocs = $this->createOCS(self::TEST_FILES_SHARING_API_USER1);
@@ -1321,6 +1329,9 @@ public function testPublicLinkExpireDate($date, $valid) {
 		$this->shareManager->deleteShare($share);
 	}
 
+	/**
+	 * @group RoutingWeirdness
+	 */
 	public function testCreatePublicLinkExpireDateValid() {
 		$config = \OC::$server->getConfig();
 

diff --git a/apps/files_trashbin/lib/Sabre/AbstractTrash.php b/apps/files_trashbin/lib/Sabre/AbstractTrash.php
@@ -57,7 +57,11 @@ public function getFileInfo(): FileInfo {
 		return $this->data;
 	}
 
-	public function getSize(): int {
+	/**
+	 * @psalm-suppress ImplementedReturnTypeMismatch \Sabre\DAV\IFile::getSize signature does not support 32bit
+	 * @return int|float
+	 */
+	public function getSize() {
 		return $this->data->getSize();
 	}
 

diff --git a/apps/files_trashbin/lib/Sabre/ITrash.php b/apps/files_trashbin/lib/Sabre/ITrash.php
@@ -39,6 +39,10 @@ public function getTitle(): string;
 
 	public function getDeletionTime(): int;
 
+	/**
+	 * @psalm-suppress ImplementedReturnTypeMismatch \Sabre\DAV\IFile::getSize signature does not support 32bit
+	 * @return int|float
+	 */
 	public function getSize();
 
 	public function getFileId(): int;

diff --git a/apps/files_trashbin/tests/BackgroundJob/ExpireTrashTest.php b/apps/files_trashbin/tests/BackgroundJob/ExpireTrashTest.php
@@ -33,7 +33,6 @@
 use OCP\IUserManager;
 use PHPUnit\Framework\MockObject\MockObject;
 use Test\TestCase;
-use Psr\Log\LoggerInterface;
 
 class ExpireTrashTest extends TestCase {
 	/** @var IConfig|MockObject */
@@ -61,7 +60,7 @@ protected function setUp(): void {
 
 		$this->time = $this->createMock(ITimeFactory::class);
 		$this->time->method('getTime')
-			->willReturn(99999999999);
+			->willReturn(999999999);
 
 		$this->jobList->expects($this->once())
 			->method('setLastRun');

diff --git a/apps/files_versions/lib/Sabre/VersionFile.php b/apps/files_versions/lib/Sabre/VersionFile.php
@@ -65,7 +65,11 @@ public function getETag(): string {
 		return (string)$this->version->getRevisionId();
 	}
 
-	public function getSize(): int {
+	/**
+	 * @psalm-suppress ImplementedReturnTypeMismatch \Sabre\DAV\IFile::getSize signature does not support 32bit
+	 * @return int|float
+	 */
+	public function getSize() {
 		return $this->version->getSize();
 	}
 

diff --git a/apps/files_versions/lib/Versions/IVersion.php b/apps/files_versions/lib/Versions/IVersion.php
@@ -65,10 +65,10 @@ public function getTimestamp(): int;
 	/**
 	 * Get the size of this version
 	 *
-	 * @return int
+	 * @return int|float
 	 * @since 15.0.0
 	 */
-	public function getSize(): int;
+	public function getSize();
 
 	/**
 	 * Get the name of the source file at the time of making this version

diff --git a/apps/files_versions/lib/Versions/Version.php b/apps/files_versions/lib/Versions/Version.php
@@ -38,7 +38,7 @@ class Version implements IVersion {
 	/** @var string */
 	private $name;
 
-	/** @var int */
+	/** @var int|float */
 	private $size;
 
 	/** @var string */
@@ -56,11 +56,14 @@ class Version implements IVersion {
 	/** @var IUser */
 	private $user;
 
+	/**
+	 * @param int|float $size
+	 */
 	public function __construct(
 		int $timestamp,
 		$revisionId,
 		string $name,
-		int $size,
+		$size,
 		string $mimetype,
 		string $path,
 		FileInfo $sourceFileInfo,
@@ -94,7 +97,11 @@ public function getTimestamp(): int {
 		return $this->timestamp;
 	}
 
-	public function getSize(): int {
+	/**
+	 * @psalm-suppress ImplementedReturnTypeMismatch \Sabre\DAV\IFile::getSize signature does not support 32bit
+	 * @return int|float
+	 */
+	public function getSize() {
 		return $this->size;
 	}
 

diff --git a/apps/files_versions/tests/BackgroundJob/ExpireVersionsTest.php b/apps/files_versions/tests/BackgroundJob/ExpireVersionsTest.php
@@ -33,7 +33,6 @@
 use Test\TestCase;
 
 class ExpireVersionsTest extends TestCase {
-
 	/** @var IConfig|MockObject */
 	private $config;
 
@@ -70,7 +69,7 @@ public function testBackgroundJobDeactivated(): void {
 		$timeFactory = $this->createMock(ITimeFactory::class);
 		$timeFactory->method('getTime')
 			->with()
-			->willReturn(99999999999);
+			->willReturn(999999999);
 
 		$job = new ExpireVersions($this->config, $this->userManager, $this->expiration, $timeFactory);
 		$job->start($this->jobList);

diff --git a/apps/provisioning_api/tests/Controller/UsersControllerTest.php b/apps/provisioning_api/tests/Controller/UsersControllerTest.php
@@ -73,7 +73,6 @@
 use Test\TestCase;
 
 class UsersControllerTest extends TestCase {
-
 	/** @var IUserManager|MockObject */
 	protected $userManager;
 	/** @var IConfig|MockObject */
@@ -497,7 +496,7 @@ public function testAddUserSuccessfulGenerateUserID() {
 			->method('generate')
 			->with(10)
 			->willReturnCallback(function () {
-				return (string)rand(1000000000, 9999999999);
+				return (string)rand(100000000, 999999999);
 			});
 
 		$this->assertTrue(key_exists(

diff --git a/core/Command/Log/File.php b/core/Command/Log/File.php
@@ -122,7 +122,6 @@ protected function validateRotateSize(&$rotateSize) {
 		if ($rotateSize === false) {
 			throw new \InvalidArgumentException('Error parsing log rotation file size');
 		}
-		$rotateSize = (int) $rotateSize;
 		if ($rotateSize < 0) {
 			throw new \InvalidArgumentException('Log rotation file size must be non-negative');
 		}

diff --git a/lib/private/Archive/Archive.php b/lib/private/Archive/Archive.php
@@ -50,7 +50,7 @@ abstract public function rename(string $source, string $dest): bool;
 
 	/**
 	 * get the uncompressed size of a file in the archive
-	 * @return int|false
+	 * @return int|float|false
 	 */
 	abstract public function filesize(string $path);