Simplify.

Author: sebastianbergmann

PHP/CodeCoverage.php

@@ -353,6 +353,15 @@ public function setCacheTokens($flag)
         $this->cacheTokens = $flag;
     }
 
+    /**
+     * @return boolean
+     * @since  Method available since Release 1.1.0
+     */
+    public function getCacheTokens()
+    {
+        return $this->cacheTokens;
+    }
+
     /**
      * @param  boolean $flag
      * @throws InvalidArgumentException

PHP/CodeCoverage/Report/Clover.php

@@ -57,24 +57,6 @@
  */
 class PHP_CodeCoverage_Report_Clover
 {
-    /**
-     * @var boolean
-     */
-    protected $cacheTokens;
-
-    /**
-     * @param  boolean $cacheTokens
-     * @throws InvalidArgumentException
-     */
-    public function __construct($cacheTokens = TRUE)
-    {
-        if (!is_bool($cacheTokens)) {
-            throw new InvalidArgumentException;
-        }
-
-        $this->cacheTokens = $cacheTokens;
-    }
-
     /**
      * @param  PHP_CodeCoverage $coverage
      * @param  string           $target
@@ -83,6 +65,8 @@ public function __construct($cacheTokens = TRUE)
      */
     public function process(PHP_CodeCoverage $coverage, $target = NULL, $name = NULL)
     {
+        $cacheTokens = $coverage->getCacheTokens();
+
         $document = new DOMDocument('1.0', 'UTF-8');
         $document->formatOutput = TRUE;
 
@@ -132,7 +116,7 @@ public function process(PHP_CodeCoverage $coverage, $target = NULL, $name = NULL
                 $file = $document->createElement('file');
                 $file->setAttribute('name', $filename);
 
-                if ($this->cacheTokens) {
+                if ($cacheTokens) {
                     $tokens = PHP_Token_Stream_CachingFactory::get($filename);
                 } else {
                     $tokens = new PHP_Token_Stream($filename);
@@ -143,7 +127,7 @@ public function process(PHP_CodeCoverage $coverage, $target = NULL, $name = NULL
                 unset($tokens);
 
                 $ignoredLines = PHP_CodeCoverage_Util::getLinesToBeIgnored(
-                  $filename, $this->cacheTokens
+                  $filename, $cacheTokens
                 );
 
                 $lines = array();

PHP/CodeCoverage/Report/HTML.php

@@ -67,6 +67,11 @@ class PHP_CodeCoverage_Report_HTML
      */
     protected $options;
 
+    /**
+     * @var boolean
+     */
+    protected $cacheTokens;
+
     /**
      * Constructor.
      *
@@ -82,10 +87,6 @@ public function __construct(array $options = array())
             $options['charset'] = 'UTF-8';
         }
 
-        if (!isset($options['cacheTokens'])) {
-            $options['cacheTokens'] = TRUE;
-        }
-
         if (!isset($options['yui'])) {
             $options['yui'] = TRUE;
         }
@@ -124,6 +125,8 @@ public function __construct(array $options = array())
      */
     public function process(PHP_CodeCoverage $coverage, $target)
     {
+        $this->cacheTokens = $coverage->getCacheTokens();
+
         $target     = PHP_CodeCoverage_Util::getDirectory($target);
         $files      = $coverage->getData();
         $commonPath = PHP_CodeCoverage_Util::reducePaths($files);
@@ -210,7 +213,7 @@ protected function addItems(PHP_CodeCoverage_Report_HTML_Node_Directory $root, a
                       substr($key, 0, -2),
                       $value,
                       $tests,
-                      $this->options['cacheTokens'],
+                      $this->cacheTokens,
                       $this->options['yui'],
                       $this->options['highlight']
                     );