Merge pull request #430 from ampproject/fix/re-add-defer-attribute

ampproject · Dec 2, 2021 · e3fcdd9 · e3fcdd9
2 parents c39d0ed + a11d462
commit e3fcdd9
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 1,148 deletions.
diff --git a/bin/src/Validator/SpecGenerator/Template/TagWithExtensionSpec.php b/bin/src/Validator/SpecGenerator/Template/TagWithExtensionSpec.php
@@ -2,7 +2,7 @@
 
 namespace AmpProject\Tooling\Validator\SpecGenerator\Template;
 
-use AmpProject\Attribute;
+use AmpProject\Html\Attribute;
 use AmpProject\Validator\Spec\SpecRule;
 use AmpProject\Validator\Spec\Tag;
 

diff --git a/src/Attribute.php b/src/Attribute.php
diff --git a/src/Html/Attribute.php b/src/Html/Attribute.php
@@ -295,6 +295,7 @@ interface Attribute
     const DECODING                        = 'decoding';
     const DEEP_PARSING                    = 'deep-parsing';
     const DEFAULT_                        = 'default'; // Underscore needed because 'default' is a PHP keyword.
+    const DEFER                           = 'defer';
     const DELAY                           = 'delay';
     const DIFFABLE                        = 'diffable';
     const DIFFUSECONSTANT                 = 'diffuseconstant';

diff --git a/src/Optimizer/Transformer/AutoExtensions.php b/src/Optimizer/Transformer/AutoExtensions.php
@@ -3,7 +3,7 @@
 namespace AmpProject\Optimizer\Transformer;
 
 use AmpProject\Amp;
-use AmpProject\Attribute;
+use AmpProject\Html\Attribute;
 use AmpProject\Dom\Document;
 use AmpProject\Dom\Element;
 use AmpProject\Dom\NodeWalker;

diff --git a/src/Optimizer/Transformer/OptimizeViewport.php b/src/Optimizer/Transformer/OptimizeViewport.php
@@ -2,7 +2,7 @@
 
 namespace AmpProject\Optimizer\Transformer;
 
-use AmpProject\Attribute;
+use AmpProject\Html\Attribute;
 use AmpProject\Dom\Document;
 use AmpProject\Dom\Element;
 use AmpProject\Optimizer\Configuration\OptimizeViewportConfiguration;

diff --git a/src/Validator/Spec/TagWithExtensionSpec.php b/src/Validator/Spec/TagWithExtensionSpec.php