Merge branch 'v4.1'

ek9 · ek9 · commit 90a3fe26b36c · 2018-03-21T13:01:27.000Z
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -17,6 +17,12 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 - Updated PHP requirement from `^7.0` to `^7.1`
 - Updated `phpspec/phpspec` dependency from `~4.0` to `^4.2`
 
+## [4.1.2] - 2018-03-21
+
+- Fix `--no-coverage` option introducing errors when running non `run` commands.
+- `--no-coverage` option is now available to all phpspec commands (not only
+  `run`). (#30)
+
 ## [4.1.1] - 2018-03-19
 
 - Added `--no-coverage` option which can skip code coverage generation during
@@ -92,6 +98,7 @@ as [leanphp/phpspec-code-coverage][0].
   reports (`blaclist_files` option).
 
 [4.2.0]: https://github.com/leanphp/phpspec-code-coverage/releases/tag/v4.2.0
+[4.1.2]: https://github.com/leanphp/phpspec-code-coverage/releases/tag/v4.1.2
 [4.1.1]: https://github.com/leanphp/phpspec-code-coverage/releases/tag/v4.1.1
 [4.1.0]: https://github.com/leanphp/phpspec-code-coverage/releases/tag/v4.1.0
 [4.0.0]: https://github.com/leanphp/phpspec-code-coverage/releases/tag/v4.0.0
diff --git a/src/CodeCoverageExtension.php b/src/CodeCoverageExtension.php
@@ -35,9 +35,7 @@ class CodeCoverageExtension implements Extension
     public function load(ServiceContainer $container, array $params = [])
     {
         foreach ($container->getByTag('console.commands') as $command) {
-            if ($command->getName() === 'run') {
-                $command->addOption('no-coverage', null, InputOption::VALUE_NONE, 'Skip code coverage generation');
-            }
+            $command->addOption('no-coverage', null, InputOption::VALUE_NONE, 'Skip code coverage generation');
         }
 
         $container->define('code_coverage.filter', function () {
@@ -118,7 +116,7 @@ public function load(ServiceContainer $container, array $params = [])
 
             $skipCoverage = false;
             $input = $container->get('console.input');
-            if ($input->getOption('no-coverage')) {
+            if ($input->hasOption('no-coverage') && $input->getOption('no-coverage')) {
                 $skipCoverage = true;
             }
 

Original file line number	Diff line number	Diff line change
`@@ -35,9 +35,7 @@ class CodeCoverageExtension implements Extension`
`35`	`35`	`public function load(ServiceContainer $container, array $params = [])`
`36`	`36`	`{`
`37`	`37`	`foreach ($container->getByTag('console.commands') as $command) {`
`38`		`- if ($command->getName() === 'run') {`
`39`		`- $command->addOption('no-coverage', null, InputOption::VALUE_NONE, 'Skip code coverage generation');`
`40`		`- }`
	`38`	`+ $command->addOption('no-coverage', null, InputOption::VALUE_NONE, 'Skip code coverage generation');`
`41`	`39`	`}`
`42`	`40`
`43`	`41`	`$container->define('code_coverage.filter', function () {`
`@@ -118,7 +116,7 @@ public function load(ServiceContainer $container, array $params = [])`
`118`	`116`
`119`	`117`	`$skipCoverage = false;`
`120`	`118`	`$input = $container->get('console.input');`
`121`		`- if ($input->getOption('no-coverage')) {`
	`119`	`+ if ($input->hasOption('no-coverage') && $input->getOption('no-coverage')) {`
`122`	`120`	`$skipCoverage = true;`
`123`	`121`	`}`
`124`	`122`