Skip to content

Commit 78f5a26

Browse files
anomiexmatticbot
authored andcommitted
changelogger, stub-generator: Simplify bin by dropping Composer <2.2 support (#41876)
Composer 2.2 added a global `$_composer_autoload_path` that points to the autoloader. We can simplify the bin files significantly by requiring this Composer version and using that constant instead of trying to guess where the autoloader lives. This also requires various tools be updated to run changelogger and stub-generator via the symlink added in `vendor/bin/` rather than trying to use `bin/` directly. Committed via a GitHub action: https://github.com/Automattic/jetpack/actions/runs/13438907848 Upstream-Ref: Automattic/jetpack@95a448a
1 parent 4cbf5a6 commit 78f5a26

File tree

5 files changed

+14
-13
lines changed

5 files changed

+14
-13
lines changed

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
},
99
"require-dev": {
1010
"yoast/phpunit-polyfills": "^1.1.1",
11-
"automattic/jetpack-changelogger": "^5.1.0"
11+
"automattic/jetpack-changelogger": "^6.0.0-alpha"
1212
},
1313
"autoload": {
1414
"classmap": [

composer.lock

Lines changed: 9 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/automattic/jetpack-device-detection/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
},
99
"require-dev": {
1010
"yoast/phpunit-polyfills": "^1.1.1",
11-
"automattic/jetpack-changelogger": "^5.1.0"
11+
"automattic/jetpack-changelogger": "^6.0.0-alpha"
1212
},
1313
"suggest": {
1414
"automattic/jetpack-autoloader": "Allow for better interoperability with other plugins that use this package."

vendor/composer/installed.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@
77
"dist": {
88
"type": "path",
99
"url": "/tmp/jetpack-build/Automattic/jetpack-device-detection",
10-
"reference": "88cb84f1b631353fa20891c0cded95f1555c1fa6"
10+
"reference": "da41451c1401be76130cea3e326bef27b8ae9ceb"
1111
},
1212
"require": {
1313
"php": ">=7.2"
1414
},
1515
"require-dev": {
16-
"automattic/jetpack-changelogger": "^5.1.0",
16+
"automattic/jetpack-changelogger": "^6.0.0-alpha",
1717
"yoast/phpunit-polyfills": "^1.1.1"
1818
},
1919
"suggest": {

vendor/composer/installed.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
'automattic/jetpack-device-detection' => array(
1414
'pretty_version' => '3.0.0',
1515
'version' => '3.0.0.0',
16-
'reference' => '88cb84f1b631353fa20891c0cded95f1555c1fa6',
16+
'reference' => 'da41451c1401be76130cea3e326bef27b8ae9ceb',
1717
'type' => 'jetpack-library',
1818
'install_path' => __DIR__ . '/../automattic/jetpack-device-detection',
1919
'aliases' => array(),

0 commit comments

Comments
 (0)