Composer 2 + AMP Plugin 2.1 / AMP PHP Toolbox #5344

swissspidy · 2020-11-18T21:40:29Z

Summary

Moves the project to use Composer v2.
...which is only supported by AMP plugin v2.1 (currently in development)
...which in turn requires using AMP PHP toolbox from Packagist

Relevant Technical Choices

Note: This supersedes #5284

Since AMP plugin 2.1 hasn't been released yet, this loads the plugin from dev-develop instead.

To-do

Testing
Reduce dependency on AMP plugin itself so we can rely solely on AMP PHP Toolbox

User-facing changes

N/A

Testing Instructions

N/A

Fixes #5083
Fixes #4897

github-actions · 2020-11-18T21:44:42Z

Size Change: 0 B

Total Size: 1.44 MB

ℹ️ View Unchanged

Filename	Size	Change
`assets/css/edit-story.css`	877 B	0 B
`assets/css/stories-dashboard.css`	288 B	0 B
`assets/css/web-stories-embed-block.css`	615 B	0 B
`assets/js/chunk-fonts-********************.js`	44.8 kB	0 B
`assets/js/chunk-web-stories-template-0-********************.js`	11 kB	0 B
`assets/js/chunk-web-stories-template-1-********************.js`	11.3 kB	0 B
`assets/js/chunk-web-stories-template-2-********************.js`	10.9 kB	0 B
`assets/js/chunk-web-stories-template-3-********************.js`	10.6 kB	0 B
`assets/js/chunk-web-stories-template-4-********************.js`	12.7 kB	0 B
`assets/js/chunk-web-stories-template-5-********************.js`	7.14 kB	0 B
`assets/js/chunk-web-stories-template-6-********************.js`	10.2 kB	0 B
`assets/js/chunk-web-stories-template-7-********************.js`	10.1 kB	0 B
`assets/js/chunk-web-stories-textset-0-********************.js`	5.23 kB	0 B
`assets/js/chunk-web-stories-textset-1-********************.js`	6.79 kB	0 B
`assets/js/chunk-web-stories-textset-2-********************.js`	7.81 kB	0 B
`assets/js/chunk-web-stories-textset-3-********************.js`	15.3 kB	0 B
`assets/js/chunk-web-stories-textset-4-********************.js`	4.38 kB	0 B
`assets/js/chunk-web-stories-textset-5-********************.js`	5.64 kB	0 B
`assets/js/chunk-web-stories-textset-6-********************.js`	5.43 kB	0 B
`assets/js/chunk-web-stories-textset-7-********************.js`	10.3 kB	0 B
`assets/js/edit-story.js`	657 kB	0 B
`assets/js/stories-dashboard.js`	497 kB	0 B
`assets/js/vendors~chunk-ffmpeg-********************.js`	5.61 kB	0 B
`assets/js/web-stories-activation-notice.js`	68 kB	0 B
`assets/js/web-stories-embed-block.js`	19.7 kB	0 B

_{compressed-size-action}

spacedmonkey · 2020-11-19T11:36:56Z

This didnt update me to composer 2.

You are already using composer version 1.10.17 (1.x channel).
 done!

spacedmonkey · 2020-11-19T11:37:48Z

I needed to run

 composer self-update --2

spacedmonkey

I was running 1.10.17 and didnt upgrade.

swissspidy · 2020-11-19T12:52:05Z

This didnt update me to composer 2.

What do you mean with this?

The PR just updates the plugin to be Composer 2 compatible.

pierlon · 2020-11-19T20:23:11Z

Update on this: the AMP plugin will be releasing v2.0.7 today, which is a hotfix for ampproject/amp-wp#5609. Due to an unnoticed incompatibility with Composer v2, we're downgrading back to v1 until we have a solution in place to fix the reported issue.

spacedmonkey · 2020-12-10T14:53:04Z

@pierlon What is the status of Composer 2 in 2.0.8?

swissspidy · 2020-12-10T14:55:29Z

@pierlon What is the status of Composer 2 in 2.0.8?

@spacedmonkey Still using Composer 1 on the 2.0 branch. Upgrading to Composer v2 will be revisited for 2.1+.

composer.json

swissspidy · 2021-02-10T16:39:23Z

@westonruter @pierlon Is there any rough ETA on the AMP plugin v2.1 release?

We're considering just using dev-develop and AMP Toollbox dev-main for the time being (see changes in this PR) so that we're not really blocked on you folks on improving our code base.

westonruter · 2021-02-10T17:50:17Z

@swissspidy We are planning to release v2.1 to coincide with WordPress 5.7. So roughly a month from now. If the prerelease state works for you, then I don't see any problem with that. Note that AMP Toolbox PHP should have a new stable release prior to the AMP plugin's v2.1. So you may only need to use dev-develop for the AMP plugin.

@pierlon Is there any dependency on ampproject/amp-wp#5745?

pierlon · 2021-02-10T18:12:22Z

@pierlon Is there any dependency on ampproject/amp-wp#5745?

Yes, it would be of high priority now. At the moment if our patched version of the sabberworm/php-css-parser is not autoloaded first, it will impact the how the AMP plugin works internally. This wouldn't impact the Web Stories plugin, however, as it currently bundles the patched version of the CSS parser library and is scoped accordingly so that it always uses the one its shipped with.

codecov · 2021-02-12T17:06:05Z

Codecov Report

Merging #5344 (86c2036) into main (e6b68a8) will not change coverage.
The diff coverage is 50.00%.

@@           Coverage Diff           @@
##             main    #5344   +/-   ##
=======================================
  Coverage   83.12%   83.12%           
=======================================
  Files        1106     1106           
  Lines       19758    19758           
