Merge pull request #4547 from apphp/master

marcovtwout · web-flow · commit cbd0fd6cb5c0 · 2024-02-01T11:56:10.000+01:00
fix/static method Imagick::queryFormats should not be called dynamically
diff --git a/CHANGELOG b/CHANGELOG
@@ -4,6 +4,7 @@
 Version 1.1.30 under development
 --------------------------------
 
+- Bug #4547: PHP 8 compatibility: Fix deprecation in CCaptcha when using Imagick extension (apphp)
 - Bug #4541: PHP 8 compatibility: Fix deprecation in MarkdownParser (mdeweerd)
 - Bug #4544: PHP 8 compatibility: Fix deprecation in CLocale (apphp)
 
diff --git a/framework/web/widgets/captcha/CCaptcha.php b/framework/web/widgets/captcha/CCaptcha.php
@@ -168,8 +168,7 @@ public static function checkRequirements($extension=null)
 	{
 		if(extension_loaded('imagick'))
 		{
-			$imagick=new Imagick();
-			$imagickFormats=$imagick->queryFormats('PNG');
+			$imagickFormats=Imagick::queryFormats('PNG');
 		}
 		if(extension_loaded('gd'))
 		{

Original file line number	Diff line number	Diff line change
`@@ -168,8 +168,7 @@ public static function checkRequirements($extension=null)`
`168`	`168`	`{`
`169`	`169`	`if(extension_loaded('imagick'))`
`170`	`170`	`{`
`171`		`- $imagick=new Imagick();`
`172`		`- $imagickFormats=$imagick->queryFormats('PNG');`
	`171`	`+ $imagickFormats=Imagick::queryFormats('PNG');`
`173`	`172`	`}`
`174`	`173`	`if(extension_loaded('gd'))`
`175`	`174`	`{`