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

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

Merged
merged 9 commits into from
Feb 18, 2021
Merged

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

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
2770d1a
Composer 2
swissspidy Nov 18, 2020
d8e43bc
Merge branch 'main' into add/composer-2
swissspidy Feb 4, 2021
ef8b7b5
Update tests
swissspidy Feb 4, 2021
559d5a7
Merge branch 'main' into add/composer-2
swissspidy Feb 10, 2021
c8f5edb
Merge branch 'main' into add/composer-2
swissspidy Feb 12, 2021
83e64c2
Unpin composer version in local env
swissspidy Feb 17, 2021
644d960
Merge branch 'main' into add/composer-2
swissspidy Feb 18, 2021
bbe70b7
Update composer dependenies
swissspidy Feb 18, 2021
ea28577
Fix PHPMD warning
swissspidy Feb 18, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/continuous-integration-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
with:
php-version: '7.4'
coverage: none
tools: composer:v1
tools: composer

- name: Get Composer cache directory
id: composer-cache
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/continuous-integration-e2e.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ jobs:
with:
php-version: '7.4'
coverage: none
tools: composer:v1
tools: composer

- name: Get Composer cache directory
id: composer-cache
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/continuous-integration-lint-php.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
with:
php-version: '7.4'
coverage: none
tools: composer:v1, cs2pr
tools: composer, cs2pr

- name: Get Composer cache directory
id: composer-cache
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/continuous-integration-unit-php.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ jobs:
uses: shivammathur/setup-php@v2
with:
php-version: 7.4
tools: composer:v1
tools: composer

- name: Install prefixed dependencies
run: |
Expand All @@ -79,7 +79,7 @@ jobs:
php-version: ${{ matrix.php }}
extensions: mysql
coverage: xdebug
tools: composer:v1, cs2pr
tools: composer, cs2pr

- name: Install dependencies
run: |
Expand Down
25 changes: 5 additions & 20 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"ext-json": "*",
"ext-libxml": "*",
"ext-mbstring": "*",
"ampproject/amp-wp": "^2.0.5",
"ampproject/amp-wp": "^2.0.6",
"civicrm/composer-downloads-plugin": "^3.0",
"cweagans/composer-patches": "^1.6",
"mcaskill/composer-exclude-files": "^2.0",
Expand Down Expand Up @@ -42,17 +42,17 @@
"extra": {
"downloads": {
"composer-normalize": {
"url": "https://github.com/ergebnis/composer-normalize/releases/download/2.9.0/composer-normalize.phar",
"url": "https://github.com/ergebnis/composer-normalize/releases/download/2.11.0/composer-normalize.phar",
"path": "vendor/bin/composer-normalize",
"type": "phar"
},
"phpstan": {
"url": "https://github.com/phpstan/phpstan/releases/download/0.12.52/phpstan.phar",
"url": "https://github.com/phpstan/phpstan/releases/download/0.12.56/phpstan.phar",
"path": "vendor/bin/phpstan",
"type": "phar"
},
"php-scoper": {
"url": "https://github.com/humbug/php-scoper/releases/download/0.13.5/php-scoper.phar",
"url": "https://github.com/humbug/php-scoper/releases/download/0.13.9/php-scoper.phar",
"path": "vendor/bin/php-scoper",
"type": "phar"
}
Expand All @@ -63,22 +63,7 @@
"ampproject/amp-wp/includes/admin/functions.php",
"ampproject/amp-wp/includes/deprecated.php",
"ampproject/amp-wp/docs/includes/register-wp-cli-commands.php"
],
"patches": {
"sabberworm/php-css-parser": {
"Add additional validation for size unit <https://github.com/sabberworm/PHP-CSS-Parser/pull/193>": "https://github.com/sabberworm/PHP-CSS-Parser/compare/3bc5ded67d77a52b81608cfc97f23b1bb0678e2f%5E...468da3441945e9c1bf402a3340b1d8326723f7d9.patch",
"Fix parsing CSS selectors which contain commas <https://github.com/westonruter/PHP-CSS-Parser/pull/1>": "https://github.com/westonruter/PHP-CSS-Parser/compare/master...10a2501c119abafced3e4014aa3c0a3453a86f67.patch"
}
},
"patches-ignore": {
"ampproject/amp-wp": {
"sabberworm/php-css-parser": {
"Add additional validation for size unit <https://github.com/sabberworm/PHP-CSS-Parser/pull/193>": "patches/php-css-parser-pull-193.patch",
"Validate name-start code points for identifier <https://github.com/sabberworm/PHP-CSS-Parser/pull/185>": "patches/php-css-parser-pull-185.patch",
"Fix parsing CSS selectors which contain commas <https://github.com/westonruter/PHP-CSS-Parser/pull/1>": "patches/php-css-parser-commit-10a2501.patch"
}
}
}
]
},
"autoload": {
"psr-4": {
Expand Down
Loading