Merge pull request #57407 from nextcloud/carl/fix-php-85-deprecation-image

pull/54300/merge
Benjamin Gaussorgues 2026-01-08 13:57:11 +07:00 committed by GitHub
commit fe34ea5ec7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 0 additions and 5 deletions

@ -1137,9 +1137,6 @@ class Image implements IImage {
* Destroys the current image and resets the object
*/
public function destroy(): void {
if ($this->valid()) {
imagedestroy($this->resource);
}
$this->resource = false;
}

@ -117,7 +117,6 @@ class RootMountProviderTest extends TestCase {
$class = new \ReflectionClass($storage);
$prop = $class->getProperty('objectStore');
$prop->setAccessible(true);
/** @var S3 $objectStore */
$objectStore = $prop->getValue($storage);
$this->assertEquals('nextcloud0', $objectStore->getBucket());

@ -1539,7 +1539,6 @@ class ViewTest extends \Test\TestCase {
public function testHookPaths($root, $path, $shouldEmit): void {
$filesystemReflection = new \ReflectionClass(Filesystem::class);
$defaultRootValue = $filesystemReflection->getProperty('defaultInstance');
$defaultRootValue->setAccessible(true);
$oldRoot = $defaultRootValue->getValue();
$defaultView = new View('/foo/files');
$defaultRootValue->setValue(null, $defaultView);