From 7a5da9d8dc2adf6838083945d778462e849f4ea8 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Thu, 17 Jul 2025 07:15:57 +0000 Subject: [PATCH 1/4] Initial plan From 24d382d1f8cbd88b606a43c6c7551cbe80dbc665 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Thu, 17 Jul 2025 07:25:13 +0000 Subject: [PATCH 2/4] Add support for shipmonk/name-collision-detector tool Co-authored-by: shivammathur <1571086+shivammathur@users.noreply.github.com> --- __tests__/tools.test.ts | 9 ++++++--- src/configs/tools.json | 5 +++++ 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/__tests__/tools.test.ts b/__tests__/tools.test.ts index 1cb38821..0355fa2a 100644 --- a/__tests__/tools.test.ts +++ b/__tests__/tools.test.ts @@ -393,7 +393,7 @@ describe('Tools tests', () => { it.each([ [ - 'blackfire, blackfire-player, box, churn, cs2pr, flex, grpc_php_plugin, parallel-lint, php-cs-fixer, php-scoper, phpDocumentor, phplint, phpstan, phpunit, pecl, phing, phinx, phinx:1.2.3, phive, phpunit-bridge, phpunit-polyfills, pint, php-config, phpize, protoc, symfony, vapor, wp, pie', + 'blackfire, blackfire-player, box, churn, cs2pr, flex, grpc_php_plugin, name-collision-detector, parallel-lint, php-cs-fixer, php-scoper, phpDocumentor, phplint, phpstan, phpunit, pecl, phing, phinx, phinx:1.2.3, phive, phpunit-bridge, phpunit-polyfills, pint, php-config, phpize, protoc, symfony, vapor, wp, pie', [ 'add_tool https://github.com/shivammathur/composer-cache/releases/latest/download/composer-7.4-stable.phar,https://dl.cloudsmith.io/public/shivammathur/composer-cache/raw/files/composer-7.4-stable.phar,https://getcomposer.org/composer-stable.phar composer', 'add_blackfire', @@ -403,6 +403,7 @@ describe('Tools tests', () => { 'add_tool https://github.com/staabm/annotate-pull-request-from-checkstyle/releases/latest/download/cs2pr cs2pr "-V"', 'add_composer_tool flex flex symfony/ global', 'add_grpc_php_plugin latest', + 'add_composer_tool name-collision-detector name-collision-detector shipmonk/ scoped', 'add_tool https://github.com/php-parallel-lint/PHP-Parallel-Lint/releases/latest/download/parallel-lint.phar parallel-lint "--version"', 'add_tool https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/releases/download/v3.2.1/php-cs-fixer.phar php-cs-fixer "-V"', 'add_tool https://github.com/humbug/php-scoper/releases/latest/download/php-scoper.phar php-scoper "--version"', @@ -436,7 +437,7 @@ describe('Tools tests', () => { it.each([ [ - 'behat, blackfire, blackfire-player, churn, composer-dependency-analyser, composer-normalize, composer-require-checker, composer-unused, cs2pr:1.2.3, ecs, flex, grpc_php_plugin:1.2.3, infection, phan, phan:1.2.3, phing:1.2.3, phinx, phive:1.2.3, php-config, phpcbf, phpcpd, phpcs, phpdoc, phpize, phpmd, phpspec, phpunit-bridge:5.6, phpunit-polyfills:1.0.1, protoc:v1.2.3, psalm, rector, symfony-cli, vapor-cli, wp-cli, pie', + 'behat, blackfire, blackfire-player, churn, composer-dependency-analyser, composer-normalize, composer-require-checker, composer-unused, cs2pr:1.2.3, ecs, flex, grpc_php_plugin:1.2.3, infection, name-collision-detector, phan, phan:1.2.3, phing:1.2.3, phinx, phive:1.2.3, php-config, phpcbf, phpcpd, phpcs, phpdoc, phpize, phpmd, phpspec, phpunit-bridge:5.6, phpunit-polyfills:1.0.1, protoc:v1.2.3, psalm, rector, symfony-cli, vapor-cli, wp-cli, pie', [ 'add_tool https://github.com/shivammathur/composer-cache/releases/latest/download/composer-7.4-stable.phar,https://dl.cloudsmith.io/public/shivammathur/composer-cache/raw/files/composer-7.4-stable.phar,https://getcomposer.org/composer-stable.phar composer', 'add_composer_tool behat behat behat/ scoped', @@ -451,6 +452,7 @@ describe('Tools tests', () => { 'add_composer_tool flex flex symfony/ global', 'add_grpc_php_plugin 1.2.3', 'add_tool https://github.com/infection/infection/releases/latest/download/infection.phar infection "-V"', + 'add_composer_tool name-collision-detector name-collision-detector shipmonk/ scoped', 'add_tool https://github.com/phan/phan/releases/latest/download/phan.phar phan "-v"', 'add_tool https://github.com/phan/phan/releases/download/1.2.3/phan.phar phan "-v"', 'add_tool https://www.phing.info/get/phing-1.2.3.phar,https://github.com/phingofficial/phing/releases/download/1.2.3/phing-1.2.3.phar phing "-v"', @@ -485,7 +487,7 @@ describe('Tools tests', () => { it.each([ [ - 'blackfire, blackfire-player:1.2.3, cs2pr, churn, deployer, does_not_exist, flex, phinx, phive:0.13.2, php-config, phpize, phpmd, simple-phpunit, symfony, wp, pie', + 'blackfire, blackfire-player:1.2.3, cs2pr, churn, deployer, does_not_exist, flex, name-collision-detector, phinx, phive:0.13.2, php-config, phpize, phpmd, simple-phpunit, symfony, wp, pie', [ 'Add-Tool https://github.com/shivammathur/composer-cache/releases/latest/download/composer-7.4-stable.phar,https://dl.cloudsmith.io/public/shivammathur/composer-cache/raw/files/composer-7.4-stable.phar,https://getcomposer.org/composer-stable.phar composer', 'Add-Blackfire', @@ -495,6 +497,7 @@ describe('Tools tests', () => { 'Add-Tool https://deployer.org/deployer.phar deployer "-V"', 'Tool does_not_exist is not supported', 'Add-ComposerTool flex flex symfony/ global', + 'Add-ComposerTool name-collision-detector name-collision-detector shipmonk/ scoped', 'Add-ComposerTool phinx phinx robmorgan/ scoped', 'Add-Tool https://github.com/phar-io/phive/releases/download/0.15.3/phive-0.15.3.phar phive "status"', 'php-config is not a windows tool', diff --git a/src/configs/tools.json b/src/configs/tools.json index 86b451cf..95261f3f 100644 --- a/src/configs/tools.json +++ b/src/configs/tools.json @@ -21,6 +21,11 @@ "repository": "shipmonk/composer-dependency-analyser", "scope": "scoped" }, + "name-collision-detector": { + "type": "composer", + "repository": "shipmonk/name-collision-detector", + "scope": "scoped" + }, "composer-unused": { "type": "phar", "repository": "composer-unused/composer-unused", From a3845d84ae769b04c92074c7abffb120dc6ede37 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Thu, 17 Jul 2025 08:01:28 +0000 Subject: [PATCH 3/4] Add name-collision-detector to README tools section Co-authored-by: shivammathur <1571086+shivammathur@users.noreply.github.com> --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 5f33d8e7..605beb15 100644 --- a/README.md +++ b/README.md @@ -229,7 +229,7 @@ This disables all core and third-party shared extensions and thus, can break som These tools can be set up globally using the `tools` input. It accepts a string in csv-format. -[`behat`], [`blackfire`], [`blackfire-player`], [`box`], [`castor`], [`churn`], [`codeception`], [`composer`], [`composer-dependency-analyser`], [`composer-normalize`], [`composer-prefetcher`], [`composer-require-checker`], [`composer-unused`], [`cs2pr`], [`deployer`], [`ecs`], [`flex`], [`grpc_php_plugin`], [`infection`], [`parallel-lint`], [`pecl`], [`phan`], [`phing`], [`phinx`], [`phive`], [`php-config`], [`php-cs-fixer`], [`php-scoper`], [`phpcbf`], [`phpcpd`], [`phpcs`], [`phpdoc`] or [`phpDocumentor`], [`phpize`], [`phplint`], [`phpmd`], [`phpspec`], [`phpstan`], [`phpunit`], [`phpunit-bridge`], [`phpunit-polyfills`], [`pie`], [`pint`], [`prestissimo`], [`protoc`], [`psalm`], [`rector`], [`symfony`] or [`symfony-cli`], [`vapor`] or [`vapor-cli`], [`wp`] or [`wp-cli`] +[`behat`], [`blackfire`], [`blackfire-player`], [`box`], [`castor`], [`churn`], [`codeception`], [`composer`], [`composer-dependency-analyser`], [`composer-normalize`], [`composer-prefetcher`], [`composer-require-checker`], [`composer-unused`], [`cs2pr`], [`deployer`], [`ecs`], [`flex`], [`grpc_php_plugin`], [`infection`], [`name-collision-detector`], [`parallel-lint`], [`pecl`], [`phan`], [`phing`], [`phinx`], [`phive`], [`php-config`], [`php-cs-fixer`], [`php-scoper`], [`phpcbf`], [`phpcpd`], [`phpcs`], [`phpdoc`] or [`phpDocumentor`], [`phpize`], [`phplint`], [`phpmd`], [`phpspec`], [`phpstan`], [`phpunit`], [`phpunit-bridge`], [`phpunit-polyfills`], [`pie`], [`pint`], [`prestissimo`], [`protoc`], [`psalm`], [`rector`], [`symfony`] or [`symfony-cli`], [`vapor`] or [`vapor-cli`], [`wp`] or [`wp-cli`] ```yaml - name: Setup PHP with tools From 879090af77f646a972222a04bec9def7a2023b89 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Thu, 17 Jul 2025 08:07:21 +0000 Subject: [PATCH 4/4] Add link for name-collision-detector tool in README Co-authored-by: shivammathur <1571086+shivammathur@users.noreply.github.com> --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 605beb15..06dc29b3 100644 --- a/README.md +++ b/README.md @@ -1072,6 +1072,7 @@ These companies generously provide setup-php their products and services to aid [`flex`]: https://flex.symfony.com/ [`grpc_php_plugin`]: https://grpc.io/ [`infection`]: https://infection.github.io/ +[`name-collision-detector`]: https://github.com/shipmonk/name-collision-detector [`parallel-lint`]: https://github.com/php-parallel-lint/PHP-Parallel-Lint [`pecl`]: https://pecl.php.net/ [`phan`]: https://github.com/phan/phan/wiki