Merge remote-tracking branch 'upstream/master' into popover-delay

Author: romain-perez24

.gitignore

@@ -1,12 +1,6 @@
-build/api
-build/code-browser
-build/coverage
-build/logs
-build/pdepend
-cache.properties
 /tests/_files/tmp
 /vendor
 /composer.lock
-/composer.phar
 /.idea
 /.php_cs.cache
+

.travis.yml

@@ -1,21 +1,27 @@
 language: php
 
 php:
-    - 5.6
-    - 7.0
-    - nightly
+  - 7.0
+  - 7.1
+  - nightly
+
+env:
+  matrix:
+    - DRIVER="xdebug"
+    - DRIVER="phpdbg"
 
 sudo: false
 
 before_install:
-    - composer self-update
+  - composer self-update
+  - composer clear-cache
 
 install:
-    - travis_retry composer install --no-interaction --prefer-source
+  - travis_retry composer update --no-interaction --no-ansi --no-progress --no-suggest --optimize-autoloader --prefer-stable
 
 script:
-
-    - vendor/bin/phpunit --configuration build
+  - if [[ "$DRIVER" = 'phpdbg' ]]; then phpdbg -qrr vendor/bin/phpunit; fi
+  - if [[ "$DRIVER" = 'xdebug' ]]; then vendor/bin/phpunit; fi
 
 notifications:
   email: false

ChangeLog-4.0.md

