Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Raise PHPStan level to 3 for AmpProject\AmpWP #4732

Merged
merged 18 commits into from
May 16, 2020
Merged

Raise PHPStan level to 3 for AmpProject\AmpWP #4732

merged 18 commits into from
May 16, 2020

Conversation

schlessera
Copy link
Collaborator

@schlessera schlessera commented May 15, 2020 •
edited by westonruter
Loading

Summary

This PR does the following:

  • Raises level of PHPStan checks to 3
  • Fixes lots of type-hints
  • Changes some return values so they match their respective signature
  • Unsets a callback to avoid using a nullable type
  • Sets textContent to an empty string instead of null to adhere to the DOM specification (converted bts anyway)

Fixes #4377

Checklist

  • My pull request is addressing an open issue (please create one otherwise).
  • My code is tested and passes existing tests.
  • My code follows the Engineering Guidelines (updates are often made to the guidelines, check it out periodically).

schlessera added 15 commits May 15, 2020 18:18
@schlessera
Adapt return value for array_column() helper function
fb74e96
@schlessera
Adapt typehint and docblock of AMP_CLI_Validation_Command::validity_b…
9d291ba 
…y_type
@schlessera
Adapt typehint of AMP_CLI_Validation_Command->force_crawl_urls
c6be14e
@schlessera
Adapt return typehint for AMP_DailyMotion_Embed_Handler::get_video_id…
604a682 
…_from_url()
@schlessera
Adapt xpath queries in AMP_Facebook_Embed_Handler::sanitize_raw_embeds()
7b8ba29
@schlessera
Use unset instead of null assignment for AMP_Playlist_Embed_Handler->…
e922fd9 
…removed_shortcode_callback
@schlessera
Adapt return value for failed AMP_Twitter_Embed_Handler::get_tweet_id()
aa2e9f3
@schlessera
Adapt return typehint for AMP_YouTube_Embed_Handler::get_video_id_fro…
2f775c2 
…m_url()
@schlessera
Adapt typehint for AMP_Style_Sanitizer->current_sources
71663b9
@schlessera
Adapt typehints for methods returning a rule spec check result
0a08d39
@schlessera
Adapt typehint for AMP_Tag_And_Attribute_Sanitizer->allowed_tags
2303660
@schlessera
Adapt typehint for AMP_Content->sanitizer_classes
e622275
@schlessera
Use empty string for pruning textContent
32870f6
@schlessera
Adapt type-hint for AMP_Image_Dimension_Extractor::normalize_url()
5d3c3af
@schlessera
Raise level to 3
d7f5371
@googlebot googlebot added the cla: yes Signed the Google CLA label May 15, 2020
@schlessera schlessera mentioned this pull request May 15, 2020
Closed
3 tasks
@westonruter westonruter self-requested a review May 15, 2020 23:03
@westonruter
Merge branch 'develop' of github.com:ampproject/amp-wp into 4377-rais…
916e87e 
…e-phpstan-level-3

* 'develop' of github.com:ampproject/amp-wp:
  Update dependency @wordpress/scripts to v9.1.0
  Remove redundant subtraction
  Update dependency @wordpress/e2e-test-utils to v4.7.0
  Fix bug with status code comparison
  Remove unneeded check for null as DOMElement is enforced
  Fix bug with comparing floats in ServerSideRendering
  Fix bug in Reorderhead with checking against empty nodelist
  Bump PHP Stan level to 4
@westonruter
Remove array_column() polyfill since plugin requires PHP 5.6+
11e8725
@westonruter
Fix phpdoc for sanitizer_classes and embed_handler_classes
5809441
@westonruter westonruter linked an issue May 16, 2020 that may be closed by this pull request
Reduce cumulative layout shift (CLS) by attempting to determine heights of embeds beforehand #4729
Open
@westonruter westonruter removed a link to an issue May 16, 2020
Reduce cumulative layout shift (CLS) by attempting to determine heights of embeds beforehand #4729
Open
@westonruter westonruter merged commit a0ef87c into develop May 16, 2020
@westonruter westonruter deleted the 4377-raise-phpstan-level-3 branch May 16, 2020 20:18
@westonruter westonruter added this to the v1.6 milestone Jun 2, 2020
@westonruter westonruter added the Changelogged Whether the issue/PR has been added to release notes. label Jul 17, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@westonruter westonruter westonruter approved these changes

@pierlon pierlon pierlon approved these changes

Assignees
No one assigned
Labels
Changelogged Whether the issue/PR has been added to release notes. cla: yes Signed the Google CLA
Projects
None yet
Milestone
v2.0
Development

Successfully merging this pull request may close these issues.

Raise PHPStan level for the AmpProject\AmpWP package to 3
4 participants
@schlessera @westonruter @pierlon @googlebot