Merge branch '1.1'

Author: sebastianbergmann

.gitignore

@@ -3,4 +3,5 @@ build/code-browser
 build/coverage
 build/logs
 build/pdepend
+cache.properties
 phpunit.xml

PHP/CodeCoverage/Report/HTML/Renderer/File.php

@@ -445,7 +445,7 @@ protected function renderSource(PHP_CodeCoverage_Report_Node_File $node)
             }
 
             $lines .= sprintf(
-              '<span class="lineNum" id="container%d"><a name="%d"></a>'.
+              '<span class="lineNum" id="container%d"><a name="%d"></a>' .
               '<a href="#%d" id="line%d">%8d</a> </span>%s%s%s' . "\n",
 
               $i,

Tests/PHP/CodeCoverage/UtilTest.php

@@ -44,7 +44,9 @@
  * @since      File available since Release 1.0.0
  */
 
-@include_once 'vfsStream/vfsStream.php';
+if (stream_resolve_include_path('vfsStream/vfsStream.php')) {
+    require_once 'vfsStream/vfsStream.php';
+}
 
 if (!defined('TEST_FILES_PATH')) {
     define(

Tests/TestCase.php

@@ -122,7 +122,6 @@ protected function getCoverageForBankAccount()
                $data[0], $data[1], $data[2], $data[3]
              ));
 
-
         $coverage = new PHP_CodeCoverage($stub, new PHP_CodeCoverage_Filter);
 
         $coverage->start(
@@ -159,7 +158,6 @@ protected function getCoverageForBankAccountForFirstTwoTests()
                $data[0], $data[1]
              ));
 
-
         $coverage = new PHP_CodeCoverage($stub, new PHP_CodeCoverage_Filter);
 
         $coverage->start(

Tests/_files/source_with_ignore.php

@@ -1,5 +1,5 @@
 <?php
-if (FALSE) {
+if ($neverHappens) {
     // @codeCoverageIgnoreStart
     print '*';
     // @codeCoverageIgnoreEnd

Tests/_files/source_with_namespace.php

@@ -4,7 +4,7 @@
 /**
  * Represents foo.
  */
-class foo
+class Foo
 {
 }
 

Tests/_files/source_without_ignore.php

@@ -1,4 +1,4 @@
 <?php
-if (FALSE) {
+if ($neverHappens) {
     print '*';
 }

Tests/_files/source_without_namespace.php

@@ -2,7 +2,7 @@
 /**
  * Represents foo.
  */
-class foo
+class Foo
 {
 }
 

build.xml

@@ -114,6 +114,7 @@
    <arg value="--extensions=php" />
    <arg value="--ignore=Autoload.php" />
    <arg path="${basedir}/PHP" />
+   <arg path="${basedir}/Tests" />
   </exec>
  </target>
 
@@ -126,6 +127,7 @@
    <arg value="--extensions=php" />
    <arg value="--ignore=Autoload.php" />
    <arg path="${basedir}/PHP" />
+   <arg path="${basedir}/Tests" />
   </exec>
  </target>