From 8a9b21f82f574c973c2b197f9240bc507d8bbc1e Mon Sep 17 00:00:00 2001 From: roxblnfk Date: Sat, 10 Oct 2026 16:29:31 +0400 Subject: [PATCH] feat: rename the package to roadrunner/worker build: depend on roadrunner/* packages chore: polish composer.json metadata The package keeps its version line and replaces spiral/roadrunner-worker with self.version, so packages that still require spiral/roadrunner-worker are satisfied by roadrunner/worker and both names never get installed together. Version::current() looks up roadrunner/worker before the old name, because the replaced entry carries no pretty version. Namespaces stay unchanged. Assisted-By: Claude Opus 5.5 --- .github/.release-please-config.json | 2 +- README.md | 12 +++--- composer.json | 67 +++++++++++++++++------------ src/Version.php | 1 + tests/Unit/VersionTest.php | 25 ++++++++++- 5 files changed, 71 insertions(+), 36 deletions(-) diff --git a/.github/.release-please-config.json b/.github/.release-please-config.json index cef756b..3fa3d36 100644 --- a/.github/.release-please-config.json +++ b/.github/.release-please-config.json @@ -3,7 +3,7 @@ "release-type": "php", "packages": { ".": { - "package-name": "spiral/roadrunner-worker", + "package-name": "roadrunner/worker", "changelog-path": "/CHANGELOG.md" } }, diff --git a/README.md b/README.md index 63face5..10288bb 100644 --- a/README.md +++ b/README.md @@ -28,18 +28,18 @@ Check [roadrunner-server/roadrunner](https://github.com/roadrunner-server/roadru ### Installation ```bash -composer require spiral/roadrunner-worker +composer require roadrunner/worker ``` -[![PHP](https://img.shields.io/packagist/php-v/spiral/roadrunner-worker.svg?style=flat-square&logo=php)](https://packagist.org/packages/spiral/roadrunner-worker) -[![Latest Version on Packagist](https://img.shields.io/packagist/v/spiral/roadrunner-worker.svg?style=flat-square&logo=packagist)](https://packagist.org/packages/spiral/roadrunner-worker) -[![License](https://img.shields.io/packagist/l/spiral/roadrunner-worker.svg?style=flat-square)](LICENSE) -[![Total Downloads](https://img.shields.io/packagist/dt/spiral/roadrunner-worker.svg?style=flat-square)](https://packagist.org/packages/spiral/roadrunner-worker/stats) +[![PHP](https://img.shields.io/packagist/php-v/roadrunner/worker.svg?style=flat-square&logo=php)](https://packagist.org/packages/roadrunner/worker) +[![Latest Version on Packagist](https://img.shields.io/packagist/v/roadrunner/worker.svg?style=flat-square&logo=packagist)](https://packagist.org/packages/roadrunner/worker) +[![License](https://img.shields.io/packagist/l/roadrunner/worker.svg?style=flat-square)](LICENSE) +[![Total Downloads](https://img.shields.io/packagist/dt/roadrunner/worker.svg?style=flat-square)](https://packagist.org/packages/roadrunner/worker/stats) The RoadRunner binary can be downloaded with the [RoadRunner CLI](https://github.com/roadrunner-php/cli): ```bash -composer require spiral/roadrunner-cli --dev +composer require roadrunner/cli --dev vendor/bin/rr get ``` diff --git a/composer.json b/composer.json index e77c034..dbcc91a 100644 --- a/composer.json +++ b/composer.json @@ -1,48 +1,62 @@ { - "name": "spiral/roadrunner-worker", + "name": "roadrunner/worker", "type": "library", - "description": "RoadRunner: PHP worker", + "description": "Base PHP worker for the RoadRunner application server: receives payloads over Goridge, sends responses and manages the worker pool", + "keywords": [ + "roadrunner", + "worker", + "goridge", + "application-server", + "long-running" + ], "license": "MIT", "authors": [ { - "name": "Anton Titov (wolfy-j)", - "email": "wolfy-j@spiralscout.com" + "name": "Anton Titov", + "homepage": "https://github.com/wolfy-j" }, { "name": "Valery Piashchynski", "homepage": "https://github.com/rustatian" }, { - "name": "Aleksei Gagarin (roxblnfk)", + "name": "Aleksei Gagarin", "homepage": "https://github.com/roxblnfk" }, { - "name": "Pavel Buchnev (butschster)", - "email": "pavel.buchnev@spiralscout.com" + "name": "Pavel Buchnev", + "homepage": "https://github.com/butschster" }, { - "name": "Maksim Smakouz (msmakouz)", - "email": "maksim.smakouz@spiralscout.com" + "name": "Maksim Smakouz", + "homepage": "https://github.com/msmakouz" }, { "name": "RoadRunner Community", "homepage": "https://github.com/roadrunner-server/roadrunner/graphs/contributors" } ], - "homepage": "https://spiral.dev/", + "homepage": "https://roadrunner.dev/", "support": { - "docs": "https://docs.roadrunner.dev", + "docs": "https://docs.roadrunner.dev/docs/php-worker/worker", "issues": "https://github.com/roadrunner-server/roadrunner/issues", + "source": "https://github.com/roadrunner-php/worker", "chat": "https://discord.gg/V6EK4he" }, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/roadrunner-server" + } + ], "require": { "php": ">=8.2", "ext-json": "*", "ext-sockets": "*", + "composer-runtime-api": "^2.0", "psr/log": "^2.0 || ^3.0", - "spiral/goridge": "^4.3", - "spiral/roadrunner": "^3.0", - "composer-runtime-api": "^2.0" + "roadrunner/goridge": "^4.5", + "spiral/roadrunner": "^3.0" }, "require-dev": { "buggregator/trap": "^1.13", @@ -53,12 +67,11 @@ "testo/testo": "^0.10.55", "vimeo/psalm": "^6 || ^7" }, - "scripts": { - "cs:diff": "php-cs-fixer fix --dry-run -v --diff", - "cs:fix": "php-cs-fixer fix -v", - "test": "testo", - "psalm": "psalm", - "test:unit": "vendor/bin/testo --suite=Unit" + "replace": { + "spiral/roadrunner-worker": "self.version" + }, + "suggest": { + "roadrunner/cli": "Provides RoadRunner installation and management CLI tools" }, "autoload": { "psr-4": { @@ -70,14 +83,12 @@ "Spiral\\RoadRunner\\Tests\\Worker\\": "tests" } }, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/roadrunner-server" - } - ], - "suggest": { - "spiral/roadrunner-cli": "Provides RoadRunner installation and management CLI tools" + "scripts": { + "cs:diff": "php-cs-fixer fix --dry-run -v --diff", + "cs:fix": "php-cs-fixer fix -v", + "test": "testo", + "psalm": "psalm", + "test:unit": "vendor/bin/testo --suite=Unit" }, "config": { "audit": { diff --git a/src/Version.php b/src/Version.php index 95be987..e6ee388 100644 --- a/src/Version.php +++ b/src/Version.php @@ -10,6 +10,7 @@ final class Version { public const PACKAGE_NAMES = [ 'spiral/roadrunner', + 'roadrunner/worker', 'spiral/roadrunner-worker', ]; public const VERSION_FALLBACK = 'dev-master'; diff --git a/tests/Unit/VersionTest.php b/tests/Unit/VersionTest.php index e53de40..ddb14da 100644 --- a/tests/Unit/VersionTest.php +++ b/tests/Unit/VersionTest.php @@ -63,6 +63,29 @@ public static function provideVersions(): iterable '1.*', ]; + yield 'package under the new name' => [ + [ + 'roadrunner/worker' => [ + 'pretty_version' => 'v3.8.0', + ], + ], + '3.8.0', + '3.*', + ]; + + yield 'old name replaced by the new one' => [ + [ + 'spiral/roadrunner-worker' => [ + 'replaced' => ['v3.8.0'], + ], + 'roadrunner/worker' => [ + 'pretty_version' => 'v3.8.0', + ], + ], + '3.8.0', + '3.*', + ]; + yield 'calendar version' => [ [ 'spiral/roadrunner' => [ @@ -126,7 +149,7 @@ public static function provideVersions(): iterable yield [ [ - 'spiral/roadrunner-http' => [ + 'roadrunner/http' => [ 'pretty_version' => 'v1.8.0', ], ],