Merge pull request #45 from jaylinski/release/6.1.0

Release version 6.1.0

Author: shulard

.editorconfig

@@ -10,12 +10,12 @@ insert_final_newline = true
 
 # Matches multiple files with brace expansion notation
 # Set default charset
-[*.{json,php}]
+[*.{json,php,xml}]
 charset = utf-8
 indent_style = space
 indent_size = 4
 
-[*.{yml,yaml}]
+[*.{yml,yaml,yml.dist}]
 indent_style = space
 indent_size = 2
 

.github/workflows/continuous-integration.yml

@@ -47,20 +47,16 @@ jobs:
           restore-keys: ${{ runner.os }}-composer-
 
       - name: Install dependencies
-        if: ${{ matrix.php-versions != '8.0' }} # Remove this as soon as `drupol/php-conventions` supports PHP 8
         run: composer install --no-progress --no-suggest --prefer-dist --optimize-autoloader
 
       - name: Run Grumphp
-        if: ${{ matrix.php-versions != '8.0' }} # Remove this as soon as `drupol/php-conventions` supports PHP 8
         run: vendor/bin/grumphp run --no-ansi -n
 
       - name: Send PSALM data
-        if: ${{ matrix.php-versions != '8.0' }} # Remove this as soon as `drupol/php-conventions` supports PHP 8
-        run: vendor/bin/psalm --shepherd --stats
+        run: vendor/bin/psalm --shepherd --stats src/
         continue-on-error: true
 
       - name: Send Scrutinizer data
-        if: ${{ matrix.php-versions != '8.0' }} # Remove this as soon as `drupol/php-conventions` supports PHP 8
         run: |
           wget https://scrutinizer-ci.com/ocular.phar
           php ocular.phar code-coverage:upload --format=php-clover build/logs/clover.xml

CHANGELOG.md

@@ -6,6 +6,10 @@ documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## [6.1.0] - 2021-03-30
+
+- Added support for directory filtering #44
+
 ## [6.0.0] - 2020-11-28
 
 - Support PHP 8

composer.json

@@ -34,7 +34,7 @@
         },
         {
             "name": "Jay Linski",
-            "homepage": "https://twitter.com/jay_linski"
+            "homepage": "https://github.com/jaylinski"
         }
     ],
     "require": {
@@ -46,7 +46,8 @@
         "sebastian/comparator": "< 2.0"
     },
     "require-dev": {
-        "drupol/php-conventions": "^1.7.1 || ^1.8.16"
+        "drupol/php-conventions": "^3.0",
+        "vimeo/psalm": "^4.7"
     },
     "suggest": {
         "ext-pcov": "Install PCov extension to generate code coverage.",

grumphp.yml.dist

@@ -1,5 +1,5 @@
 imports:
-  - { resource: vendor/drupol/php-conventions/config/php71/grumphp.yml }
+  - { resource: vendor/drupol/php-conventions/config/php73/grumphp.yml }
 
 parameters:
   extra_tasks:

psalm.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+<psalm
+        errorLevel="7"
+        totallyTyped="true"
+        resolveFromConfigFile="true"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xmlns="https://getpsalm.org/schema/config"
+        xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
+>
+    <projectFiles>
+        <directory name="src" />
+        <ignoreFiles>
+            <directory name="vendor" />
+            <directory name="spec" />
+        </ignoreFiles>
+    </projectFiles>
+</psalm>

src/CodeCoverageExtension.php

@@ -16,6 +16,7 @@
 
 use FriendsOfPhpSpec\PhpSpec\CodeCoverage\Exception\NoCoverageDriverAvailableException;
 use FriendsOfPhpSpec\PhpSpec\CodeCoverage\Listener\CodeCoverageListener;
+use PhpSpec\Console\ConsoleIO;
 use PhpSpec\Extension;
 use PhpSpec\ServiceContainer;
 use RuntimeException;
@@ -24,6 +25,7 @@
 use SebastianBergmann\CodeCoverage\Filter;
 use SebastianBergmann\CodeCoverage\Report;
 use SebastianBergmann\CodeCoverage\Version;
+use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 
 use function count;
@@ -50,7 +52,7 @@ public function load(ServiceContainer $container, array $params = []): void
             return new Filter();
         });
 
-        $container->define('code_coverage', static function ($container) {
+        $container->define('code_coverage', static function (ServiceContainer $container) {
             /** @var Filter $filter */
             $filter = $container->get('code_coverage.filter');
 
@@ -65,7 +67,7 @@ public function load(ServiceContainer $container, array $params = []): void
             }
         });
 
-        $container->define('code_coverage.options', static function ($container) use ($params) {
+        $container->define('code_coverage.options', static function (ServiceContainer $container) use ($params) {
             $options = !empty($params) ? $params : $container->getParam('code_coverage');
 
             if (!isset($options['format'])) {
@@ -100,7 +102,8 @@ public function load(ServiceContainer $container, array $params = []): void
             return $options;
         });
 
-        $container->define('code_coverage.reports', static function ($container) {
+        $container->define('code_coverage.reports', static function (ServiceContainer $container) {
+            /** @var array<string, mixed> $options */
             $options = $container->get('code_coverage.options');
 
             $reports = [];
@@ -144,20 +147,26 @@ public function load(ServiceContainer $container, array $params = []): void
             return $reports;
         });
 
-        $container->define('event_dispatcher.listeners.code_coverage', static function ($container) {
+        $container->define('event_dispatcher.listeners.code_coverage', static function (ServiceContainer $container) {
             $skipCoverage = false;
+
+            /** @var InputInterface $input */
             $input = $container->get('console.input');
 
             if ($input->hasOption('no-coverage') && $input->getOption('no-coverage')) {
                 $skipCoverage = true;
             }
 
-            $listener = new CodeCoverageListener(
-                $container->get('console.io'),
-                $container->get('code_coverage'),
-                $container->get('code_coverage.reports'),
-                $skipCoverage
-            );
+            /** @var ConsoleIO $consoleIO */
+            $consoleIO = $container->get('console.io');
+
+            /** @var CodeCoverage $codeCoverage */
+            $codeCoverage = $container->get('code_coverage');
+
+            /** @var array<string, object> $codeCoverageReports */
+            $codeCoverageReports = $container->get('code_coverage.reports');
+
+            $listener = new CodeCoverageListener($consoleIO, $codeCoverage, $codeCoverageReports, $skipCoverage);
             $listener->setOptions($container->getParam('code_coverage', []));
 
             return $listener;