From a29eb98c1c72e009509ae825ddd95185f4ca44be Mon Sep 17 00:00:00 2001 From: Simon Schaufelberger Date: Wed, 8 Jul 2026 19:56:35 +0200 Subject: [PATCH] [TASK] Use ComposerJsonManipulator from SimonSchaufi --- composer.json | 2 +- packages/fractor-composer-json/composer.json | 2 +- .../Fixtures/composer.json.fixture | 6 +++--- .../fractor-composer-json/src/ComposerJsonFactory.php | 6 +++--- ...ionisComposerJson.php => ComposerJsonValueObject.php} | 9 +++++---- 5 files changed, 13 insertions(+), 12 deletions(-) rename packages/fractor-composer-json/src/ValueObject/{EtaOrionisComposerJson.php => ComposerJsonValueObject.php} (88%) diff --git a/composer.json b/composer.json index 8031fd4b..4e8f93f8 100644 --- a/composer.json +++ b/composer.json @@ -20,7 +20,6 @@ "ext-xml": "*", "composer-plugin-api": "^2.0", "ergebnis/json-printer": "^3.5", - "eta-orionis/composer-json-manipulator": "^1.0.1", "helmich/typo3-typoscript-parser": "^2.8.0", "league/flysystem": "^2.0 || ^3.0", "league/flysystem-memory": "^2.0 || ^3.0", @@ -28,6 +27,7 @@ "ondram/ci-detector": "^4.2", "phpstan/phpstan": "^2.0.0", "sebastian/diff": "^4.0 || ^5.0 || ^6.0 || ^7.0 || ^8.0 || ^9.0", + "simonschaufi/composer-json-manipulator": "^1.0", "simonschaufi/pretty-xml": "^3.0.0", "symfony/config": "^5.4 || ^6.4 || ^7.0 || ^8.0", "symfony/console": "^5.4 || ^6.4 || ^7.0 || ^8.0", diff --git a/packages/fractor-composer-json/composer.json b/packages/fractor-composer-json/composer.json index 2de38a50..752d5c4e 100644 --- a/packages/fractor-composer-json/composer.json +++ b/packages/fractor-composer-json/composer.json @@ -24,8 +24,8 @@ "a9f/fractor-doc-generator": "^1.0", "a9f/fractor-extension-installer": "^1.0", "ergebnis/json-printer": "^3.5", - "eta-orionis/composer-json-manipulator": "^1.0.1", "nette/utils": "^4.0", + "simonschaufi/composer-json-manipulator": "^1.0", "symplify/rule-doc-generator-contracts": "^11.2", "webmozart/assert": "^1.11 || ^2.0" }, diff --git a/packages/fractor-composer-json/rules-tests/AddPackageToRequireComposerJsonFractor/Fixtures/composer.json.fixture b/packages/fractor-composer-json/rules-tests/AddPackageToRequireComposerJsonFractor/Fixtures/composer.json.fixture index 5582c727..f7ccfcfd 100644 --- a/packages/fractor-composer-json/rules-tests/AddPackageToRequireComposerJsonFractor/Fixtures/composer.json.fixture +++ b/packages/fractor-composer-json/rules-tests/AddPackageToRequireComposerJsonFractor/Fixtures/composer.json.fixture @@ -6,11 +6,11 @@ } ----- { + "require": { + "vendor1/package3": "^3.0" + }, "require-dev": { "vendor1/package1": "^1.0", "vendor1/package2": "^2.0" - }, - "require": { - "vendor1/package3": "^3.0" } } \ No newline at end of file diff --git a/packages/fractor-composer-json/src/ComposerJsonFactory.php b/packages/fractor-composer-json/src/ComposerJsonFactory.php index 01306db3..2e547703 100644 --- a/packages/fractor-composer-json/src/ComposerJsonFactory.php +++ b/packages/fractor-composer-json/src/ComposerJsonFactory.php @@ -5,12 +5,12 @@ namespace a9f\FractorComposerJson; use a9f\Fractor\Application\ValueObject\File; -use a9f\FractorComposerJson\ValueObject\EtaOrionisComposerJson; +use a9f\FractorComposerJson\ValueObject\ComposerJsonValueObject; final class ComposerJsonFactory { - public function createFromFile(File $file): EtaOrionisComposerJson + public function createFromFile(File $file): ComposerJsonValueObject { - return EtaOrionisComposerJson::fromFile($file); + return ComposerJsonValueObject::fromFile($file); } } diff --git a/packages/fractor-composer-json/src/ValueObject/EtaOrionisComposerJson.php b/packages/fractor-composer-json/src/ValueObject/ComposerJsonValueObject.php similarity index 88% rename from packages/fractor-composer-json/src/ValueObject/EtaOrionisComposerJson.php rename to packages/fractor-composer-json/src/ValueObject/ComposerJsonValueObject.php index dc5ed7ad..6adeadc8 100644 --- a/packages/fractor-composer-json/src/ValueObject/EtaOrionisComposerJson.php +++ b/packages/fractor-composer-json/src/ValueObject/ComposerJsonValueObject.php @@ -5,18 +5,19 @@ namespace a9f\FractorComposerJson\ValueObject; use a9f\Fractor\Application\ValueObject\File; -use a9f\FractorComposerJson\Contract\ComposerJson; +use a9f\FractorComposerJson\Contract\ComposerJson as ComposerJsonInterface; +use SimonSchaufi\ComposerJsonManipulator\ComposerJson; -final readonly class EtaOrionisComposerJson implements ComposerJson +final readonly class ComposerJsonValueObject implements ComposerJsonInterface { public function __construct( - private \EtaOrionis\ComposerJsonManipulator\ComposerJson $composerJson + private ComposerJson $composerJson ) { } public static function fromFile(File $file): self { - return new self(\EtaOrionis\ComposerJsonManipulator\ComposerJson::fromFile($file->getFilePath())); + return new self(ComposerJson::fromFile($file->getFilePath())); } public function getJsonArray(): array