Merge pull request #7556 from getkirby/v6/refact/php-cleanup

bastianallgeier · web-flow · commit 8a9168d016cb · 2025-08-19T15:55:27.000+02:00
Remove unnecessary PHP code
diff --git a/src/Filesystem/Mime.php b/src/Filesystem/Mime.php
@@ -188,7 +188,6 @@ function_exists('finfo_file') === true &&
 		) {
 			$finfo = finfo_open(FILEINFO_MIME_TYPE);
 			$mime  = finfo_file($finfo, $file);
-			finfo_close($finfo);
 			return $mime;
 		}
 
diff --git a/src/Http/Remote.php b/src/Http/Remote.php
@@ -255,8 +255,6 @@ public function fetch(): static
 			throw new Exception($this->errorMessage, $this->errorCode);
 		}
 
-		curl_close($this->curl);
-
 		return $this;
 	}
 
diff --git a/src/Image/QrCode.php b/src/Image/QrCode.php
@@ -72,7 +72,6 @@ public function toDataUri(
 
 		ob_start();
 		imagepng($image);
-		imagedestroy($image);
 		$data = ob_get_contents();
 		ob_end_clean();
 
diff --git a/tests/Cache/CacheTest.php b/tests/Cache/CacheTest.php
@@ -18,7 +18,6 @@ public function testConstruct(): void
 	public function testKey(): void
 	{
 		$method = new ReflectionMethod(Cache::class, 'key');
-		$method->setAccessible(true);
 
 		$cache = new TestCache();
 		$this->assertSame('foo', $method->invoke($cache, 'foo'));
@@ -83,7 +82,6 @@ public function testEnabled(): void
 	public function testExpiration(): void
 	{
 		$method = new ReflectionMethod(Cache::class, 'expiration');
-		$method->setAccessible(true);
 
 		$cache = new TestCache();
 		$this->assertSame(0, $method->invoke($cache));
diff --git a/tests/Cache/FileCacheTest.php b/tests/Cache/FileCacheTest.php
@@ -61,7 +61,6 @@ public function testEnabledNotWritable(): void
 	public function testFile(): void
 	{
 		$method = new ReflectionMethod(FileCache::class, 'file');
-		$method->setAccessible(true);
 
 		$cache = new FileCache([
 			'root' => $root = static::TMP
diff --git a/tests/Cms/App/AppErrorsTest.php b/tests/Cms/App/AppErrorsTest.php
@@ -33,7 +33,6 @@ public function setUp(): void
 	public function tearDown(): void
 	{
 		$unsetMethod = new ReflectionMethod(App::class, 'unsetWhoopsHandler');
-		$unsetMethod->setAccessible(true);
 
 		$app = App::instance();
 		$unsetMethod->invoke($app);
@@ -60,7 +59,6 @@ public function testExceptionHook(): void
 		]);
 
 		$whoopsMethod = new ReflectionMethod(App::class, 'whoops');
-		$whoopsMethod->setAccessible(true);
 
 		$whoops  = $whoopsMethod->invoke($app);
 		$handler = $whoops->getHandlers()[1];
@@ -90,7 +88,6 @@ public function testExceptionHookDisableLogging(): void
 		]);
 
 		$whoopsMethod = new ReflectionMethod(App::class, 'whoops');
-		$whoopsMethod->setAccessible(true);
 
 		$whoops  = $whoopsMethod->invoke($app);
 		$handler = $whoops->getHandlers()[1];
@@ -109,10 +106,7 @@ public function testExceptionHookDisableLogging(): void
 	public function testHandleCliErrors(): void
 	{
 		$whoopsMethod = new ReflectionMethod(App::class, 'whoops');
-		$whoopsMethod->setAccessible(true);
-
-		$testMethod = new ReflectionMethod(App::class, 'handleCliErrors');
-		$testMethod->setAccessible(true);
+		$testMethod   = new ReflectionMethod(App::class, 'handleCliErrors');
 
 		$app    = App::instance();
 		$whoops = $whoopsMethod->invoke($app);
@@ -127,10 +121,7 @@ public function testHandleCliErrors(): void
 	public function testHandleErrors1(): void
 	{
 		$whoopsMethod = new ReflectionMethod(App::class, 'whoops');
-		$whoopsMethod->setAccessible(true);
-
-		$testMethod = new ReflectionMethod(App::class, 'handleErrors');
-		$testMethod->setAccessible(true);
+		$testMethod   = new ReflectionMethod(App::class, 'handleErrors');
 
 		$app = $this->app->clone([
 			'cli' => true
@@ -148,10 +139,7 @@ public function testHandleErrors1(): void
 	public function testHandleErrors2(): void
 	{
 		$whoopsMethod = new ReflectionMethod(App::class, 'whoops');
-		$whoopsMethod->setAccessible(true);
-
-		$testMethod = new ReflectionMethod(App::class, 'handleErrors');
-		$testMethod->setAccessible(true);
+		$testMethod   = new ReflectionMethod(App::class, 'handleErrors');
 
 		$app = $this->app->clone([
 			'cli' => false,
@@ -172,10 +160,7 @@ public function testHandleErrors2(): void
 	public function testHandleErrors3(): void
 	{
 		$whoopsMethod = new ReflectionMethod(App::class, 'whoops');
-		$whoopsMethod->setAccessible(true);
-
-		$testMethod = new ReflectionMethod(App::class, 'handleErrors');
-		$testMethod->setAccessible(true);
+		$testMethod   = new ReflectionMethod(App::class, 'handleErrors');
 
 		$app = $this->app->clone([
 			'cli' => false,
@@ -201,10 +186,7 @@ public function testHandleErrors3(): void
 	public function testHandleErrorsGlobalSetting(): void
 	{
 		$whoopsMethod = new ReflectionMethod(App::class, 'whoops');
-		$whoopsMethod->setAccessible(true);
-
-		$testMethod = new ReflectionMethod(App::class, 'handleErrors');
-		$testMethod->setAccessible(true);
+		$testMethod   = new ReflectionMethod(App::class, 'handleErrors');
 
 		$whoopsEnabled  = $whoopsMethod->invoke($this->app);
 		$whoopsDisabled = $whoopsMethod->invoke($this->originalApp);
@@ -230,14 +212,9 @@ public function testHandleErrorsGlobalSetting(): void
 
 	public function testHandleHtmlErrors(): void
 	{
-		$whoopsMethod = new ReflectionMethod(App::class, 'whoops');
-		$whoopsMethod->setAccessible(true);
-
+		$whoopsMethod  = new ReflectionMethod(App::class, 'whoops');
 		$optionsMethod = new ReflectionMethod(App::class, 'optionsFromProps');
-		$optionsMethod->setAccessible(true);
-
-		$testMethod = new ReflectionMethod(App::class, 'handleHtmlErrors');
-		$testMethod->setAccessible(true);
+		$testMethod    = new ReflectionMethod(App::class, 'handleHtmlErrors');
 
 		$app    = App::instance();
 		$whoops = $whoopsMethod->invoke($app);
@@ -304,14 +281,9 @@ public function testHandleHtmlErrors(): void
 
 	public function testHandleJsonErrors(): void
 	{
-		$whoopsMethod = new ReflectionMethod(App::class, 'whoops');
-		$whoopsMethod->setAccessible(true);
-
+		$whoopsMethod  = new ReflectionMethod(App::class, 'whoops');
 		$optionsMethod = new ReflectionMethod(App::class, 'optionsFromProps');
-		$optionsMethod->setAccessible(true);
-
-		$testMethod = new ReflectionMethod(App::class, 'handleJsonErrors');
-		$testMethod->setAccessible(true);
+		$testMethod    = new ReflectionMethod(App::class, 'handleJsonErrors');
 
 		$app    = App::instance();
 		$whoops = $whoopsMethod->invoke($app);
@@ -381,13 +353,8 @@ public function testHandleJsonErrors(): void
 	public function testSetUnsetWhoopsHandler(): void
 	{
 		$whoopsMethod = new ReflectionMethod(App::class, 'whoops');
-		$whoopsMethod->setAccessible(true);
-
-		$setMethod = new ReflectionMethod(App::class, 'setWhoopsHandler');
-		$setMethod->setAccessible(true);
-
-		$unsetMethod = new ReflectionMethod(App::class, 'unsetWhoopsHandler');
-		$unsetMethod->setAccessible(true);
+		$setMethod    = new ReflectionMethod(App::class, 'setWhoopsHandler');
+		$unsetMethod  = new ReflectionMethod(App::class, 'unsetWhoopsHandler');
 
 		$app    = App::instance();
 		$whoops = $whoopsMethod->invoke($app);
@@ -414,7 +381,6 @@ public function testSetUnsetWhoopsHandler(): void
 	public function testWhoops(): void
 	{
 		$whoopsMethod = new ReflectionMethod(App::class, 'whoops');
-		$whoopsMethod->setAccessible(true);
 
 		$app = App::instance();
 
diff --git a/tests/Cms/App/AppTest.php b/tests/Cms/App/AppTest.php
@@ -597,8 +597,7 @@ public function testOptionsOnReady(): void
 			'slugs'        => 'de'
 		], $app->options());
 
-		$whoopsMethod = new ReflectionMethod(App::class, 'whoops');
-		$whoopsMethod->setAccessible(true);
+		$whoopsMethod  = new ReflectionMethod(App::class, 'whoops');
 		$whoopsHandler = $whoopsMethod->invoke($app)->getHandlers()[0];
 		$this->assertInstanceOf(PrettyPageHandler::class, $whoopsHandler);
 
diff --git a/tests/Cms/System/LicenseTest.php b/tests/Cms/System/LicenseTest.php
@@ -260,7 +260,6 @@ public function testNormalizeDomain(string $domain, string $expected): void
 	{
 		$reflector = new ReflectionClass(License::class);
 		$normalize = $reflector->getMethod('normalizeDomain');
-		$normalize->setAccessible(true);
 
 		$license = new License();
 
diff --git a/tests/Database/DbTest.php b/tests/Database/DbTest.php
@@ -92,7 +92,6 @@ public function testConnection(): void
 	public function testTable(): void
 	{
 		$tableProp = new ReflectionProperty(Query::class, 'table');
-		$tableProp->setAccessible(true);
 
 		$query = Db::table('users');
 		$this->assertInstanceOf(Query::class, $query);
diff --git a/tests/Image/Darkroom/GdLibTest.php b/tests/Image/Darkroom/GdLibTest.php
@@ -70,7 +70,6 @@ public function testSharpen(): void
 		$gd = new GdLib();
 
 		$method = new ReflectionMethod($gd::class, 'sharpen');
-		$method->setAccessible(true);
 
 		$simpleImage = new SimpleImageMock();
 
@@ -86,7 +85,6 @@ public function testSharpenWithoutValue(): void
 		$gd = new GdLib();
 
 		$method = new ReflectionMethod($gd::class, 'sharpen');
-		$method->setAccessible(true);
 
 		$simpleImage = new SimpleImageMock();
 
diff --git a/tests/Image/Darkroom/ImageMagickTest.php b/tests/Image/Darkroom/ImageMagickTest.php
@@ -55,7 +55,6 @@ public function testSharpen(): void
 		$im = new ImageMagick();
 
 		$method = new ReflectionMethod($im::class, 'sharpen');
-		$method->setAccessible(true);
 
 		$result = $method->invoke($im, '', [
 			'sharpen' => 50
@@ -69,7 +68,6 @@ public function testSharpenWithoutValue(): void
 		$im = new ImageMagick();
 
 		$method = new ReflectionMethod($im::class, 'sharpen');
-		$method->setAccessible(true);
 
 		$result = $method->invoke($im, '', [
 			'sharpen' => null
diff --git a/tests/Image/ExifTest.php b/tests/Image/ExifTest.php
@@ -109,14 +109,12 @@ public function testParseTimestampDateTimeOriginal(): void
 		// changing protected property $data via Reflection class
 		$ref = new ReflectionClass($exif);
 		$data = $ref->getProperty('data');
-		$data->setAccessible(true);
 		$options = $data->getValue($exif);
 		$options['DateTimeOriginal'] = '11.12.2016 11:13:14';
 		$data->setValue($exif, $options);
 
 		// setting protected method public
 		$parse = $ref->getMethod('parseTimestamp');
-		$parse->setAccessible(true);
 
 		$this->assertSame((string)strtotime('11.12.2016 11:13:14'), $parse->invoke($exif));
 	}
diff --git a/tests/Image/QrCodeTest.php b/tests/Image/QrCodeTest.php
@@ -177,7 +177,6 @@ protected function imageContent(GdImage $image): string
 	{
 		ob_start();
 		imagepng($image);
-		imagedestroy($image);
 		$data = ob_get_contents();
 		ob_end_clean();
 		return $data;
diff --git a/tests/Session/AutoSessionTest.php b/tests/Session/AutoSessionTest.php
@@ -32,10 +32,8 @@ public function testSessionsOptions(): void
 	{
 		$autoSessionReflector = new ReflectionClass(AutoSession::class);
 		$sessionsProperty = $autoSessionReflector->getProperty('sessions');
-		$sessionsProperty->setAccessible(true);
 		$fileSessionStoreReflector = new ReflectionClass(FileSessionStore::class);
 		$pathProperty = $fileSessionStoreReflector->getProperty('path');
-		$pathProperty->setAccessible(true);
 
 		// store object as store
 		$autoSession = new AutoSession($this->store);
diff --git a/tests/Session/FileSessionStoreTest.php b/tests/Session/FileSessionStoreTest.php
@@ -29,9 +29,7 @@ public function setUp(): void
 		// make internal data accessible
 		$reflector = new ReflectionClass(FileSessionStore::class);
 		$this->storeHandles = $reflector->getProperty('handles');
-		$this->storeHandles->setAccessible(true);
 		$this->storeIsLocked = $reflector->getProperty('isLocked');
-		$this->storeIsLocked->setAccessible(true);
 
 		// demo files
 		F::write(static::TMP . '/.gitignore', "*\n!.gitignore");
diff --git a/tests/Session/SessionStoreTest.php b/tests/Session/SessionStoreTest.php
@@ -14,7 +14,6 @@ public function testGenerateId(): void
 		// get a reference to the protected method
 		$reflector = new ReflectionClass(SessionStore::class);
 		$generateId = $reflector->getMethod('generateId');
-		$generateId->setAccessible(true);
 
 		$id1 = $generateId->invoke(null);
 		$this->assertStringMatchesFormat('%x', $id1);
diff --git a/tests/Session/SessionTest.php b/tests/Session/SessionTest.php
@@ -45,7 +45,6 @@ public function testCreate(): void
 	{
 		$reflector = new ReflectionClass(Session::class);
 		$activityProperty = $reflector->getProperty('lastActivity');
-		$activityProperty->setAccessible(true);
 
 		// defaults
 		$session = new Session($this->sessions, null, []);
@@ -283,7 +282,6 @@ public function testTimeout(): void
 	{
 		$reflector = new ReflectionClass(Session::class);
 		$activityProperty = $reflector->getProperty('lastActivity');
-		$activityProperty->setAccessible(true);
 
 		$session = new Session($this->sessions, null, [
 			'timeout' => 1234
@@ -572,7 +570,6 @@ public function testRegenerateToken(): void
 	{
 		$sessionsReflector = new ReflectionClass(Sessions::class);
 		$cache = $sessionsReflector->getProperty('cache');
-		$cache->setAccessible(true);
 
 		$token = '9999999999.valid.' . $this->store->validKey;
 		$session = new Session($this->sessions, $token, []);
@@ -619,7 +616,6 @@ public function testRegenerateTokenHeaderMode(): void
 	{
 		$sessionsReflector = new ReflectionClass(Sessions::class);
 		$cache = $sessionsReflector->getProperty('cache');
-		$cache->setAccessible(true);
 
 		$token = '9999999999.valid.' . $this->store->validKey;
 		$session = new Session($this->sessions, $token, ['mode' => 'header']);
@@ -687,9 +683,7 @@ public function testParseToken(): void
 	{
 		$reflector = new ReflectionClass(Session::class);
 		$parseToken = $reflector->getMethod('parseToken');
-		$parseToken->setAccessible(true);
 		$tokenKey = $reflector->getProperty('tokenKey');
-		$tokenKey->setAccessible(true);
 
 		$session = new Session($this->sessions, null, []);
 		$this->assertNull($session->token());
@@ -727,7 +721,6 @@ public function testParseTokenInvalidToken3(): void
 
 		$reflector = new ReflectionClass(Session::class);
 		$parseToken = $reflector->getMethod('parseToken');
-		$parseToken->setAccessible(true);
 
 		$session = new Session($this->sessions, null, []);
 		$this->assertNull($session->token());
@@ -739,7 +732,6 @@ public function testTimeToTimestamp(): void
 	{
 		$reflector = new ReflectionClass(Session::class);
 		$timeToTimestamp = $reflector->getMethod('timeToTimestamp');
-		$timeToTimestamp->setAccessible(true);
 
 		$this->assertSame(1234567890, $timeToTimestamp->invoke(null, 1234567890));
 		$this->assertSame(1234567890, $timeToTimestamp->invoke(null, 1234567890, 1357924680));
@@ -754,7 +746,6 @@ public function testTimeToTimestampInvalidParam(): void
 
 		$reflector = new ReflectionClass(Session::class);
 		$timeToTimestamp = $reflector->getMethod('timeToTimestamp');
-		$timeToTimestamp->setAccessible(true);
 
 		$timeToTimestamp->invoke(null, ['tomorrow']);
 	}
@@ -765,7 +756,6 @@ public function testTimeToTimestampInvalidTimeString(): void
 
 		$reflector = new ReflectionClass(Session::class);
 		$timeToTimestamp = $reflector->getMethod('timeToTimestamp');
-		$timeToTimestamp->setAccessible(true);
 
 		$timeToTimestamp->invoke(null, ['some gibberish that is definitely no valid time']);
 	}
@@ -1027,7 +1017,6 @@ public function testInitAutoActivity1(): void
 
 		$reflector = new ReflectionClass(Session::class);
 		$activityProperty = $reflector->getProperty('lastActivity');
-		$activityProperty->setAccessible(true);
 		$this->assertSame($session->data()->get('expectedActivity'), $activityProperty->getValue($session));
 	}
 
@@ -1046,7 +1035,6 @@ public function testInitAutoActivity2(): void
 
 		$reflector = new ReflectionClass(Session::class);
 		$activityProperty = $reflector->getProperty('lastActivity');
-		$activityProperty->setAccessible(true);
 		$newActivity = $activityProperty->getValue($session);
 		$this->assertGreaterThan($session->data()->get('expectedActivity') - 5, $newActivity);
 		$this->assertLessThan($session->data()->get('expectedActivity') + 5, $newActivity);
@@ -1092,7 +1080,6 @@ protected function assertWriteMode(bool $expected, Session $session): void
 	{
 		$reflector = new ReflectionClass(Session::class);
 		$writeModeProperty = $reflector->getProperty('writeMode');
-		$writeModeProperty->setAccessible(true);
 
 		$this->assertSame($expected, $writeModeProperty->getValue($session));
 	}
diff --git a/tests/Session/SessionsTest.php b/tests/Session/SessionsTest.php
diff --git a/tests/Template/SlotTest.php b/tests/Template/SlotTest.php
diff --git a/tests/Template/SnippetTest.php b/tests/Template/SnippetTest.php

Original file line number	Diff line number	Diff line change
`@@ -188,7 +188,6 @@ function_exists('finfo_file') === true &&`
`188`	`188`	`) {`
`189`	`189`	`$finfo = finfo_open(FILEINFO_MIME_TYPE);`
`190`	`190`	`$mime = finfo_file($finfo, $file);`
`191`		`- finfo_close($finfo);`
`192`	`191`	`return $mime;`
`193`	`192`	`}`
`194`	`193`
Original file line number	Diff line number	Diff line change
`@@ -255,8 +255,6 @@ public function fetch(): static`
`255`	`255`	`throw new Exception($this->errorMessage, $this->errorCode);`
`256`	`256`	`}`
`257`	`257`
`258`		`- curl_close($this->curl);`
`259`		`-`
`260`	`258`	`return $this;`
`261`	`259`	`}`
`262`	`260`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,6 @@ public function testConstruct(): void`
`18`	`18`	`public function testKey(): void`
`19`	`19`	`{`
`20`	`20`	`$method = new ReflectionMethod(Cache::class, 'key');`
`21`		`- $method->setAccessible(true);`
`22`	`21`
`23`	`22`	`$cache = new TestCache();`
`24`	`23`	`$this->assertSame('foo', $method->invoke($cache, 'foo'));`
`@@ -83,7 +82,6 @@ public function testEnabled(): void`
`83`	`82`	`public function testExpiration(): void`
`84`	`83`	`{`
`85`	`84`	`$method = new ReflectionMethod(Cache::class, 'expiration');`
`86`		`- $method->setAccessible(true);`
`87`	`85`
`88`	`86`	`$cache = new TestCache();`
`89`	`87`	`$this->assertSame(0, $method->invoke($cache));`
Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,6 @@ public function testEnabledNotWritable(): void`
`61`	`61`	`public function testFile(): void`
`62`	`62`	`{`
`63`	`63`	`$method = new ReflectionMethod(FileCache::class, 'file');`
`64`		`- $method->setAccessible(true);`
`65`	`64`
`66`	`65`	`$cache = new FileCache([`
`67`	`66`	`'root' => $root = static::TMP`
Original file line number	Diff line number	Diff line change
`@@ -260,7 +260,6 @@ public function testNormalizeDomain(string $domain, string $expected): void`
`260`	`260`	`{`
`261`	`261`	`$reflector = new ReflectionClass(License::class);`
`262`	`262`	`$normalize = $reflector->getMethod('normalizeDomain');`
`263`		`- $normalize->setAccessible(true);`
`264`	`263`
`265`	`264`	`$license = new License();`
`266`	`265`
Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,6 @@ public function testConnection(): void`
`92`	`92`	`public function testTable(): void`
`93`	`93`	`{`
`94`	`94`	`$tableProp = new ReflectionProperty(Query::class, 'table');`
`95`		`- $tableProp->setAccessible(true);`
`96`	`95`
`97`	`96`	`$query = Db::table('users');`
`98`	`97`	`$this->assertInstanceOf(Query::class, $query);`