Merge branch 'trunk' of https://github.com/WordPress/performance into update/phpstan-level-6

westonruter · westonruter · commit 7e85330e7a04 · 2024-05-07T17:53:41.000-07:00
* 'trunk' of https://github.com/WordPress/performance: Add test case for when RGB values are too high Ensure RGB variable is int fix: avoid needless array allocation in rgb to hex conversion
diff --git a/plugins/dominant-color-images/class-dominant-color-image-editor-gd.php b/plugins/dominant-color-images/class-dominant-color-image-editor-gd.php
@@ -35,6 +35,9 @@ public function get_dominant_color() {
 		imagecopyresampled( $shorted_image, $this->image, 0, 0, 0, 0, 1, 1, imagesx( $this->image ), imagesy( $this->image ) );
 
 		$rgb = imagecolorat( $shorted_image, 0, 0 );
+		if ( false === $rgb ) {
+			return new WP_Error( 'image_editor_dominant_color_error', __( 'Dominant color detection failed.', 'dominant-color-images' ) );
+		}
 		$r   = ( $rgb >> 16 ) & 0xFF;
 		$g   = ( $rgb >> 8 ) & 0xFF;
 		$b   = $rgb & 0xFF;
diff --git a/plugins/dominant-color-images/helper.php b/plugins/dominant-color-images/helper.php
@@ -183,8 +183,11 @@ function dominant_color_has_transparency( int $attachment_id ): ?bool {
  * @return string|null Hex color or null if error.
  */
 function dominant_color_rgb_to_hex( int $red, int $green, int $blue ): ?string {
-	$range = range( 0, 255 );
-	if ( ! in_array( $red, $range, true ) || ! in_array( $green, $range, true ) || ! in_array( $blue, $range, true ) ) {
+	if ( ! (
+		$red >= 0 && $red <= 255
+		&& $green >= 0 && $green <= 255
+		&& $blue >= 0 && $blue <= 255
+	) ) {
 		return null;
 	}
 
diff --git a/tests/plugins/dominant-color-images/dominant-color-test.php b/tests/plugins/dominant-color-images/dominant-color-test.php
@@ -350,48 +350,54 @@ public function test_dominant_color_rgb_to_hex( int $red, int $green, int $blue,
 	/** @return array<string, mixed> */
 	public function provider_get_hex_color(): array {
 		return array(
-			'black'   => array(
+			'black'    => array(
 				'red'   => 0,
 				'green' => 0,
 				'blue'  => 0,
 				'hex'   => '000000',
 			),
-			'white'   => array(
+			'white'    => array(
 				'red'   => 255,
 				'green' => 255,
 				'blue'  => 255,
 				'hex'   => 'ffffff',
 			),
-			'blue'    => array(
+			'blue'     => array(
 				'red'   => 255,
 				'green' => 0,
 				'blue'  => 0,
 				'hex'   => 'ff0000',
 			),
-			'teal'    => array(
+			'teal'     => array(
 				'red'   => 255,
 				'green' => 255,
 				'blue'  => 0,
 				'hex'   => 'ffff00',
 			),
-			'pink'    => array(
+			'pink'     => array(
 				'red'   => 255,
 				'green' => 0,
 				'blue'  => 255,
 				'hex'   => 'ff00ff',
 			),
-			'purple'  => array(
+			'purple'   => array(
 				'red'   => 88,
 				'green' => 42,
 				'blue'  => 158,
 				'hex'   => '582a9e',
 			),
-			'invalid' => array(
+			'invalid1' => array(
 				'red'   => -1,
 				'green' => -1,
 				'blue'  => -1,
 				'hex'   => null,
 			),
+			'invalid2' => array(
+				'red'   => 256,
+				'green' => 256,
+				'blue'  => 256,
+				'hex'   => null,
+			),
 		);
 	}
 
