Skip to content

Commit

Permalink
Enhancement: Remove dependency on ergebnis/composer-json-normalizer
Browse files Browse the repository at this point in the history
  • Loading branch information
localheinz committed Jan 9, 2020
1 parent eb6ecb9 commit 826b8d8
Show file tree
Hide file tree
Showing 5 changed files with 32 additions and 78 deletions.
15 changes: 13 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## Unreleased

For a full diff see [`2.2.0...master`][2.2.0...master].
For a full diff see [`2.2.1...master`][2.2.1...master].

## [`2.2.1`][2.2.1]

For a full diff see [`2.2.0...2.2.1`][2.2.0...2.2.1].

### Changed

* Removed dependency on `ergebnis/composer-json-normalizer` ([#316]), by [@localheinz]

## [`2.2.0`][2.2.0]

Expand Down Expand Up @@ -293,6 +301,7 @@ For a full diff see [`81bc3a8...0.1.0`][81bc3a8...0.1.0].
[2.1.1]: https://github.com/ergebnis/composer-normalize/releases/tag/2.1.1
[2.1.2]: https://github.com/ergebnis/composer-normalize/releases/tag/2.1.2
[2.2.0]: https://github.com/ergebnis/composer-normalize/releases/tag/2.2.0
[2.2.1]: https://github.com/ergebnis/composer-normalize/releases/tag/2.2.1

[81bc3a8...0.1.0]: https://github.com/ergebnis/composer-normalize/compare/81bc3a8...0.1.0
[0.1.0...0.2.0]: https://github.com/ergebnis/composer-normalize/compare/0.1.0...0.2.0
Expand All @@ -319,7 +328,8 @@ For a full diff see [`81bc3a8...0.1.0`][81bc3a8...0.1.0].
[2.1.0...2.1.1]: https://github.com/ergebnis/composer-normalize/compare/2.1.0...2.1.1
[2.1.1...2.1.2]: https://github.com/ergebnis/composer-normalize/compare/2.1.1...2.1.2
[2.1.2...2.2.0]: https://github.com/ergebnis/composer-normalize/compare/2.1.2...2.2.0
[2.2.0...master]: https://github.com/ergebnis/composer-normalize/compare/2.2.0...master
[2.2.0...2.2.1]: https://github.com/ergebnis/composer-normalize/compare/2.2.0...2.2.1
[2.2.1...master]: https://github.com/ergebnis/composer-normalize/compare/2.2.1...master

[#1]: https://github.com/ergebnis/composer-normalize/pull/1
[#2]: https://github.com/ergebnis/composer-normalize/pull/2
Expand Down Expand Up @@ -360,6 +370,7 @@ For a full diff see [`81bc3a8...0.1.0`][81bc3a8...0.1.0].
[#297]: https://github.com/ergebnis/composer-normalize/pull/297
[#301]: https://github.com/ergebnis/composer-normalize/pull/301
[#303]: https://github.com/ergebnis/composer-normalize/pull/303
[#316]: https://github.com/ergebnis/composer-normalize/pull/316

[@ergebnis]: https://github.com/ergebnis
[@localheinz]: https://github.com/localheinz
Expand Down
3 changes: 1 addition & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,7 @@
"require": {
"php": "^7.1",
"composer-plugin-api": "^1.1.0",
"ergebnis/composer-json-normalizer": "^2.0.1",
"ergebnis/json-normalizer": "~0.10.1",
"ergebnis/json-normalizer": "~0.11.0",
"ergebnis/json-printer": "^3.0.2",
"localheinz/diff": "^1.0.1"
},
Expand Down
86 changes: 16 additions & 70 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions phar/composer-normalize.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
*/

use Composer\Factory;
use Ergebnis\Composer\Json;
use Ergebnis\Composer\Normalize;
use Ergebnis\Json\Normalizer;
use Ergebnis\Json\Printer;
Expand All @@ -23,7 +22,7 @@

$command = new Normalize\Command\NormalizeCommand(
new Factory(),
new Json\Normalizer\ComposerJsonNormalizer(__DIR__ . '/../resource/schema.json'),
new Normalizer\Vendor\Composer\ComposerJsonNormalizer(__DIR__ . '/../resource/schema.json'),
new Normalizer\Format\Formatter(new Printer\Printer()),
new Diff\Differ(new Diff\Output\StrictUnifiedDiffOutputBuilder([
'fromFile' => 'original',
Expand Down
3 changes: 1 addition & 2 deletions src/NormalizePlugin.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
use Composer\Factory;
use Composer\IO;
use Composer\Plugin;
use Ergebnis\Composer\Json\Normalizer\ComposerJsonNormalizer;
use Ergebnis\Json\Normalizer;
use Ergebnis\Json\Printer;
use Localheinz\Diff;
Expand All @@ -40,7 +39,7 @@ public function getCommands(): array
return [
new Command\NormalizeCommand(
new Factory(),
new ComposerJsonNormalizer(\sprintf(
new Normalizer\Vendor\Composer\ComposerJsonNormalizer(\sprintf(
'file://%s',
__DIR__ . '/../resource/schema.json'
)),
Expand Down

0 comments on commit 826b8d8

Please sign in to comment.