Merge pull request #509 from owncloud/bump-php-version

Bump PHP phan to major version 5

.drone.star

@@ -212,7 +212,7 @@ config = {
             "federatedServerNeeded": True,
             "runCoreTests": True,
             "runAllSuites": True,
-            "numberOfParts": 8,
+            "numberOfParts": 4,
             "cron": "nightly",
         },
         "api-scality-artesca-remote-smoke": {
@@ -238,7 +238,7 @@ config = {
             "federatedServerNeeded": True,
             "runCoreTests": True,
             "runAllSuites": True,
-            "numberOfParts": 8,
+            "numberOfParts": 4,
             "cron": "nightly",
         },
     },

lib/s3storage.php

@@ -208,6 +208,8 @@ public function getVersions($urn) {
 				'Bucket' => $this->getBucket(),
 				'Prefix' => $urn
 			]);
+			// Phan does not understand that $list['Versions'] contains an array.
+			/* @phan-suppress-next-line PhanTypeMismatchArgumentInternal */
 			$versions = \array_filter($list['Versions'], static function ($v) use ($urn) {
 				return ($v['Key'] === $urn) && $v['IsLatest'] !== true;
 			});
@@ -242,6 +244,8 @@ public function getVersion($urn, $versionId) {
 				'Prefix' => $urn,
 				'VersionIdMarker' => $versionId
 			]);
+			// Phan does not understand that $list['Versions'] contains an array.
+			/* @phan-suppress-next-line PhanTypeMismatchArgumentInternal */
 			$versions = \array_filter($list['Versions'], static function ($v) use ($urn, $versionId) {
 				return ($v['Key'] === $urn) && $v['VersionId'] === $versionId;
 			});

lib/streamwrapper.php

@@ -661,11 +661,15 @@ private function openReadStream() {
 		$command = $client->getCommand('GetObject', $this->getOptions(true));
 		$command['@http']['stream'] = true;
 		$result = $client->execute($command);
-		$this->size = $result['ContentLength'];
+		$this->size = (int) $result['ContentLength'];
 		$this->body = $result['Body'];
 
 		// Wrap the body in a caching entity body if seeking is allowed
+		// Phan does not understand that Body can be a StreamInterface
+		// It thinks that body is just a string. Suppress the message.
+		/* @phan-suppress-next-line PhanNonClassMethodCall */
 		if ($this->getOption('seekable') && !$this->body->isSeekable()) {
+			/* @phan-suppress-next-line PhanTypeMismatchArgument */
 			$this->body = new CachingStream($this->body);
 		}
 
@@ -682,6 +686,9 @@ private function openAppendStream() {
 			// Get the body of the object and seek to the end of the stream
 			$client = $this->getClient();
 			$this->body = $client->getObject($this->getOptions(true))['Body'];
+			// Phan does not understand that Body can be a StreamInterface
+			// It thinks that body is just a string. Suppress the message.
+			/* @phan-suppress-next-line PhanNonClassMethodCall */
 			$this->body->seek(0, SEEK_END);
 			return true;
 		} catch (S3Exception $e) {
@@ -818,6 +825,12 @@ private function deleteSubfolder($path, $params) {
 
 		// Check if the bucket contains keys other than the placeholder
 		if ($contents = $result['Contents']) {
+			// Note: In PHP 7 if $contents is just a string, not an array, then
+			// \count($contents) will return 1 OK. From PHP 8.0 a TypeError is
+			// returned. Phan detects this possibility. Suppress for now.
+			// Phan also thinks that $contents should have numeric keys in the
+			// sub-arrays. Suppress that as well.
+			/* @phan-suppress-next-line PhanTypeMismatchArgumentInternal, PhanTypeMismatchDimFetch */
 			return (\count($contents) > 1 || $prefix != $contents[0]['Key'])
 				? $this->triggerError('Subfolder is not empty')
 				: $this->unlink(\rtrim($path, '/') . '/');

vendor-bin/phan/composer.json

@@ -1,5 +1,5 @@
 {
     "require": {
-        "phan/phan": "^4.0"
+        "phan/phan": "^5.2"
     }
 }