Disable attribute validation by default

Author: fredemmott

src/core/ComposableElement.php

@@ -42,15 +42,15 @@ final public function __construct(
       $this->appendChild($child);
     }
     $this->setAttributes($attributes);
-    if (:xhp::$ENABLE_VALIDATION) {
+    if (:xhp::isChildValidationEnabled()) {
       // There is some cost to having defaulted unused arguments on a function
       // so we leave these out and get them with func_get_args().
       $args = func_get_args();
       if (isset($args[2])) {
         $this->source = "$args[2]:$args[3]";
       } else {
         $this->source =
-          'You have ENABLE_VALIDATION on, but debug information is not being '.
+          'You have child validation on, but debug information is not being '.
           'passed to XHP objects correctly. Ensure xhp.include_debug is on '.
           'in your PHP configuration. Without this option enabled, '.
           'validation errors will be painful to debug at best.';
@@ -304,7 +304,9 @@ final public function getAttributes(): Map<string, mixed> {
    */
   final public function setAttribute(string $attr, mixed $value): this {
     if (!ReflectionXHPAttribute::IsSpecial($attr)) {
-      $value = $this->validateAttributeValue($attr, $value);
+      if (:xhp::isAttributeValidationEnabled()) {
+        $value = $this->validateAttributeValue($attr, $value);
+      }
     } else {
       $value = (string)$value;
     }
@@ -345,7 +347,9 @@ final public function isAttributeSet(string $attr): bool {
    */
   final public function removeAttribute(string $attr): this {
     if (!ReflectionXHPAttribute::IsSpecial($attr)) {
-      $value = $this->validateAttributeValue($attr, null);
+      if (:xhp::isAttributeValidationEnabled()) {
+        $value = $this->validateAttributeValue($attr, null);
+      }
     }
     $this->attributes->removeKey($attr);
     return $this;

src/core/Element.php

@@ -35,7 +35,7 @@ final public function toString(): string {
   }
 
   protected async function __renderAndProcess(): Awaitable<XHPRoot> {
-    if (:xhp::$ENABLE_VALIDATION) {
+    if (:xhp::isChildValidationEnabled()) {
       $this->validateChildren();
     }
 

src/core/Primitive.php

@@ -47,7 +47,7 @@ final public function toString(): string {
 
   final protected async function __flushSubtree(): Awaitable<:x:primitive> {
     await $this->__flushElementChildren();
-    if (:xhp::$ENABLE_VALIDATION) {
+    if (:xhp::isChildValidationEnabled()) {
       $this->validateChildren();
     }
     return $this;

src/core/XHP.php

@@ -52,7 +52,32 @@ protected static function &__xhpAttributeDeclaration(
    * production. You should still leave it on while developing new features,
    * though.
    */
-  public static bool $ENABLE_VALIDATION = true;
+  private static bool $validateChildren = true;
+  private static bool $validateAttributes = false;
+
+  public static function disableChildValidation(): void {
+    self::$validateChildren = false;
+  }
+
+  public static function enableChildValidation(): void {
+    self::$validateChildren = true;
+  }
+
+  public static function isChildValidationEnabled(): bool {
+    return self::$validateChildren;
+  }
+
+  public static function disableAttributeValidation(): void {
+    self::$validateAttributes = false;
+  }
+
+  public static function enableAttributeValidation(): void {
+    self::$validateAttributes = true;
+  }
+
+  public static function isAttributeValidationEnabled(): bool {
+    return self::$validateAttributes;
+  }
 
   final public function __toString(): string {
     return $this->toString();

src/html/XHPHelpers.php

@@ -146,7 +146,7 @@ protected function getAttributeNamesThatAppendValuesOnTransfer(
   final public function transferAttributesToRenderedRoot(
     :x:composable-element $root,
   ): void {
-    if (:xhp::$ENABLE_VALIDATION && $root instanceof :x:element) {
+    if (:xhp::isAttributeValidationEnabled() && $root instanceof :x:element) {
       if (!($root instanceof HasXHPHelpers)) {
         throw new XHPClassException(
           $this,

tests/AttributesCoercionModeTest.php

@@ -21,13 +21,15 @@ class AttributesCoercionModeTest extends PHPUnit_Framework_TestCase {
   public function setUp(): void {
     $this->coercionMode = XHPAttributeCoercion::GetMode();
     $this->errorReporting = error_reporting();
+    :xhp::enableAttributeValidation();
   }
 
   public function tearDown(): void {
     $mode = $this->coercionMode;
     invariant($mode !== null, 'did not save coercion mode');
     XHPAttributeCoercion::SetMode($mode);
     error_reporting($this->errorReporting);
+    :xhp::disableAttributeValidation();
   }
 
   public function testNoCoercion(): void {

tests/AttributesTest.php

@@ -60,6 +60,11 @@ public function __toString() {
 class AttributesTest extends PHPUnit_Framework_TestCase {
   public function setUp(): void {
     XHPAttributeCoercion::SetMode(XHPAttributeCoercionMode::SILENT);
+    :xhp::enableAttributeValidation();
+  }
+
+  public function tearDown(): void {
+    :xhp::disableAttributeValidation();
   }
 
   public function testValidTypes(): void {

tests/HackEnumAttributeTest.php

@@ -14,6 +14,14 @@ protected function render(): XHPRoot {
 }
 
 class HackEnumAttributesTest extends PHPUnit_Framework_TestCase {
+  public function setUp(): void {
+    :xhp::enableAttributeValidation();
+  }
+
+  public function tearDown(): void {
+    :xhp::disableAttributeValidation();
+  }
+
   public function testValidValues(): void {
     $x = <test:hack-enum-attribute foo={TestEnum::HERP} />;
     $this->assertSame('<div>HERP</div>', $x->toString());