=======================================
  Hits        16424    16424           
  Misses       3334     3334

Flag	Coverage Δ
karmatests	`72.49% <ø> (-0.01%)`	⬇️
unittests	`65.76% <ø> (ø)`

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files	Coverage Δ
includes/Story_Renderer/HTML.php	`72.94% <ø> (ø)`
includes/AMP/Sanitization.php	`83.87% <50.00%> (ø)`

docs/getting-started.md

spacedmonkey

Worked well in PHP 7.3 and PHP 7.4 I tested locally. However, got error when installing on PHP 8.0. This is an issue in main, so I am going to make another issue to fix this elsewhere.

swissspidy · 2021-02-18T11:00:51Z

Worked well in PHP 7.3 and PHP 7.4 I tested locally. However, got error when installing on PHP 8.0. This is an issue in main, so I am going to make another issue to fix this elsewhere.

I just updated PHP-Scoper here which should fix this. Could you try again?

spacedmonkey

Works in PHP 8.0.

Composer 2

2770d1a

google-cla bot added the cla: yes label Nov 18, 2020

swissspidy marked this pull request as ready for review November 18, 2020 21:53

swissspidy requested a review from spacedmonkey as a code owner November 18, 2020 21:53

swissspidy added Pod: WP & Infra Type: Infrastructure Changes impacting testing infrastructure or build tooling labels Nov 18, 2020

spacedmonkey suggested changes Nov 19, 2020

View reviewed changes

swissspidy marked this pull request as draft November 19, 2020 20:55

spacedmonkey mentioned this pull request Nov 27, 2020

PHP 8 Compatibility #4789

Closed

5 tasks

swissspidy added the Status: Blocked On hold for the time being label Dec 21, 2020

swissspidy mentioned this pull request Feb 4, 2021

Use AMP PHP toolbox from Packagist #5291

Closed

swissspidy changed the title ~~Composer 2~~ Composer 2 + AMP Plugin 2.1 / AMP PHP Toolbox Feb 4, 2021

Merge branch 'main' into add/composer-2

d8e43bc

spacedmonkey reviewed Feb 4, 2021

View reviewed changes

composer.json Show resolved Hide resolved

swissspidy added 2 commits February 4, 2021 13:11

Update tests

ef8b7b5

Merge branch 'main' into add/composer-2

559d5a7

Merge branch 'main' into add/composer-2

c8f5edb

swissspidy removed the Status: Blocked On hold for the time being label Feb 17, 2021

swissspidy marked this pull request as ready for review February 17, 2021 08:29

Unpin composer version in local env

83e64c2

swissspidy requested a review from spacedmonkey February 17, 2021 09:17

Merge branch 'main' into add/composer-2

644d960

spacedmonkey reviewed Feb 18, 2021

View reviewed changes

docs/getting-started.md Show resolved Hide resolved

spacedmonkey approved these changes Feb 18, 2021

View reviewed changes

swissspidy added 2 commits February 18, 2021 11:57

Update composer dependenies

bbe70b7

Fix PHPMD warning

ea28577

spacedmonkey approved these changes Feb 18, 2021

View reviewed changes

swissspidy merged commit 59800e8 into main Feb 18, 2021

swissspidy deleted the add/composer-2 branch February 18, 2021 13:13

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Composer 2 + AMP Plugin 2.1 / AMP PHP Toolbox #5344

Composer 2 + AMP Plugin 2.1 / AMP PHP Toolbox #5344

swissspidy commented Nov 18, 2020 •

edited

Loading

github-actions bot commented Nov 18, 2020 •

edited

Loading

spacedmonkey commented Nov 19, 2020

spacedmonkey commented Nov 19, 2020

spacedmonkey left a comment •

edited

Loading

swissspidy commented Nov 19, 2020

pierlon commented Nov 19, 2020 •

edited

Loading

spacedmonkey commented Dec 10, 2020

swissspidy commented Dec 10, 2020

swissspidy commented Feb 10, 2021

westonruter commented Feb 10, 2021

pierlon commented Feb 10, 2021

codecov bot commented Feb 12, 2021 •

edited

Loading

spacedmonkey left a comment

swissspidy commented Feb 18, 2021

spacedmonkey left a comment

Composer 2 + AMP Plugin 2.1 / AMP PHP Toolbox #5344

Composer 2 + AMP Plugin 2.1 / AMP PHP Toolbox #5344

Conversation

swissspidy commented Nov 18, 2020 • edited Loading

Summary

Relevant Technical Choices

To-do

User-facing changes

Testing Instructions

github-actions bot commented Nov 18, 2020 • edited Loading

spacedmonkey commented Nov 19, 2020

spacedmonkey commented Nov 19, 2020

spacedmonkey left a comment • edited Loading

Choose a reason for hiding this comment

swissspidy commented Nov 19, 2020

pierlon commented Nov 19, 2020 • edited Loading

spacedmonkey commented Dec 10, 2020

swissspidy commented Dec 10, 2020

swissspidy commented Feb 10, 2021

westonruter commented Feb 10, 2021

pierlon commented Feb 10, 2021

codecov bot commented Feb 12, 2021 • edited Loading

Codecov Report

spacedmonkey left a comment

Choose a reason for hiding this comment

swissspidy commented Feb 18, 2021

spacedmonkey left a comment

Choose a reason for hiding this comment

swissspidy commented Nov 18, 2020 •

edited

Loading

github-actions bot commented Nov 18, 2020 •

edited

Loading

spacedmonkey left a comment •

edited

Loading

pierlon commented Nov 19, 2020 •

edited

Loading

codecov bot commented Feb 12, 2021 •

edited

Loading