Add DevMode helper and keep devmode nodes during optimization #4371
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
westonruter
reviewed
Mar 9, 2020
| while ($headNode) { | ||
| $nextSibling = $headNode->nextSibling; | ||
| if ($headNode instanceof DOMElement) { | ||
| if ($headNode instanceof DOMElement && (! $devMode || ! DevMode::hasExemptionForNode($headNode))) { |
There was a problem hiding this comment.
Why not use isExemptFromValidation?
Suggested change
| if ($headNode instanceof DOMElement && (! $devMode || ! DevMode::hasExemptionForNode($headNode))) { | |
| if ($headNode instanceof DOMElement && ! DevMode::isExemptFromValidation($headNode)) { |
Then $devMode variable could be removed.
There was a problem hiding this comment.
Because it's a loop, and that would do the check against the document multiple times although it's only needed once.
There was a problem hiding this comment.
OK. But that's almost always true for other instances of where isExemptFromValidation is used currently.
I don't feel strongly about this.
| @@ -74,9 +75,10 @@ public function transform(Document $document, ErrorCollection $errors) | |||
| private function removeStyleAndNoscriptTags(Document $document) | |||
| { | |||
| $headNode = $document->head->firstChild; | |||
| $devMode = DevMode::isActiveForDocument($document); | |||
There was a problem hiding this comment.
Suggested change
| $devMode = DevMode::isActiveForDocument($document); |
pierlon
reviewed
Mar 9, 2020
westonruter
approved these changes
Mar 9, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
This PR makes the following changes:
AmpProject\DevModehelper class (with tests);AMP_Base_Sanitizer;AMP_Base_Sanitizermethods over to the newAmpProject\DevModehelper class;AmpBoilerplatetransformer does not remove nodes that are marked as being in devmode.The
AmpProject\DevModehelper class was introduced (and theAMP_BaseSanitizercode deprecated) because theampproject/optimizercannot have a dependency pointing to the plugin package. Dependencies can only ever be allowed the other way around.Fixes #4369
Checklist