feat: php8.3

.drone.star

@@ -4,7 +4,8 @@ MINIO_MC_RELEASE_2020_VERSION = "minio/mc:RELEASE.2020-12-10T01-26-17Z"
 OC_CI_ALPINE = "owncloudci/alpine:latest"
 OC_CI_BAZEL_BUILDIFIER = "owncloudci/bazel-buildifier"
 OC_CI_CEPH = "owncloudci/ceph:tag-build-master-jewel-ubuntu-16.04"
-OC_CI_CORE_NODEJS = "owncloudci/core:nodejs14"
+OC_CI_CORE = "owncloudci/core:php83"
+OC_CI_CORE_OLD = "owncloudci/core:nodejs14"
 OC_CI_DRONE_SKIP_PIPELINE = "owncloudci/drone-skip-pipeline"
 OC_CI_NODEJS = "owncloudci/nodejs:%s"
 OC_CI_ORACLE_XE = "owncloudci/oracle-xe:latest"
@@ -26,7 +27,7 @@ SONARSOURCE_SONAR_SCANNER_CLI = "sonarsource/sonar-scanner-cli:5"
 TOOLHIPPIE_CALENS = "toolhippie/calens:latest"
 WEBHIPPIE_REDIS = "webhippie/redis:latest"
 
-DEFAULT_PHP_VERSION = "7.4"
+DEFAULT_PHP_VERSION = "8.3"
 DEFAULT_NODEJS_VERSION = "14"
 
 # minio mc environment variables
@@ -67,7 +68,7 @@ config = {
                 DEFAULT_PHP_VERSION,
             ],
             # Gather coverage for all databases except Oracle
-            "coverage": True,
+            "coverage": False,
             "databases": [],
         },
         "slowDatabases": {
@@ -82,18 +83,6 @@ config = {
                 "oracle",
             ],
         },
