Merge pull request #301 from ergebnis/fix/arguments-and-options

Fix: Actually allow passing argument and options to command
ergebnis · Dec 28, 2019 · a60faee · a60faee
2 parents 5c63fc9 + d2c3ebf
commit a60faee
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 4 deletions.
diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
@@ -299,3 +299,6 @@ jobs:
 
       - name: "Run composer-normalize.phar"
         run: "${{ env.COMPOSER_NORMALIZE_PHAR }}"
+
+      - name: "Run composer-normalize.phar with argument and options"
+        run: "${{ env.COMPOSER_NORMALIZE_PHAR }} --dry-run composer.json"
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -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.1.1...master`][2.1.1...master].
+For a full diff see [`2.1.2...master`][2.1.2...master].
+
+## [`2.1.2`][2.1.1]
+
+For a full diff see [`2.1.1...2.1.2`][2.1.1...2.1.2].
+
+### Fixed
+
+* Allow passing argument and options to the command ([#301]), by [@localheinz]
 
 ## [`2.1.1`][2.1.1]
 
@@ -275,6 +283,7 @@ For a full diff see [`81bc3a8...0.1.0`][81bc3a8...0.1.0].
 [2.0.2]: https://github.com/ergebnis/composer-normalize/releases/tag/2.0.2
 [2.1.0]: https://github.com/ergebnis/composer-normalize/releases/tag/2.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
 
 [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
@@ -299,7 +308,8 @@ For a full diff see [`81bc3a8...0.1.0`][81bc3a8...0.1.0].
 [2.0.1...2.0.2]: https://github.com/ergebnis/composer-normalize/compare/2.0.1...2.0.2
 [2.0.2...2.1.0]: https://github.com/ergebnis/composer-normalize/compare/2.0.2...2.1.0
 [2.1.0...2.1.1]: https://github.com/ergebnis/composer-normalize/compare/2.1.0...2.1.1
-[2.1.1...master]: https://github.com/ergebnis/composer-normalize/compare/2.1.1...master
+[2.1.1...2.1.2]: https://github.com/ergebnis/composer-normalize/compare/2.1.1...2.1.2
+[2.1.2...master]: https://github.com/ergebnis/composer-normalize/compare/2.1.2...master
 
 [#1]: https://github.com/ergebnis/composer-normalize/pull/1
 [#2]: https://github.com/ergebnis/composer-normalize/pull/2
@@ -338,6 +348,7 @@ For a full diff see [`81bc3a8...0.1.0`][81bc3a8...0.1.0].
 [#280]: https://github.com/ergebnis/composer-normalize/pull/280
 [#292]: https://github.com/ergebnis/composer-normalize/pull/292
 [#297]: https://github.com/ergebnis/composer-normalize/pull/297
+[#301]: https://github.com/ergebnis/composer-normalize/pull/301
 
 [@ergebnis]: https://github.com/ergebnis
 [@localheinz]: https://github.com/localheinz

diff --git a/Makefile b/Makefile
@@ -28,6 +28,7 @@ phar: vendor ## Builds a phar with humbug/box
 	git checkout HEAD -- composer.json composer.lock
 	phar/box.phar info .build/phar/composer-normalize.phar
 	.build/phar/composer-normalize.phar
+	.build/phar/composer-normalize.phar --dry-run composer.json
 
 .PHONY: static-code-analysis
 static-code-analysis: vendor ## Runs a static code analysis with phpstan/phpstan

diff --git a/phar/composer-normalize.php b/phar/composer-normalize.php
@@ -17,6 +17,7 @@
 use Ergebnis\Json\Normalizer;
 use Ergebnis\Json\Printer;
 use Localheinz\Diff;
+use Symfony\Component\Console;
 
 require_once __DIR__ . '/../vendor/autoload.php';
 
@@ -33,5 +34,16 @@
 $application = new Normalize\Application();
 
 $application->add($command);
-$application->setDefaultCommand($command->getName());
-$application->run();
+
+if (1 === \count($argv) || 'normalize' !== $argv[1]) {
+    \array_splice(
+        $argv,
+        1,
+        0,
+        [
+            'normalize',
+        ]
+    );
+}
+
+$application->run(new Console\Input\ArgvInput($argv));