Changeset 57652

Timestamp:

02/18/2024 02:57:23 PM (3 years ago)

Author:

swissspidy

Message:

Editor: Prevent PHP warning when parsing duotone hue values.

Props jacobcassidy, rahmohn, mukesh27.
Fixes #59496.

Location:

trunk

Files:

• src/wp-includes/class-wp-duotone.php (modified) (1 diff)
• tests/phpunit/tests/block-supports/duotone.php (modified) (2 diffs)

trunk/src/wp-includes/class-wp-duotone.php

@@ -210 +210 @@
                 );
 
-                $factor = $angle_units[ $unit ];
-                if ( ! $factor ) {
-                        $factor = 1;
-                }
+                $factor = isset( $angle_units[ $unit ] ) ? $angle_units[ $unit ] : 1;
 
                 return (float) $value * $factor;

trunk/tests/phpunit/tests/block-supports/duotone.php

@@ -6 +6 @@
  * @group block-supports
  *
- * @package WordPress
+ * @coversDefaultClass WP_Duotone
  */
 
@@ -167 +167 @@
                 );
         }
+
+        /**
+         * @dataProvider data_colord_parse_hue
+         * @ticket 59496
+         */
+        public function test_colord_parse_hue( $value, $unit, $expected ) {
+                $reflection = new ReflectionMethod( 'WP_Duotone', 'colord_parse_hue' );
+                $reflection->setAccessible( true );
+
+                $this->assertSame( $expected, $reflection->invoke( null, $value, $unit ) );
+        }
+
+        /**
+         * Data provider.
+         *
+         * @return array[].
+         */
+        public function data_colord_parse_hue() {
+                return array(
+                        'deg-angle-unit'                => array( 120, 'deg', 120.0 ),
+                        'grad-angle-unit'               => array( 120, 'grad', 108.0 ),
+                        'turn-angle-unit'               => array( 120, 'turn', 43200.0 ),
+                        'rad-angle-unit'                => array( 120, 'rad', 6875.493541569878 ),
+                        'empty-angle-unit'              => array( 120, '', 120.0 ),
+                        'invalid-angle-unit'            => array( 120, 'invalid', 120.0 ),
+                        'negative-value-deg-angle-unit' => array( -120, 'deg', -120.0 ),
+                );
+        }
 }