Refactor attributes validation for <progress> element (#23)

Author: xemlock

library/HTMLPurifier/AttrDef/HTML/ProgressValue.php

@@ -0,0 +1,28 @@
+<?php
+
+/**
+ * Post-transform performing validations for <progress> elements ensuring
+ * that if value is present, it is within a valid range (0..1) or (0..max)
+ */
+class HTMLPurifier_AttrTransform_Progress extends HTMLPurifier_AttrTransform
+{
+    /**
+     * @param array $attr
+     * @param HTMLPurifier_Config $config
+     * @param HTMLPurifier_Context $context
+     * @return array
+     */
+    public function transform($attr, $config, $context)
+    {
+        if (isset($attr['value'])) {
+            $max = isset($attr['max']) ? (float) $attr['max'] : 1;
+            $value = (float) $attr['value'];
+
+            if ($value < 0 || $value > $max) {
+                $this->confiscateAttr($attr, 'value');
+            }
+        }
+
+        return $attr;
+    }
+}

library/HTMLPurifier/AttrTransform/Progress.php

@@ -2,7 +2,7 @@
 
 class HTMLPurifier_HTML5Config extends HTMLPurifier_Config
 {
-    const REVISION = 2018061501;
+    const REVISION = 2018061701;
 
     /**
      * @param  string|array|HTMLPurifier_Config $config

library/HTMLPurifier/HTML5Config.php

@@ -117,11 +117,11 @@ public static function setup(HTMLPurifier_HTMLDefinition $def)
         $def->addElement('summary', false, 'Flow', 'Common');
 
         // https://html.spec.whatwg.org/dev/form-elements.html#the-progress-element
-        $def->manager->attrTypes->set('ProgressValue', new HTMLPurifier_AttrDef_HTML_ProgressValue());
-        $def->addElement('progress', 'Flow', new HTMLPurifier_ChildDef_Progress(), 'Common', array(
-            'value' => 'ProgressValue',
+        $progress = $def->addElement('progress', 'Flow', new HTMLPurifier_ChildDef_Progress(), 'Common', array(
+            'value' => 'Float#min:0',
             'max'   => 'Float#min:0',
         ));
+        $progress->attr_transform_post[] = new HTMLPurifier_AttrTransform_Progress();
         $def->getAnonymousModule()->addElementToContentSet('progress', 'Inline');
 
         return $def;

library/HTMLPurifier/HTML5Definition.php

@@ -0,0 +1,43 @@
+<?php
+
+class HTMLPurifier_AttrTransform_ProgressTest extends PHPUnit_Framework_TestCase
+{
+    /**
+     * @var HTMLPurifier_HTML5Config
+     */
+    protected $config;
+
+    /**
+     * @var HTMLPurifier_Context
+     */
+    protected $context;
+
+    /**
+     * @var HTMLPurifier_AttrTransform_Progress
+     */
+    protected $progress;
+
+    public function setUp()
+    {
+        $this->config = HTMLPurifier_HTML5Config::createDefault();
+        $this->context = new HTMLPurifier_Context();
+        $this->progress = new HTMLPurifier_AttrTransform_Progress();
+    }
+
+    protected function assertTransform($expected, array $input)
+    {
+        $this->assertEquals($expected, $this->progress->transform($input, $this->config, $this->context));
+    }
+
+    public function testTransform()
+    {
+        $this->assertTransform(array(), array());
+        $this->assertTransform(array('value' => 0), array('value' => 0));
+        $this->assertTransform(array('value' => 1), array('value' => 1));
+        $this->assertTransform(array(), array('value' => 10));
+        $this->assertTransform(array(), array('value' => -1));
+
+        $this->assertTransform(array('value' => 10, 'max' => 10), array('value' => 10, 'max' => 10));
+        $this->assertTransform(array('max' => 10), array('value' => 100, 'max' => 10));
+    }
+}