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.

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

Update PHP-CSS-Parser to 8.3.0 #1842

Merged
merged 5 commits into from Feb 25, 2019
Merged

Update PHP-CSS-Parser to 8.3.0 #1842

merged 5 commits into from Feb 25, 2019

Conversation

westonruter
Copy link
Member

@westonruter westonruter commented Jan 29, 2019

Updates sabberworm/php-css-parser to 8.3.0 with a patch for MyIntervals/PHP-CSS-Parser#138

The upstream changes include a couple of the changes that only existed in the XWP fork but which now have been merged upstream, including:

@googlebot googlebot added the cla: yes Signed the Google CLA label Jan 29, 2019
@westonruter
Copy link
Member Author

On second thought, now that there is a minimal difference between the upstream and the fork, we could now switch to using composer-patches.

@westonruter
Copy link
Member Author

Nevertheless, this will need to happen after a new release of PHP-CSS-Parser is made.

@westonruter westonruter added this to the v1.1 milestone Jan 29, 2019
Copy link
Collaborator

@felixarntz felixarntz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

After a long and thorough review, I reject this PR. 😛

Copy link
Collaborator

@felixarntz felixarntz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Well, I thought I was kidding, but after reading your comments, I agree. Let's look into using composer-patches for this as well, at least check whether it's viable or whether our custom changes justify using a fork (which has the downside it needs to be separately maintained).

@westonruter
Copy link
Member Author

@sabberworm When do you anticipate 8.3.0 being released?

…p-css-parser

* 'develop' of github.com:ampproject/amp-wp: (114 commits)
  Update dependency fasterimage/fasterimage to v1.2.1
  Run npm audit fix
  Improve phpdoc for comments sanitizer
  Deprecate the class-amp-comment-walker.php file and remove tests
  Fix updating comment item in amp-live-list based on new descendant comment
  Update dependency eslint to v5.14.1
  Pin npm-run-all to 4.1.5; fix formatting of package.json
  Ignore build directory for eslint
  Add some more useful npm scripts
  Update contributing.md to reflect change in changelog management
  Remove obsolete assertion
  phpcs fixes
  Use comments sanitizer instead of custom walker
  Remove errant space
  Make comment walker filterable
  Update dependency grunt-wp-deploy to v2
  phpcs adjustments
  Use reflection to test filters for all template types
  Borrow regex from get_query_template()
  Add required phpunit testsuite name
  ...
@westonruter westonruter changed the title Update PHP-CSS-Parser from upstream@b08df82 Update PHP-CSS-Parser to 8.3.0 Feb 23, 2019
@westonruter
Copy link
Member Author

Happily 8.3.0 has been released: https://github.com/sabberworm/PHP-CSS-Parser/releases/tag/8.3.0

So I've update the PR to use Composer patching and eliminate the use of our fork.

@westonruter westonruter dismissed felixarntz’s stale review February 25, 2019 15:13

Now using Composer patches.

@westonruter westonruter merged commit 2aa71a4 into develop Feb 25, 2019
@westonruter westonruter deleted the update/php-css-parser branch February 25, 2019 15:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cla: yes Signed the Google CLA
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants