v3.4.0 - php-code-coverage v6.0 support

Author: ek9

.travis.yml

@@ -2,9 +2,6 @@ language: php
 
 matrix:
   include:
-    - php: 7.0
-    - php: 7.0
-      deps: low
     - php: 7.1
     - php: 7.1
       deps: low

CHANGELOG.md

@@ -6,6 +6,12 @@ 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/).
 
+## [3.4.0] - 2018-05-04
+
+- Require PHP 7.1 and php-code-coverage ^6.0.
+- Fixes for Drivers to support php-code-coverage ^6.0.
+- Updated require-dev to use phpunit v7.0
+
 ## [3.3.1] - 2018-05-04
 
 - Fix compatibility with `phpunit/php-code-coverage:^6.0`, only leaving support

behat.yml.dist

@@ -10,3 +10,13 @@ default:
         format: html
         options:
           target: build/coverage-behat
+        html:
+          options:
+            target: build/coverage-behat
+        php:
+          options:
+            target: build/coverage-behat.php
+        crap4j:
+          options:
+            target: build/coverage-behat.crap4j
+

composer.json

@@ -26,7 +26,7 @@
     },
     "require": {
         "php": ">=5.6",
-        "phpunit/php-code-coverage": "^5.0",
+        "phpunit/php-code-coverage": "^5.0,<6.0",
         "behat/behat": "^3.0",
         "guzzlehttp/guzzle": "^6.0",
         "symfony/config": "^2.3||^3.0||^4.0",

features/bootstrap/FeatureContext.php

@@ -0,0 +1,22 @@
+<?php
+
+use Behat\Behat\Context\Context;
+use Behat\Gherkin\Node\PyStringNode;
+use Behat\Gherkin\Node\TableNode;
+
+/**
+ * Defines application features from the specific context.
+ */
+class FeatureContext implements Context
+{
+    /**
+     * Initializes context.
+     *
+     * Every scenario gets its own context instance.
+     * You can also pass arbitrary arguments to the
+     * context constructor through behat.yml.
+     */
+    public function __construct()
+    {
+    }
+}

features/test.feature

@@ -0,0 +1,9 @@
+Feature: Listing command
+  In order to change the structure of the folder I am currently in
+  As a UNIX user
+  I need to be able see the currently available files and folders there
+
+  Scenario: Listing two files in a directory
+    Given I am in a directory "test"
+    When I run "ls"
+    Then I should get "bla"

src/Common/Driver/HHVM.php

@@ -36,18 +36,22 @@ public function __construct()
     /**
      * {@inheritdoc}
      */
-    public function start($determineUnusedAndDead = true)
+    public function start($determineUnusedAndDead = true): void
     {
         fb_enable_code_coverage();
     }
 
     /**
      * {@inheritdoc}
      */
-    public function stop()
+    public function stop(): array
     {
         $codeCoverage = fb_get_code_coverage(true);
 
+        if (null === $codeCoverage) {
+            $codeCoverage = [];
+        }
+
         fb_disable_code_coverage();
 
         return $codeCoverage;

src/Common/Driver/Stub.php

@@ -43,7 +43,7 @@ public function getDriver()
     /**
      * {@inheritdoc}
      */
-    public function start($determineUnusedAndDead = true)
+    public function start($determineUnusedAndDead = true): void
     {
         if ($this->driver) {
             $this->driver->start();
@@ -53,7 +53,7 @@ public function start($determineUnusedAndDead = true)
     /**
      * {@inheritdoc}
      */
-    public function stop()
+    public function stop(): array
     {
         return $this->driver ? $this->driver->stop() : false;
     }

src/Common/Driver/XCache.php

@@ -41,18 +41,22 @@ public function __construct()
     /**
      * {@inheritdoc}
      */
-    public function start($determineUnusedAndDead = true)
+    public function start($determineUnusedAndDead = true): void
     {
         xcache_coverager_start();
     }
 
     /**
      * {@inheritdoc}
      */
-    public function stop()
+    public function stop(): array
     {
         $codeCoverage = xcache_coverager_get();
 
+        if (null === $codeCoverage) {
+            $codeCoverage = [];
+        }
+
         xcache_coverager_stop(true);
 
         return $codeCoverage;

src/Common/Model/Aggregate.php

@@ -19,15 +19,7 @@ class Aggregate
     /**
      * @var array
      */
-    private $coverage;
-
-    /**
-     * Constructor
-     */
-    public function __construct()
-    {
-        $this->coverage = array();
-    }
+    private $coverage = [];
 
     /**
      * Update aggregated coverage