@@ -2,6 +2,24 @@
 
 All notable changes of the PHP_CodeCoverage 4.0 release series are documented in this file using the [Keep a CHANGELOG](http://keepachangelog.com/) principles.
 
+## [4.0.5] - 2017-01-20
+
+### Fixed
+
+* Fixed formatting of executed lines percentage for classes in file view
+
+## [4.0.4] - 2016-12-20
+
+### Changed
+
+* Implemented [#432](https://github.com/sebastianbergmann/php-code-coverage/issues/432): Change how files with no executable lines are displayed in the HTML report
+
+## [4.0.3] - 2016-11-28
+
+### Changed
+
+* The check for unintentionally covered code is no longer performed for `@medium` and `@large` tests
+
 ## [4.0.2] - 2016-11-01
 
 ### Fixed
@@ -20,6 +38,9 @@ All notable changes of the PHP_CodeCoverage 4.0 release series are documented in
 
 * This component now uses namespaces
 
+[4.0.5]: https://github.com/sebastianbergmann/php-code-coverage/compare/4.0.4...4.0.5
+[4.0.4]: https://github.com/sebastianbergmann/php-code-coverage/compare/4.0.3...4.0.4
+[4.0.3]: https://github.com/sebastianbergmann/php-code-coverage/compare/4.0.2...4.0.3
 [4.0.2]: https://github.com/sebastianbergmann/php-code-coverage/compare/4.0.1...4.0.2
 [4.0.1]: https://github.com/sebastianbergmann/php-code-coverage/compare/4.0.0...4.0.1
 [4.0.0]: https://github.com/sebastianbergmann/php-code-coverage/compare/3.3...4.0.0

ChangeLog-5.0.md

@@ -0,0 +1,13 @@
+# Changes in PHP_CodeCoverage 5.0
+
+All notable changes of the PHP_CodeCoverage 5.0 release series are documented in this file using the [Keep a CHANGELOG](http://keepachangelog.com/) principles.
+
+## [5.0.0] - 2017-02-03
+
+### Removed
+
+* This component is no longer supported on PHP 5
+
+
+[5.0.0]: https://github.com/sebastianbergmann/php-code-coverage/compare/4.0...5.0.0
+

build.xml

@@ -1,41 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project name="PHP_CodeCoverage">
- <target name="clean" description="Cleanup build artifacts">
-  <delete dir="${basedir}/vendor"/>
-  <delete file="${basedir}/composer.lock"/>
+<project name="php-code-coverage" default="setup">
+    <target name="setup" depends="clean,composer"/>
 
-  <delete>
-   <fileset dir="${basedir}/build">
-    <include name="**/*.phar" />
-   </fileset>
-  </delete>
- </target>
+    <target name="clean" description="Cleanup build artifacts">
+        <delete dir="${basedir}/vendor"/>
+        <delete file="${basedir}/composer.lock"/>
+    </target>
 
- <target name="composer" depends="clean" description="Install dependencies with Composer">
-  <tstamp>
-   <format property="thirty.days.ago" pattern="MM/dd/yyyy hh:mm aa" offset="-30" unit="day"/>
-  </tstamp>
-  <delete>
-   <fileset dir="${basedir}">
-    <include name="composer.phar" />
-    <date datetime="${thirty.days.ago}" when="before"/>
-   </fileset>
-  </delete>
-
-  <get src="https://getcomposer.org/composer.phar" dest="${basedir}/composer.phar" skipexisting="true"/>
-
-  <exec executable="php">
-   <arg value="composer.phar"/>
-   <arg value="install"/>
-  </exec>
- </target>
-
- <target name="phpcs" description="Find coding standard violations using PHP_CodeSniffer">
-  <exec executable="phpcs">
-   <arg value="--standard=PSR2" />
-   <arg value="--extensions=php" />
-   <arg path="${basedir}/src" />
-   <arg path="${basedir}/tests" />
-  </exec>
- </target>
+    <target name="composer" depends="clean" description="Install dependencies with Composer">
+        <exec executable="composer" taskname="composer">
+            <arg value="update"/>
+            <arg value="--no-interaction"/>
+            <arg value="--no-progress"/>
+            <arg value="--no-ansi"/>
+            <arg value="--no-suggest"/>
+            <arg value="--optimize-autoloader"/>
+            <arg value="--prefer-stable"/>
+        </exec>
+    </target>
 </project>

composer.json

@@ -20,22 +20,22 @@
         "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues",
         "irc": "irc://irc.freenode.net/phpunit"
     },
+    "minimum-stability": "dev",
     "require": {
-        "php": "^5.6 || ^7.0",
-        "phpunit/php-file-iterator": "~1.3",
+        "php": "^7.0",
+        "phpunit/php-file-iterator": "^1.3",
         "phpunit/php-token-stream": "^1.4.2",
-        "phpunit/php-text-template": "~1.2",
-        "sebastian/code-unit-reverse-lookup": "~1.0",
-        "sebastian/environment": "^1.3.2 || ^2.0",
-        "sebastian/version": "~1.0|~2.0"
+        "phpunit/php-text-template": "^1.2",
+        "sebastian/code-unit-reverse-lookup": "^1.0",
+        "sebastian/environment": "^2.0",
+        "sebastian/version": "^2.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^5.4",
-        "ext-xdebug": ">=2.1.4"
+        "phpunit/phpunit": "^6.0",
+        "ext-xdebug": "^2.5"
     },
     "suggest": {
         "ext-dom": "*",
-        "ext-xdebug": ">=2.4.0",
         "ext-xmlwriter": "*"
     },
     "autoload": {
@@ -45,7 +45,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "4.0.x-dev"
+            "dev-master": "5.0.x-dev"
         }
     }
 }

build/phpunit.xml renamed to phpunit.xml

@@ -1,16 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/5.3/phpunit.xsd"
-         bootstrap="../tests/bootstrap.php"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/6.0/phpunit.xsd"
+         bootstrap="tests/bootstrap.php"
          backupGlobals="false"
          verbose="true">
     <testsuite>
-        <directory suffix="Test.php">../tests/tests</directory>
+        <directory suffix="Test.php">tests/tests</directory>
     </testsuite>
 
     <filter>
         <whitelist processUncoveredFilesFromWhitelist="true">
-            <directory suffix=".php">../src</directory>
+            <directory suffix=".php">src</directory>
         </whitelist>
     </filter>
+
+    <php>
+        <ini name="serialize_precision" value="14"/>
+    </php>
 </phpunit>
+

src/CodeCoverage.php

@@ -10,6 +10,8 @@
 
 namespace SebastianBergmann\CodeCoverage;
 
+use PHPUnit\Framework\TestCase;
+use PHPUnit\Runner\PhptTestCase;
 use SebastianBergmann\CodeCoverage\Driver\Driver;
 use SebastianBergmann\CodeCoverage\Driver\Xdebug;
 use SebastianBergmann\CodeCoverage\Driver\HHVM;
