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

2026-04-15 22:11:17 -04:00 · 2026-01-08 13:57:11 +01:00 · 2026-01-08 13:57:11 +01:00 · fe34ea5ec7
commit fe34ea5ec7
parent ae250777fd bd815595d4
3 changed files with 0 additions and 5 deletions
--- a/lib/private/Image.php
+++ b/lib/private/Image.php
@ -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;
 	}

--- a/tests/lib/Files/Mount/RootMountProviderTest.php
+++ b/tests/lib/Files/Mount/RootMountProviderTest.php
@ -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());
--- a/tests/lib/Files/ViewTest.php
+++ b/tests/lib/Files/ViewTest.php
@ -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);