cleanups

jakubmisek · jakubmisek · commit cb06f4a43675 · 2025-06-30T15:42:05.000+02:00
diff --git a/src/Peachpie.Library.Graphics/Exif.cs b/src/Peachpie.Library.Graphics/Exif.cs
@@ -130,9 +130,8 @@ static PhpValue ExifValueToPhpValue(object value)
         {
             if (value != null)
             {
-                if (value is Array)
+                if (value is Array arr)
                 {
-                    var arr = (Array)value;
                     var phparr = new PhpArray(arr.Length);
 
                     for (int i = 0; i < arr.Length; i++)
@@ -171,15 +170,15 @@ static bool TryAsDouble(object value, out double dval)
         {
             dval = 0.0;
 
-            if (value is float)
+            if (value is float f)
             {
-                dval = (float)value;
+                dval = f;
                 return true;
             }
 
-            if (value is double)
+            if (value is double d)
             {
-                dval = (double)value;
+                dval = d;
                 return true;
             }
 
@@ -190,45 +189,45 @@ static bool TryAsLong(object value, out long ival)
         {
             ival = 0;
 
-            if (value is int)
+            if (value is int i)
             {
-                ival = (int)value;
+                ival = i;
                 return true;
             }
 
-            if (value is long)
+            if (value is long l)
             {
-                ival = (long)value;
+                ival = l;
                 return true;
             }
 
-            if (value is uint)
+            if (value is uint u)
             {
-                ival = (uint)value;
+                ival = u;
                 return true;
             }
 
-            if (value is byte)
+            if (value is byte b)
             {
-                ival = (byte)value;
+                ival = b;
                 return true;
             }
 
-            if (value is sbyte)
+            if (value is sbyte sb)
             {
-                ival = (sbyte)value;
+                ival = sb;
                 return true;
             }
 
-            if (value is short)
+            if (value is short s)
             {
-                ival = (short)value;
+                ival = s;
                 return true;
             }
 
-            if (value is ushort)
+            if (value is ushort us)
             {
-                ival = (ushort)value;
+                ival = us;
                 return true;
             }
 
@@ -260,14 +259,7 @@ public static string exif_tagname(int index)
             //}
             //return null;
 
-            if (GetExifTagMap().TryGetValue((ushort)index, out var name))
-            {
-                return name;
-            }
-            else
-            {
-                return null;
-            }
+            return GetExifTagMap().GetValueOrDefault((ushort)index);
         }
 
         /// <summary>
@@ -284,7 +276,7 @@ Dictionary<ushort, string> BuildMap()
                 var props = typeof(ExifTag).GetProperties();
                 foreach (var p in props)
                 {
-                    if (p.GetMethod.IsStatic && p.GetValue(null) is ExifTag exiftag)
+                    if (p.GetMethod?.IsStatic == true && p.GetValue(null) is ExifTag exiftag)
                     {
                         map[(ushort)exiftag] = exiftag.ToString();
                     }
diff --git a/src/Peachpie.Library.Graphics/PhpGd2.cs b/src/Peachpie.Library.Graphics/PhpGd2.cs
@@ -1,14 +1,11 @@
 ﻿using System;
-using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
-using System.Linq;
 using System.Numerics;
 using Pchp.Core;
 using Pchp.Library.Streams;
 using SixLabors.Fonts;
 using SixLabors.ImageSharp;
-using SixLabors.ImageSharp.Advanced;
 using SixLabors.ImageSharp.Drawing;
 using SixLabors.ImageSharp.Drawing.Processing;
 using SixLabors.ImageSharp.Formats;
@@ -53,7 +50,7 @@ public static class PhpGd2
         public const string GD_EXTRA_VERSION = ""; //"beta";
 
         /// <summary>
-        /// When the bundled version of GD is used this is 1 otherwise its set to 0.
+        /// When the bundled version of GD is used, this is 1 otherwise it's set to 0.
         /// </summary>
         public const int GD_BUNDLED = 1;
 
@@ -186,12 +183,12 @@ public enum FilledArcStyles
         public enum ColorValues
         {
             /// <summary>
-            /// Special color option which can be used in stead of color allocated with <see cref="imagecolorallocate"/> or <see cref="imagecolorallocatealpha"/>.
+            /// Special color option which can be used instead of color allocated with <see cref="imagecolorallocate"/> or <see cref="imagecolorallocatealpha"/>.
             /// </summary>
             STYLED = -2,
 
             /// <summary>
-            /// Special color option which can be used in stead of color allocated with <see cref="imagecolorallocate"/> or <see cref="imagecolorallocatealpha"/>.
+            /// Special color option which can be used instead of color allocated with <see cref="imagecolorallocate"/> or <see cref="imagecolorallocatealpha"/>.
             /// </summary>
             BRUSHED = -3,
 
@@ -227,51 +224,51 @@ public enum ColorValues
         public enum FilterTypes
         {
             /// <summary>
-            /// Special GD filter used by the <see cref="imagefilter(PhpResource,int)"/> function.
+            /// Special GD filter used by the <see cref="imagefilter"/> function.
             /// </summary>
             NEGATE,
             /// <summary>
-            /// Special GD filter used by the <see cref="imagefilter(PhpResource,int)"/> function.
+            /// Special GD filter used by the <see cref="imagefilter"/> function.
             /// </summary>
             GRAYSCALE,
             /// <summary>
-            /// Special GD filter used by the <see cref="imagefilter(PhpResource,int)"/> function.
+            /// Special GD filter used by the <see cref="imagefilter"/> function.
             /// </summary>
             BRIGHTNESS,
             /// <summary>
-            /// Special GD filter used by the <see cref="imagefilter(PhpResource,int)"/> function.
+            /// Special GD filter used by the <see cref="imagefilter"/> function.
             /// </summary>
             CONTRAST,
             /// <summary>
-            /// Special GD filter used by the <see cref="imagefilter(PhpResource,int)"/> function.
+            /// Special GD filter used by the <see cref="imagefilter"/> function.
             /// </summary>
             COLORIZE,
             /// <summary>
-            /// Special GD filter used by the <see cref="imagefilter(PhpResource,int)"/> function.
+            /// Special GD filter used by the <see cref="imagefilter"/> function.
             /// </summary>
             EDGEDETECT,
             /// <summary>
-            /// Special GD filter used by the <see cref="imagefilter(PhpResource,int)"/> function.
+            /// Special GD filter used by the <see cref="imagefilter"/> function.
             /// </summary>
             EMBOSS,
             /// <summary>
-            /// Special GD filter used by the <see cref="imagefilter(PhpResource,int)"/> function.
+            /// Special GD filter used by the <see cref="imagefilter"/> function.
             /// </summary>
             GAUSSIAN_BLUR,
             /// <summary>
-            /// Special GD filter used by the <see cref="imagefilter(PhpResource,int)"/> function.
+            /// Special GD filter used by the <see cref="imagefilter"/> function.
             /// </summary>
             SELECTIVE_BLUR,
             /// <summary>
-            /// Special GD filter used by the <see cref="imagefilter(PhpResource,int)"/> function.
+            /// Special GD filter used by the <see cref="imagefilter"/> function.
             /// </summary>
             MEAN_REMOVAL,
             /// <summary>
-            /// Special GD filter used by the <see cref="imagefilter(PhpResource,int)"/> function.
+            /// Special GD filter used by the <see cref="imagefilter"/> function.
             /// </summary>
             SMOOTH,
             /// <summary>
-            /// Special GD filter used by the <see cref="imagefilter(PhpResource,int)"/> function.
+            /// Special GD filter used by the <see cref="imagefilter"/> function.
             /// </summary>
             PIXELATE,
         }
@@ -1032,8 +1029,13 @@ public static bool imagerectangle(PhpResource im, int x1, int y1, int x2, int y2
 
             var rect = new RectangleF(x1, y1, x2 - x1, y2 - y1);
 
-            var opt = new DrawingOptions();
-            opt.GraphicsOptions.Antialias = img.AntiAlias;
+            var opt = new DrawingOptions
+            {
+                GraphicsOptions =
+                {
+                    Antialias = img.AntiAlias
+                }
+            };
 
             img.Image.Mutate(o => o.Draw(opt, FromRGBA(col), 1.0f, rect));
 
@@ -1356,8 +1358,8 @@ public static bool imagegd(PhpResource im)
         /// </summary>
         /// <param name="ctx">Runtime context.</param>
         /// <param name="im">Image resource.</param>
-        /// <param name="to">Optional. Filename or stream. If not specified the function saves the image to output stream.</param>
-        /// <param name="saveaction">Callback that actually save the image to given stream. Called when all checks pass.</param>
+        /// <param name="to">Optional. Filename or stream. If not specified, the function saves the image to output stream.</param>
+        /// <param name="saveaction">Callback that actually saves the image to given stream. Called when all checks pass.</param>
         /// <returns>True if save succeeded.</returns>
         static bool imagesave(Context ctx, PhpResource im, PhpValue to/* = null*/, Action<Image<Rgba32>, Stream> saveaction)
         {

Original file line number	Diff line number	Diff line change
`@@ -130,9 +130,8 @@ static PhpValue ExifValueToPhpValue(object value)`
`130`	`130`	`{`
`131`	`131`	`if (value != null)`
`132`	`132`	`{`
`133`		`- if (value is Array)`
	`133`	`+ if (value is Array arr)`
`134`	`134`	`{`
`135`		`- var arr = (Array)value;`
`136`	`135`	`var phparr = new PhpArray(arr.Length);`
`137`	`136`
`138`	`137`	`for (int i = 0; i < arr.Length; i++)`
`@@ -171,15 +170,15 @@ static bool TryAsDouble(object value, out double dval)`
`171`	`170`	`{`
`172`	`171`	`dval = 0.0;`
`173`	`172`
`174`		`- if (value is float)`
	`173`	`+ if (value is float f)`
`175`	`174`	`{`
`176`		`- dval = (float)value;`
	`175`	`+ dval = f;`
`177`	`176`	`return true;`
`178`	`177`	`}`
`179`	`178`
`180`		`- if (value is double)`
	`179`	`+ if (value is double d)`
`181`	`180`	`{`
`182`		`- dval = (double)value;`
	`181`	`+ dval = d;`
`183`	`182`	`return true;`
`184`	`183`	`}`
`185`	`184`
`@@ -190,45 +189,45 @@ static bool TryAsLong(object value, out long ival)`
`190`	`189`	`{`
`191`	`190`	`ival = 0;`
`192`	`191`
`193`		`- if (value is int)`
	`192`	`+ if (value is int i)`
`194`	`193`	`{`
`195`		`- ival = (int)value;`
	`194`	`+ ival = i;`
`196`	`195`	`return true;`
`197`	`196`	`}`
`198`	`197`
`199`		`- if (value is long)`
	`198`	`+ if (value is long l)`
`200`	`199`	`{`
`201`		`- ival = (long)value;`
	`200`	`+ ival = l;`
`202`	`201`	`return true;`
`203`	`202`	`}`
`204`	`203`
`205`		`- if (value is uint)`
	`204`	`+ if (value is uint u)`
`206`	`205`	`{`
`207`		`- ival = (uint)value;`
	`206`	`+ ival = u;`
`208`	`207`	`return true;`
`209`	`208`	`}`
`210`	`209`
`211`		`- if (value is byte)`
	`210`	`+ if (value is byte b)`
`212`	`211`	`{`
`213`		`- ival = (byte)value;`
	`212`	`+ ival = b;`
`214`	`213`	`return true;`
`215`	`214`	`}`
`216`	`215`
`217`		`- if (value is sbyte)`
	`216`	`+ if (value is sbyte sb)`
`218`	`217`	`{`
`219`		`- ival = (sbyte)value;`
	`218`	`+ ival = sb;`
`220`	`219`	`return true;`
`221`	`220`	`}`
`222`	`221`
`223`		`- if (value is short)`
	`222`	`+ if (value is short s)`
`224`	`223`	`{`
`225`		`- ival = (short)value;`
	`224`	`+ ival = s;`
`226`	`225`	`return true;`
`227`	`226`	`}`
`228`	`227`
`229`		`- if (value is ushort)`
	`228`	`+ if (value is ushort us)`
`230`	`229`	`{`
`231`		`- ival = (ushort)value;`
	`230`	`+ ival = us;`
`232`	`231`	`return true;`
`233`	`232`	`}`
`234`	`233`
`@@ -260,14 +259,7 @@ public static string exif_tagname(int index)`
`260`	`259`	`//}`
`261`	`260`	`//return null;`
`262`	`261`
`263`		`- if (GetExifTagMap().TryGetValue((ushort)index, out var name))`
`264`		`- {`
`265`		`- return name;`
`266`		`- }`
`267`		`- else`
`268`		`- {`
`269`		`- return null;`
`270`		`- }`
	`262`	`+ return GetExifTagMap().GetValueOrDefault((ushort)index);`
`271`	`263`	`}`
`272`	`264`
`273`	`265`	`/// <summary>`
`@@ -284,7 +276,7 @@ Dictionary<ushort, string> BuildMap()`
`284`	`276`	`var props = typeof(ExifTag).GetProperties();`
`285`	`277`	`foreach (var p in props)`
`286`	`278`	`{`
`287`		`- if (p.GetMethod.IsStatic && p.GetValue(null) is ExifTag exiftag)`
	`279`	`+ if (p.GetMethod?.IsStatic == true && p.GetValue(null) is ExifTag exiftag)`
`288`	`280`	`{`
`289`	`281`	`map[(ushort)exiftag] = exiftag.ToString();`
`290`	`282`	`}`