@@ -340,20 +342,20 @@ public function append(array $data, $id = null, $append = true, $linesToBeCovere
         $size   = 'unknown';
         $status = null;
 
-        if ($id instanceof \PHPUnit_Framework_TestCase) {
+        if ($id instanceof TestCase) {
             $_size = $id->getSize();
 
-            if ($_size == \PHPUnit_Util_Test::SMALL) {
+            if ($_size == \PHPUnit\Util\Test::SMALL) {
                 $size = 'small';
-            } elseif ($_size == \PHPUnit_Util_Test::MEDIUM) {
+            } elseif ($_size == \PHPUnit\Util\Test::MEDIUM) {
                 $size = 'medium';
-            } elseif ($_size == \PHPUnit_Util_Test::LARGE) {
+            } elseif ($_size == \PHPUnit\Util\Test::LARGE) {
                 $size = 'large';
             }
 
             $status = $id->getStatus();
             $id     = get_class($id) . '::' . $id->getName();
-        } elseif ($id instanceof \PHPUnit_Extensions_PhptTestCase) {
+        } elseif ($id instanceof PhptTestCase) {
             $size = 'large';
             $id   = $id->getName();
         }
@@ -618,7 +620,9 @@ private function applyCoversAnnotationFilter(array &$data, $linesToBeCovered, ar
             return;
         }
 
-        if ($this->checkForUnintentionallyCoveredCode) {
+        if ($this->checkForUnintentionallyCoveredCode &&
+            (!$this->currentId instanceof TestCase ||
+            (!$this->currentId->isMedium() && !$this->currentId->isLarge()))) {
             $this->performUnintentionallyCoveredCodeCheck(
                 $data,
                 $linesToBeCovered,

src/Node/File.php

@@ -60,13 +60,23 @@ class File extends AbstractNode
     /**
      * @var int
      */
-    private $numTestedTraits = 0;
+    private $numClasses = null;
 
     /**
      * @var int
      */
     private $numTestedClasses = 0;
 
+    /**
+     * @var int
+     */
+    private $numTraits = null;
+
+    /**
+     * @var int
+     */
+    private $numTestedTraits = 0;
+
     /**
      * @var int
      */
@@ -223,7 +233,21 @@ public function getNumExecutedLines()
      */
     public function getNumClasses()
     {
-        return count($this->classes);
+        if ($this->numClasses === null) {
+            $this->numClasses = 0;
+
+            foreach ($this->classes as $class) {
+                foreach ($class['methods'] as $method) {
+                    if ($method['executableLines'] > 0) {
+                        $this->numClasses++;
+
+                        continue 2;
+                    }
+                }
+            }
+        }
+
+        return $this->numClasses;
     }
 
     /**
@@ -243,7 +267,21 @@ public function getNumTestedClasses()
      */
     public function getNumTraits()
     {
-        return count($this->traits);
+        if ($this->numTraits === null) {
+            $this->numTraits = 0;
+
+            foreach ($this->traits as $trait) {
+                foreach ($trait['methods'] as $method) {
+                    if ($method['executableLines'] > 0) {
+                        $this->numTraits++;
+
+                        continue 2;
+                    }
+                }
+            }
+        }
+
+        return $this->numTraits;
     }
 
     /**
@@ -484,14 +522,14 @@ protected function calculateStatistics()
             if ($trait['executableLines'] > 0) {
                 $trait['coverage'] = ($trait['executedLines'] /
                         $trait['executableLines']) * 100;
+
+                if ($trait['coverage'] == 100) {
+                    $this->numTestedClasses++;
+                }
             } else {
                 $trait['coverage'] = 100;
             }
 
-            if ($trait['coverage'] == 100) {
-                $this->numTestedClasses++;
-            }
-
             $trait['crap'] = $this->crap(
                 $trait['ccn'],
                 $trait['coverage']
@@ -518,14 +556,14 @@ protected function calculateStatistics()
             if ($class['executableLines'] > 0) {
                 $class['coverage'] = ($class['executedLines'] /
                         $class['executableLines']) * 100;
+
+                if ($class['coverage'] == 100) {
+                    $this->numTestedClasses++;
+                }
             } else {
                 $class['coverage'] = 100;
             }
 
-            if ($class['coverage'] == 100) {
-                $this->numTestedClasses++;
-            }
-
             $class['crap'] = $this->crap(
                 $class['ccn'],
                 $class['coverage']