-        "ubuntu22": {
-            "phpVersions": [
-                "7.4-ubuntu22.04",
-            ],
-            # These pipelines are run just to help avoid any obscure regression
-            # on Ubuntu 22.04. We do not need coverage for this.
-            "coverage": False,
-            "databases": [
-                "mariadb:10.6",
-                "mariadb:10.11",
-            ],
-        },
         "external-samba": {
             "phpVersions": [
                 DEFAULT_PHP_VERSION,
@@ -104,7 +93,7 @@ config = {
             "externalTypes": [
                 "samba",
             ],
-            "coverage": True,
+            "coverage": False,
             "extraCommandsBeforeTestRun": [
                 "ls -l /var/cache",
                 "mkdir /var/cache/samba",
@@ -124,7 +113,7 @@ config = {
                 "sftp",
                 "owncloud",
             ],
-            "coverage": True,
+            "coverage": False,
         },
     },
     "acceptance": {
@@ -248,10 +237,6 @@ config = {
             "testingRemoteSystem": False,
         },
         "cliEncryption": {
-            "phpVersions": [
-                DEFAULT_PHP_VERSION,
-                "7.4-ubuntu22.04",
-            ],
             "suites": [
                 "cliEncryption",
             ],
@@ -417,18 +402,6 @@ config = {
             "runAllSuites": True,
             "numberOfParts": 8,
         },
-        "apiUbuntu22": {
-            "phpVersions": [
-                "7.4-ubuntu22.04",
-            ],
-            "suites": {
-                "apiUbuntu22": "apiUbuntu22",
-            },
-            "useHttps": False,
-            "filterTags": "@smokeTest&&~@notifications-app-required&&~@local_storage&&~@files_external-app-required",
-            "runAllSuites": True,
-            "numberOfParts": 8,
-        },
         "apiOnSqlite": {
             "suites": {
                 "apiOnSqlite": "apiOnSqlite",
@@ -949,7 +922,7 @@ def javascript(ctx, withCoverage):
         return pipelines
 
     default = {
-        "coverage": True,
+        "coverage": False,
         "logLevel": "2",
         "skip": False,
     }
@@ -1056,7 +1029,7 @@ def phpTests(ctx, testType, withCoverage):
             "mariadb:10.6",
             "mariadb:10.11",
         ],
-        "coverage": True,
+        "coverage": False,
         "includeKeyInMatrixName": False,
         "logLevel": "2",
         "cephS3": False,
@@ -1092,7 +1065,7 @@ def phpTests(ctx, testType, withCoverage):
             "postgres:10.21",
             "oracle",
         ],
-        "coverage": True,
+        "coverage": False,
         "includeKeyInMatrixName": False,
         "logLevel": "2",
         "cephS3": False,
@@ -1150,15 +1123,18 @@ def phpTests(ctx, testType, withCoverage):
             else:
                 command = "unknown tbd"
 
-            # Shorten PHP docker tags that have longer names like 7.4-ubuntu22.04
-            phpVersionString = phpVersion.replace("-ubuntu", "-u")
+            # Get the first 3 characters of the PHP version (7.4 or 8.0 etc)
+            # And use that for constructing the pipeline name
+            # That helps shorten pipeline names when using owncloud-ci images
+            # that have longer names like 7.4-ubuntu20.04
+            phpMinorVersion = phpVersion[0:3]
 
             for db in params["databases"]:
                 for externalType in params["externalTypes"]:
                     keyString = "-" + category if params["includeKeyInMatrixName"] else ""
                     filesExternalType = externalType if externalType != "none" else ""
                     externalNameString = "-" + externalType if externalType != "none" else ""
-                    name = "%s%s-php%s-%s%s" % (testType, keyString, phpVersionString, getShortDbNameAndVersion(db), externalNameString)
+                    name = "%s%s-php%s-%s%s" % (testType, keyString, phpMinorVersion, getShortDbNameAndVersion(db), externalNameString)
                     maxLength = 50
                     nameLength = len(name)
                     if nameLength > maxLength:
@@ -1336,7 +1312,7 @@ def acceptance(ctx):
         "browsers": ["chrome"],
         "phpVersions": [DEFAULT_PHP_VERSION],
         "databases": ["mariadb:10.2"],
-        "federatedPhpVersion": DEFAULT_PHP_VERSION,
+        "federatedPhpVersion": 7.4,
         "federatedServerNeeded": False,
         "federatedDb": "",
         "filterTags": "",
@@ -1423,8 +1399,11 @@ def acceptance(ctx):
             for federatedServerVersion in params["federatedServerVersions"]:
                 for browser in params["browsers"]:
                     for phpVersion in params["phpVersions"]:
-                        # Shorten PHP docker tags that have longer names like 7.4-ubuntu22.04
-                        phpVersionString = phpVersion.replace("-ubuntu", "-u")
+                        # Get the first 3 characters of the PHP version (7.4 or 8.0 etc)
+                        # And use that for constructing the pipeline name
+                        # That helps shorten pipeline names when using owncloud-ci images
+                        # that have longer names like 7.4-ubuntu20.04
+                        phpMinorVersion = phpVersion[0:3]
                         for db in params["databases"]:
                             for runPart in range(1, params["numberOfParts"] + 1):
                                 debugPartsEnabled = (len(params["skipExceptParts"]) != 0)
@@ -1446,7 +1425,7 @@ def acceptance(ctx):
                                     keyString = "-" + category if params["includeKeyInMatrixName"] else ""
                                     partString = "" if params["numberOfParts"] == 1 else "-%d-%d" % (params["numberOfParts"], runPart)
                                     federatedServerVersionString = "-" + federatedServerVersion.replace("daily-", "").replace("-qa", "") if (federatedServerVersion != "") else ""
-                                    name = "%s%s%s%s%s-%s-php%s" % (alternateSuiteName, keyString, partString, federatedServerVersionString, browserString, getShortDbNameAndVersion(db), phpVersionString)
+                                    name = "%s%s%s%s%s-%s-php%s" % (alternateSuiteName, keyString, partString, federatedServerVersionString, browserString, getShortDbNameAndVersion(db), phpMinorVersion)
                                     maxLength = 50
                                     nameLength = len(name)
                                     if nameLength > maxLength:
@@ -2265,6 +2244,10 @@ def installServer(phpVersion, db, logLevel = "2", ssl = False, federatedServerNe
     }]
 
 def installAndConfigureFederated(ctx, federatedServerVersion, phpVersion, logLevel, protocol, db, dbSuffix = "fed"):
+    if (federatedServerVersion == "10.9.1"):
+        phpVersion = 7.4
+    if (federatedServerVersion == "latest"):
+        phpVersion = 7.4
     return [
         installFederated(ctx, federatedServerVersion, db, dbSuffix),
         configureFederated(phpVersion, logLevel, protocol),
@@ -2308,9 +2291,15 @@ def installFederated(ctx, federatedServerVersion, db, dbSuffix = "fed"):
     else:
         installerSettings["version"] = federatedServerVersion
 
+    image = OC_CI_CORE
+    if (federatedServerVersion == "10.9.1"):
+        image = OC_CI_CORE_OLD
+    if (federatedServerVersion == "latest"):
+        image = OC_CI_CORE_OLD
+
     return {
         "name": "install-federated",
-        "image": OC_CI_CORE_NODEJS,
+        "image": image,
         "settings": installerSettings,
     }
 
@@ -2495,7 +2484,7 @@ def installCoreFromTarball(version, db, logLevel = "2", ssl = False, federatedSe
 
     return [{
         "name": "install-tarball",
-        "image": OC_CI_CORE_NODEJS,
+        "image": OC_CI_CORE,
         "settings": {
             "version": version,
             "core_path": pathOfServerUnderTest,
@@ -2549,7 +2538,7 @@ def installFederatedFromTarball(federatedServerVersion, phpVersion, logLevel, pr
     return [
         {
             "name": "install-federated",
-            "image": OC_CI_CORE_NODEJS,
+            "image": OC_CI_CORE,
             "settings": {
                 "version": federatedServerVersion,
                 "core_path": dir["federated"],

.github/workflows/ci.yml

@@ -26,4 +26,4 @@ jobs:
     name: PHP Unit
     uses: ./.github/workflows/php-unit.yml
     with:
-      php-versions: '["7.4"]'
+      php-versions: '["8.3"]'

.github/workflows/lint-and-codestyle.yml

@@ -24,7 +24,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-version: ["7.4"]
+        php-version: ["8.3"]
     steps:
       - name: Checkout code
         uses: actions/checkout@v4

.github/workflows/php-unit.yml

@@ -19,13 +19,13 @@ jobs:
         php: ${{ fromJSON(inputs.php-versions) }}
         database: [sqlite]
         include:
-          - php: "7.4"
+          - php: "8.3"
             database: "mysql:8.0"
-          - php: "7.4"
+          - php: "8.3"
             database: "mariadb:10.6"
-          - php: "7.4"
+          - php: "8.3"
             database: "mariadb:10.11"
-          - php: "7.4"
+          - php: "8.3"
             database: "postgres:10.21"
 
     services:

apps/dav/lib/CalDAV/Schedule/IMipPlugin.php

@@ -41,21 +41,12 @@
  * @license http://sabre.io/license/ Modified BSD License
  */
 class IMipPlugin extends SabreIMipPlugin {
-	/** @var IMailer */
-	private $mailer;
-
-	/** @var ILogger */
-	private $logger;
-
-	/** @var IRequest */
-	private $request;
+	private IMailer $mailer;
+	private ILogger $logger;
+	private IRequest $request;
 
 	/**
 	 * Creates the email handler.
-	 *
-	 * @param IMailer $mailer
-	 * @param ILogger $logger
-	 * @param IRequest $request
 	 */
 	public function __construct(IMailer $mailer, ILogger $logger, IRequest $request) {
 		parent::__construct('');
@@ -123,14 +114,10 @@ public function schedule(ITip\Message $iTipMessage) {
 			->setFrom([$sender => $senderName])
 			->setTo([$recipient => $recipientName])
 			->setSubject($subject)
-			->setBody($iTipMessage->message->serialize(), $contentType);
+			->attach($iTipMessage->message->serialize(), "event.ics", $contentType);
 		try {
-			$failed = $this->mailer->send($message);
+			$this->mailer->send($message);
 			$iTipMessage->scheduleStatus = '1.1; Scheduling message is sent via iMip';
-			if ($failed) {
-				$this->logger->error('Unable to deliver message to {failed}', ['app' => 'dav', 'failed' =>  \implode(', ', $failed)]);
-				$iTipMessage->scheduleStatus = '5.0; EMail delivery failed';
-			}
 		} catch (\Exception $ex) {
 			$this->logger->logException($ex, ['app' => 'dav']);
 			$iTipMessage->scheduleStatus = '5.0; EMail delivery failed';

apps/dav/lib/Connector/Sabre/Principal.php

@@ -97,10 +97,10 @@ public function getPrincipalsByPrefix($prefixPath) {
 	 * getPrincipalsByPrefix.
 	 *
 	 * @param string $path
-	 * @return array
+	 * @return array|null
 	 */
-	public function getPrincipalByPath($path) {
-		list($prefix, $name) = \Sabre\Uri\split($path);
+	public function getPrincipalByPath($path): ?array {
+		[$prefix, $name] = \Sabre\Uri\split($path);
 
 		if ($prefix === $this->principalPrefix) {
 			$user = $this->userManager->get($name);
@@ -219,12 +219,12 @@ public function findByUri($uri, $principalPrefix) {
 	 * @param IUser $user
 	 * @return array
 	 */
-	protected function userToPrincipal($user) {
+	protected function userToPrincipal(IUser $user): array {
 		$userId = $user->getUID();
 		$displayName = $user->getDisplayName();
 		$principal = [
 				'uri' => $this->principalPrefix . '/' . $userId,
-				'{DAV:}displayname' => $displayName === null ? $userId : $displayName,
+				'{DAV:}displayname' => $displayName,
 		];
 
 		$email = $user->getEMailAddress();

apps/dav/lib/Server.php

@@ -179,7 +179,6 @@ public function __construct(IRequest $request, $baseUri) {
 			$acl->principalCollectionSet = [
 				'principals/users', 'principals/groups'
 			];
-			$acl->defaultUsernamePath = 'principals/users';
 			$this->server->addPlugin($acl);
 		}
 

apps/dav/lib/Upload/AssemblyStream.php

@@ -248,9 +248,12 @@ public static function wrap(array $nodes) {
 			'assembly' => [
 				'nodes' => $nodes]
 		]);
-		\stream_wrapper_register('assembly', '\OCA\DAV\Upload\AssemblyStream');
+		$existed = \in_array("assembly", stream_get_wrappers());
+		if (!$existed) {
+			\stream_wrapper_register('assembly', __CLASS__);
+		}
 		try {
-			$wrapped = \fopen('assembly://', 'r', null, $context);
+			$wrapped = \fopen('assembly://', 'r', false, $context);
 		} catch (\BadMethodCallException $e) {
 			\stream_wrapper_unregister('assembly');
 			throw $e;

apps/dav/tests/unit/CalDAV/CalendarTest.php

@@ -42,9 +42,9 @@ public function setUp(): void {
 		$this->l10n
 			->expects($this->any())
 			->method('t')
-			->will($this->returnCallback(function ($text, $parameters = []) {
+			->willReturnCallback(function ($text, $parameters = []) {
 				return \vsprintf($text, $parameters);
-			}));
+			});
 	}
 
 	public function testDelete() {