Use a boolean instead of a callable to enable coverage

Author: matthiasnoback

src/LiveCodeCoverage/LiveCodeCoverage.php

@@ -30,16 +30,16 @@ private function __construct(CodeCoverage $codeCoverage, $storageDirectory, $cov
     }
 
     /**
-     * @param callable $coverageEnabled
+     * @param bool $collectCodeCoverage
      * @param string $storageDirectory
      * @param string|null $phpunitConfigFilePath
      * @param string $coverageId
      * @return callable
      */
-    public static function bootstrap($coverageEnabled, $storageDirectory, $phpunitConfigFilePath = null, $coverageId = 'live-coverage')
+    public static function bootstrap($collectCodeCoverage, $storageDirectory, $phpunitConfigFilePath = null, $coverageId = 'live-coverage')
     {
-        Assert::isCallable($coverageEnabled);
-        if (!$coverageEnabled()) {
+        Assert::boolean($collectCodeCoverage);
+        if (!$collectCodeCoverage) {
             return function () {
                 // do nothing - code coverage is not enabled
             };
@@ -60,15 +60,15 @@ public static function bootstrap($coverageEnabled, $storageDirectory, $phpunitCo
     }
 
     /**
-     * @param callable $coverageEnabled
+     * @param bool $coverageEnabled
      * @param string $storageDirectory
      * @param null $phpunitConfigFilePath
      * @return callable
      */
     public static function bootstrapRemoteCoverage($coverageEnabled, $storageDirectory, $phpunitConfigFilePath = null)
     {
-        Assert::isCallable($coverageEnabled);
-        if (!$coverageEnabled()) {
+        Assert::boolean($coverageEnabled);
+        if (!$coverageEnabled) {
             return function () {
                 // do nothing - code coverage is not enabled
             };
@@ -87,7 +87,12 @@ public static function bootstrapRemoteCoverage($coverageEnabled, $storageDirecto
         $coverageId = isset($_GET['coverage_id']) ? $_GET['coverage_id'] :
             (isset($_COOKIE['coverage_id']) ? $_COOKIE['coverage_id'] : 'live-coverage');
 
-        return self::bootstrap($coverageEnabled, $storageDirectory, $phpunitConfigFilePath, $coverageId);
+        return self::bootstrap(
+            isset($_COOKIE['collect_code_coverage']) && (bool)$_COOKIE['collect_code_coverage'],
+            $storageDirectory,
+            $phpunitConfigFilePath,
+            $coverageId
+        );
     }
 
     private function start()

test/functional/prepend.php

@@ -3,7 +3,7 @@
 use LiveCodeCoverage\LiveCodeCoverage;
 
 $shutDownCodeCoverage = LiveCodeCoverage::bootstrap(
-    function() { return true; },
+    true,
     __DIR__ . '/coverage',
     __DIR__ . '/phpunit.xml.dist'
 );