Merge pull request #15 from ptondereau/update-phpspec6

Add PHPSPEC v6 support.

Author: shulard

composer.json

@@ -39,7 +39,7 @@
     ],
     "require": {
         "php": "^7.1",
-        "phpspec/phpspec": "^4.2 || ^5.0",
+        "phpspec/phpspec": "^4.2 || ^5.0 || ^6.0",
         "phpunit/php-code-coverage": "^5.0 || ^6.0 || ^7.0"
     },
     "require-dev": {

spec/CodeCoverageExtensionSpec.php

@@ -4,6 +4,7 @@
 
 namespace spec\FriendsOfPhpSpec\PhpSpec\CodeCoverage;
 
+use Exception;
 use FriendsOfPhpSpec\PhpSpec\CodeCoverage\CodeCoverageExtension;
 use PhpSpec\ObjectBehavior;
 use PhpSpec\ServiceContainer\IndexedServiceContainer;

spec/Exception/NoCoverageDriverAvailableExceptionSpec.php

@@ -6,6 +6,7 @@
 
 use FriendsOfPhpSpec\PhpSpec\CodeCoverage\Exception\NoCoverageDriverAvailableException;
 use PhpSpec\ObjectBehavior;
+use RuntimeException;
 
 /**
  * @author Stéphane Hulard
@@ -14,7 +15,7 @@ class NoCoverageDriverAvailableExceptionSpec extends ObjectBehavior
 {
     public function it_is_initializable(): void
     {
-        $this->shouldBeAnInstanceOf(\RuntimeException::class);
+        $this->shouldBeAnInstanceOf(RuntimeException::class);
         $this->shouldHaveType(NoCoverageDriverAvailableException::class);
     }
 }

src/CodeCoverageExtension.php

@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the friends-of-phpspec/phpspec-code-coverage package.
  *
@@ -12,18 +10,24 @@
  * that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace FriendsOfPhpSpec\PhpSpec\CodeCoverage;
 
 use FriendsOfPhpSpec\PhpSpec\CodeCoverage\Exception\NoCoverageDriverAvailableException;
 use FriendsOfPhpSpec\PhpSpec\CodeCoverage\Listener\CodeCoverageListener;
 use PhpSpec\Extension;
 use PhpSpec\ServiceContainer;
+use RuntimeException;
 use SebastianBergmann\CodeCoverage\CodeCoverage;
 use SebastianBergmann\CodeCoverage\Filter;
 use SebastianBergmann\CodeCoverage\Report;
 use SebastianBergmann\CodeCoverage\Version;
 use Symfony\Component\Console\Input\InputOption;
 
+use function count;
+use function is_array;
+
 /**
  * Injects Code Coverage Event Subscriber into the EventDispatcher.
  * The Subscriber will add Code Coverage information before each example.
@@ -48,7 +52,7 @@ public function load(ServiceContainer $container, array $params = []): void
         $container->define('code_coverage', static function ($container) {
             try {
                 $coverage = new CodeCoverage(null, $container->get('code_coverage.filter'));
-            } catch (\RuntimeException $error) {
+            } catch (RuntimeException $error) {
                 throw new NoCoverageDriverAvailableException(
                     'There is no available coverage driver to be used.',
                     0,
@@ -64,12 +68,12 @@ public function load(ServiceContainer $container, array $params = []): void
 
             if (!isset($options['format'])) {
                 $options['format'] = ['html'];
-            } elseif (!\is_array($options['format'])) {
+            } elseif (!is_array($options['format'])) {
                 $options['format'] = (array) $options['format'];
             }
 
             if (isset($options['output'])) {
-                if (!\is_array($options['output']) && 1 === \count($options['format'])) {
+                if (!is_array($options['output']) && 1 === count($options['format'])) {
                     $format = $options['format'][0];
                     $options['output'] = [$format => $options['output']];
                 }

src/Exception/NoCoverageDriverAvailableException.php

@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the friends-of-phpspec/phpspec-code-coverage.
  *
@@ -12,6 +10,8 @@
  * that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace FriendsOfPhpSpec\PhpSpec\CodeCoverage\Exception;
 
 use RuntimeException;

src/Listener/CodeCoverageListener.php

@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the friends-of-phpspec/phpspec-code-coverage package.
  *
@@ -12,6 +10,8 @@
  * that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace FriendsOfPhpSpec\PhpSpec\CodeCoverage\Listener;
 
 use PhpSpec\Console\ConsoleIO;
@@ -34,18 +34,9 @@ class CodeCoverageListener implements EventSubscriberInterface
 
     private $reports;
 
-    /**
-     * @var bool
-     */
     private $skipCoverage;
 
-    /**
-     * @param ConsoleIO    $io
-     * @param CodeCoverage $coverage
-     * @param array        $reports
-     * @param bool      $skipCoverage
-     */
-    public function __construct(ConsoleIO $io, CodeCoverage $coverage, array $reports, $skipCoverage = false)
+    public function __construct(ConsoleIO $io, CodeCoverage $coverage, array $reports, bool $skipCoverage = false)
     {
         $this->io = $io;
         $this->coverage = $coverage;
@@ -62,9 +53,6 @@ public function __construct(ConsoleIO $io, CodeCoverage $coverage, array $report
         $this->skipCoverage = $skipCoverage;
     }
 
-    /**
-     * @param ExampleEvent $event
-     */
     public function afterExample(ExampleEvent $event): void
     {
         if ($this->skipCoverage) {
@@ -74,9 +62,6 @@ public function afterExample(ExampleEvent $event): void
         $this->coverage->stop();
     }
 
-    /**
-     * @param SuiteEvent $event
-     */
     public function afterSuite(SuiteEvent $event): void
     {
         if ($this->skipCoverage) {
@@ -93,7 +78,7 @@ public function afterSuite(SuiteEvent $event): void
 
         foreach ($this->reports as $format => $report) {
             if ($this->io && $this->io->isVerbose()) {
-                $this->io->writeln(\sprintf('Generating code coverage report in %s format ...', $format));
+                $this->io->writeln(sprintf('Generating code coverage report in %s format ...', $format));
             }
 
             if ($report instanceof Report\Text) {
@@ -106,9 +91,6 @@ public function afterSuite(SuiteEvent $event): void
         }
     }
 
-    /**
-     * @param ExampleEvent $event
-     */
     public function beforeExample(ExampleEvent $event): void
     {
         if ($this->skipCoverage) {
@@ -123,7 +105,7 @@ public function beforeExample(ExampleEvent $event): void
             $name = $spec->getClassReflection()->getName();
         }
 
-        $name = \strtr('%spec%::%example%', [
+        $name = strtr('%spec%::%example%', [
             '%spec%' => $name,
             '%example%' => $example->getFunctionReflection()->getName(),
         ]);
@@ -175,9 +157,6 @@ public static function getSubscribedEvents(): array
         ];
     }
 
-    /**
-     * @param array $options
-     */
     public function setOptions(array $options): void
     {
         $this->options = $options + $this->options;

src/bootstrap.php

@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the friends-of-phpspec/phpspec-code-coverage package.
  *
@@ -11,9 +9,12 @@
  * For the full copyright and license information, please see the LICENSE file
  * that was distributed with this source code.
  */
+
+declare(strict_types=1);
+
 use FriendsOfPhpSpec\PhpSpec\CodeCoverage\CodeCoverageExtension;
 
-\class_alias(
+class_alias(
     CodeCoverageExtension::class,
     'LeanPHP\PhpSpec\CodeCoverage\CodeCoverageExtension'
 );