Merge branch 'master' into report-refactoring

Author: sebastianbergmann

PHP/CodeCoverage/Autoload.php

@@ -56,6 +56,7 @@ function php_codecoverage_autoload($class) {
           'php_codecoverage' => '/CodeCoverage.php',
           'php_codecoverage_driver' => '/CodeCoverage/Driver.php',
           'php_codecoverage_driver_xdebug' => '/CodeCoverage/Driver/Xdebug.php',
+          'php_codecoverage_exception' => '/CodeCoverage/Exception.php',
           'php_codecoverage_filter' => '/CodeCoverage/Filter.php',
           'php_codecoverage_report_clover' => '/CodeCoverage/Report/Clover.php',
           'php_codecoverage_report_factory' => '/CodeCoverage/Report/Factory.php',

PHP/CodeCoverage/Exception.php

@@ -0,0 +1,60 @@
+<?php
+/**
+ * PHP_CodeCoverage
+ *
+ * Copyright (c) 2009-2011, Sebastian Bergmann <[email protected]>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @category   PHP
+ * @package    CodeCoverage
+ * @author     Sebastian Bergmann <[email protected]>
+ * @copyright  2009-2011 Sebastian Bergmann <[email protected]>
+ * @license    http://www.opensource.org/licenses/bsd-license.php  BSD License
+ * @link       http://github.com/sebastianbergmann/php-code-coverage
+ * @since      File available since Release 1.1.0
+ */
+
+/**
+ * Eyception class for PHP_CodeCoverage component.
+ *
+ * @category   PHP
+ * @package    CodeCoverage
+ * @author     Sebastian Bergmann <[email protected]>
+ * @copyright  2009-2011 Sebastian Bergmann <[email protected]>
+ * @license    http://www.opensource.org/licenses/bsd-license.php  BSD License
+ * @version    Release: @package_version@
+ * @link       http://github.com/sebastianbergmann/php-code-coverage
+ * @since      Class available since Release 1.1.0
+ */
+class PHP_CodeCoverage_Exception extends RuntimeException
+{
+}

PHP/CodeCoverage/Report/Node/Directory.php

@@ -201,7 +201,7 @@ public function addDirectory($name)
      * @param  array  $coverageData
      * @param  array  $testData
      * @return PHP_CodeCoverage_Report_Node_File
-     * @throws RuntimeException
+     * @throws PHP_CodeCoverage_Exception
      */
     public function addFile($name, array $coverageData, array $testData)
     {

PHP/CodeCoverage/Util.php

@@ -186,7 +186,7 @@ public static function crap($ccn, $coverage)
     /**
      * @param  string $directory
      * @return string
-     * @throws RuntimeException
+     * @throws PHP_CodeCoverage_Exception
      */
     public static function getDirectory($directory)
     {
@@ -202,7 +202,7 @@ public static function getDirectory($directory)
             return $directory;
         }
 
-        throw new RuntimeException(
+        throw new PHP_CodeCoverage_Exception(
           sprintf(
             'Directory "%s" does not exist.',
             $directory
@@ -526,7 +526,7 @@ protected static function resolveCoversToReflectionObjects($coveredElement)
                 foreach ($classes as $className) {
                     if (!class_exists($className) &&
                         !interface_exists($className)) {
-                        throw new RuntimeException(
+                        throw new PHP_CodeCoverage_Exception(
                           sprintf(
                             'Trying to @cover not existing class or ' .
                             'interface "%s".',
@@ -574,7 +574,7 @@ protected static function resolveCoversToReflectionObjects($coveredElement)
                                interface_exists($className) ||
                                trait_exists($className)) &&
                               method_exists($className, $methodName))) {
-                            throw new RuntimeException(
+                            throw new PHP_CodeCoverage_Exception(
                               sprintf(
                                 'Trying to @cover not existing method "%s::%s".',
                                 $className,
@@ -614,7 +614,7 @@ class_parents($coveredElement)
                 if (!class_exists($className) &&
                     !interface_exists($className) &&
                     !trait_exists($className)) {
-                    throw new RuntimeException(
+                    throw new PHP_CodeCoverage_Exception(
                       sprintf(
                         'Trying to @cover not existing class or ' .
                         'interface "%s".',

Tests/PHP/CodeCoverage/UtilTest.php

@@ -176,7 +176,7 @@ public function testGetLinesToBeCovered($test, $lines)
     /**
      * @covers            PHP_CodeCoverage_Util::getLinesToBeCovered
      * @covers            PHP_CodeCoverage_Util::resolveCoversToReflectionObjects
-     * @expectedException RuntimeException
+     * @expectedException PHP_CodeCoverage_Exception
      */
     public function testGetLinesToBeCovered2()
     {
@@ -188,7 +188,7 @@ public function testGetLinesToBeCovered2()
     /**
      * @covers            PHP_CodeCoverage_Util::getLinesToBeCovered
      * @covers            PHP_CodeCoverage_Util::resolveCoversToReflectionObjects
-     * @expectedException RuntimeException
+     * @expectedException PHP_CodeCoverage_Exception
      */
     public function testGetLinesToBeCovered3()
     {
@@ -200,7 +200,7 @@ public function testGetLinesToBeCovered3()
     /**
      * @covers            PHP_CodeCoverage_Util::getLinesToBeCovered
      * @covers            PHP_CodeCoverage_Util::resolveCoversToReflectionObjects
-     * @expectedException RuntimeException
+     * @expectedException PHP_CodeCoverage_Exception
      */
     public function testGetLinesToBeCovered4()
     {
@@ -342,7 +342,7 @@ public function testGetDirectory2()
 
     /**
      * @covers            PHP_CodeCoverage_Util::getDirectory
-     * @expectedException RuntimeException
+     * @expectedException PHP_CodeCoverage_Exception
      */
     public function testGetDirectory3()
     {

package.xml

@@ -88,6 +88,9 @@
      <file baseinstalldir="/" name="Driver.php" role="php">
       <tasks:replace from="@package_version@" to="version" type="package-info" />
      </file>
+     <file baseinstalldir="/" name="Exception.php" role="php">
+      <tasks:replace from="@package_version@" to="version" type="package-info" />
+     </file>
      <file baseinstalldir="/" name="Filter.php" role="php">
       <tasks:replace from="@package_version@" to="version" type="package-info" />
      </file>