Merge branch '2.12' into 2.14

* 2.12:
  PhpUnitConstructFixer - Fix handle different casing
  Collect coverage with PCOV

Author: SpacePossum

.travis.yml

@@ -118,8 +118,24 @@ jobs:
 
                 # Composer: boost installation
                 - composer global show hirak/prestissimo -q || travis_retry composer global require $DEFAULT_COMPOSER_FLAGS hirak/prestissimo
+
+                # Require PHPUnit 8
+                - composer require --dev --no-update phpunit/phpunit:^8
+
+                # Install PCOV
+                - |
+                    git clone --single-branch --branch=v1.0.2 --depth=1 https://github.com/krakjoe/pcov
+                    cd pcov
+                    phpize
+                    ./configure
+                    make clean install
+                    echo "extension=pcov.so" > $HOME/.phpenv/versions/$TRAVIS_PHP_VERSION/etc/conf.d/pcov.ini
+                    cd $TRAVIS_BUILD_DIR
+            before_script:
+                # Make code compatible with PHPUnit 8
+                - PHP_CS_FIXER_FUTURE_MODE=1 php php-cs-fixer fix --rules=void_return -q tests || return 0
             script:
-                - phpdbg -qrr vendor/bin/phpunit --testsuite coverage --exclude-group covers-nothing --coverage-clover build/logs/clover.xml || travis_terminate 1
+                - vendor/bin/phpunit --testsuite coverage --exclude-group covers-nothing --coverage-clover build/logs/clover.xml || travis_terminate 1
                 - php vendor/bin/php-coveralls -v
 
         -
@@ -152,4 +168,3 @@ jobs:
 
     allow_failures:
         - php: 7.4snapshot
-        - env: COLLECT_COVERAGE=1

composer.json

@@ -38,10 +38,10 @@
         "mikey179/vfsstream": "^1.6",
         "php-coveralls/php-coveralls": "^2.1",
         "php-cs-fixer/accessible-object": "^1.0",
-        "php-cs-fixer/phpunit-constraint-isidenticalstring": "^1.0.1",
-        "php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "^1.0.1",
+        "php-cs-fixer/phpunit-constraint-isidenticalstring": "^1.1",
+        "php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "^1.1",
         "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1",
-        "phpunitgoodpractices/traits": "^1.5.1",
+        "phpunitgoodpractices/traits": "^1.8",
         "symfony/phpunit-bridge": "^4.0"
     },
     "suggest": {

src/Fixer/PhpUnit/PhpUnitConstructFixer.php

@@ -215,7 +215,7 @@ private function fixAssert(array $map, Tokens $tokens, $index, $method)
             return $sequenceIndexes[3];
         }
 
-        $tokens[$sequenceIndexes[0]] = new Token([T_STRING, $map[$firstParameterToken->getContent()]]);
+        $tokens[$sequenceIndexes[0]] = new Token([T_STRING, $map[strtolower($firstParameterToken->getContent())]]);
         $tokens->clearRange($sequenceIndexes[2], $tokens->getNextNonWhitespace($sequenceIndexes[3]) - 1);
 
         return $sequenceIndexes[3];

tests/Fixer/PhpUnit/PhpUnitConstructFixerTest.php

@@ -125,6 +125,18 @@ public function provideTestFixCases()
                 '<?php $this->assertSame(true || $a, $b); $this->assertTrue($c);',
                 '<?php $this->assertSame(true || $a, $b); $this->assertSame(true, $c);',
             ],
+            [
+                '<?php $this->assertFalse($foo);',
+                '<?php $this->assertEquals(FALSE, $foo);',
+            ],
+            [
+                '<?php $this->assertTrue($foo);',
+                '<?php $this->assertEquals(TruE, $foo);',
+            ],
+            [
+                '<?php $this->assertNull($foo);',
+                '<?php $this->assertEquals(NULL, $foo);',
+            ],
         ];
 
         return array_merge(