Move PHP_CodeCoverage_Util::crap() to PHP_CodeCoverage_Report_Node_File and make it non-static.

Author: sebastianbergmann

PHP/CodeCoverage/Report/Node/File.php

@@ -518,7 +518,7 @@ protected function calculateStatistics()
                     $method['coverage'] = 100;
                 }
 
-                $method['crap'] = PHP_CodeCoverage_Util::crap(
+                $method['crap'] = $this->crap(
                   $method['ccn'], $method['coverage']
                 );
 
@@ -536,7 +536,7 @@ protected function calculateStatistics()
                 $this->numTestedClasses++;
             }
 
-            $trait['crap'] = PHP_CodeCoverage_Util::crap(
+            $trait['crap'] = $this->crap(
               $trait['ccn'], $trait['coverage']
             );
         }
@@ -550,7 +550,7 @@ protected function calculateStatistics()
                     $method['coverage'] = 100;
                 }
 
-                $method['crap'] = PHP_CodeCoverage_Util::crap(
+                $method['crap'] = $this->crap(
                   $method['ccn'], $method['coverage']
                 );
 
@@ -568,7 +568,7 @@ protected function calculateStatistics()
                 $this->numTestedClasses++;
             }
 
-            $class['crap'] = PHP_CodeCoverage_Util::crap(
+            $class['crap'] = $this->crap(
               $class['ccn'], $class['coverage']
             );
         }
@@ -695,4 +695,28 @@ protected function processFunctions(PHP_Token_Stream $tokens)
             $this->endLines[$function['endLine']]     = &$this->functions[$functionName];
         }
     }
+
+    /**
+     * Calculates the Change Risk Anti-Patterns (CRAP) index for a unit of code
+     * based on its cyclomatic complexity and percentage of code coverage.
+     *
+     * @param  integer $ccn
+     * @param  float   $coverage
+     * @return string
+     * @since  Method available since Release 1.2.0
+     */
+    protected function crap($ccn, $coverage)
+    {
+        if ($coverage == 0) {
+            return (string)pow($ccn, 2) + $ccn;
+        }
+
+        if ($coverage >= 95) {
+            return (string)$ccn;
+        }
+
+        return sprintf(
+          '%01.2F', pow($ccn, 2) * pow(1 - $coverage/100, 3) + $ccn
+        );
+    }
 }

PHP/CodeCoverage/Util.php

@@ -98,29 +98,6 @@ class PHP_CodeCoverage_Util
      */
     protected static $ids = array();
 
-    /**
-     * Calculates the Change Risk Anti-Patterns (CRAP) index for a unit of code
-     * based on its cyclomatic complexity and percentage of code coverage.
-     *
-     * @param  integer $ccn
-     * @param  float   $coverage
-     * @return string
-     */
-    public static function crap($ccn, $coverage)
-    {
-        if ($coverage == 0) {
-            return (string)pow($ccn, 2) + $ccn;
-        }
-
-        if ($coverage >= 95) {
-            return (string)$ccn;
-        }
-
-        return sprintf(
-          '%01.2F', pow($ccn, 2) * pow(1 - $coverage/100, 3) + $ccn
-        );
-    }
-
     /**
      * @param  string $directory
      * @return string

Tests/PHP/CodeCoverage/UtilTest.php

@@ -108,16 +108,6 @@ protected function setUp()
         vfsStream::setup('UtilTest');
     }
 
-    /**
-     * @covers PHP_CodeCoverage_Util::crap
-     */
-    public function testCrap()
-    {
-        $this->assertEquals(6, PHP_CodeCoverage_Util::crap(2, 0));
-        $this->assertEquals(2, PHP_CodeCoverage_Util::crap(2, 95));
-        $this->assertEquals(2.5, PHP_CodeCoverage_Util::crap(2, 50));
-    }
-
     /**
      * @covers       PHP_CodeCoverage_Util::getLinesToBeCovered
      * @covers       PHP_CodeCoverage_Util::resolveCoversToReflectionObjects