Add 7.4 support (#62)

* Add 7.4 support

Wider range of unit tests and fixing depricated stuff

* Fix phpunit compatibility

* Missed the shim from the commit

* Clean up

Author: exussum12

.travis.yml

@@ -11,6 +11,7 @@ matrix:
     - php: 7.2
       env: UPDATE_COVERAGE=1
     - php: 7.3
+    - php: 7.4
   fast_finish: true
 before_script:
   - composer global require squizlabs/php_codesniffer

composer.json

@@ -2,7 +2,7 @@
     "name": "exussum12/coverage-checker",
     "description": "Allows checking the code coverage of a single pull request",
     "require-dev": {
-        "phpunit/phpunit": "^6.5"
+        "phpunit/phpunit": "^6.5 || ^7.0 || ^8.0"
     },
     "license": "MIT",
     "authors": [

phpunit.xml

@@ -8,7 +8,7 @@
          beStrictAboutTestsThatDoNotTestAnything="true"
          beStrictAboutTodoAnnotatedTests="true"
          verbose="true">
-    <testsuite>
+    <testsuite name="coverageChecker">
         <directory suffix="Test.php">tests</directory>
     </testsuite>
 
@@ -21,8 +21,8 @@
         <log
             type="coverage-html"
             target="report"
-            lowUpperBound="35"
-            highLowerBound="70"/>
+            lowUpperBound="90"
+            highLowerBound="95"/>
         <log type="coverage-clover" target="report/coverage.xml"/>
     </logging>
 </phpunit>

tests/ArgParserTest.php

@@ -9,7 +9,10 @@ class ArgParserTest extends TestCase
 {
     protected $parser;
 
-    public function setUp()
+    /**
+     * @before
+     */
+    public function setUpTest()
     {
         $args = [
             'file.php',
@@ -20,6 +23,7 @@ public function setUp()
         ];
         $this->parser = new ArgParser($args);
     }
+
     public function testNumericArgs()
     {
         $this->assertSame("file", $this->parser->getArg(1));

tests/GenericDiffFilterTest.php

@@ -10,6 +10,7 @@
  */
 class GenericDiffFilterTest extends TestCase
 {
+    use TestShim;
 
     public function testValid()
     {
@@ -20,9 +21,9 @@ public function testValid()
             __DIR__ . '/fixtures/phpcs.json'
         ];
         ob_start();
-        require(__DIR__ . "/../src/Runners/generic.php");
+        require(__DIR__ . '/../src/Runners/generic.php');
         $output = ob_get_clean();
-        $this->assertContains('100.00%', $output);
+        $this->assertContainsString('100.00%', $output);
     }
 
     public function testMissingHandler()
@@ -34,10 +35,10 @@ public function testMissingHandler()
         ];
         try {
             ob_start();
-            require(__DIR__ . "/../src/Runners/generic.php");
+            require(__DIR__ . '/../src/Runners/generic.php');
         } catch (Exception $exception) {
             $output = ob_get_clean();
-            $this->assertContains('--phpcs', $output);
+            $this->assertContainsString('--phpcs', $output);
             return true;
         }
 

tests/Loaders/CheckstyleTest.php

@@ -8,9 +8,12 @@ class CheckstyleTest extends PhanTextTest
     /** @var  Checkstyle */
     protected $phan;
     protected $prefix = '';
-    protected function setUp()
+
+    /**
+     * @before
+     */
+    protected function setUpTest()
     {
-        parent::setUp();
         $this->phan = new Checkstyle(__DIR__ . '/../fixtures/checkstyle.xml');
     }
 }

tests/Loaders/CodeClimateTest.php

@@ -8,9 +8,12 @@ class CodeClimateTest extends PhanTextTest
     /** @var  CodeClimate */
     protected $phan;
     protected $prefix = '';
-    protected function setUp()
+
+    /**
+     * @before
+     */
+    protected function setUpTest()
     {
-        parent::setUp();
         $this->phan = new CodeClimate(__DIR__ . '/../fixtures/codeclimate.json');
     }
 }

tests/Loaders/HumbugLoaderTest.php

@@ -4,9 +4,12 @@
 use InvalidArgumentException;
 use PHPUnit\Framework\TestCase;
 use exussum12\CoverageChecker\Loaders\Humbug;
+use exussum12\CoverageChecker\tests\TestShim;
 
 class HumbugLoaderTest extends TestCase
 {
+    use TestShim;
+
     public function testCanMakeClass()
     {
         $humbug = new Humbug(__DIR__ . '/../fixtures/humbug.json');
@@ -15,7 +18,7 @@ public function testCanMakeClass()
         $this->assertEquals(1, count($invalidFiles));
         $file = 'src/DiffLineHandle/OldVersion/DiffStart.php';
 
-        $this->assertContains(
+        $this->assertContainsString(
             'Failed on escaped check',
             current($humbug->getErrorsOnLine($file, 23))
         );

tests/Loaders/LoadPhpcsReportTest.php

@@ -23,9 +23,6 @@ public function testCanMakeClass()
         );
     }
 
-    /**
-     * @expectedException InvalidArgumentException
-     */
     public function testRejectsInvalidData()
     {
         $this->expectException(InvalidArgumentException::class);

tests/Loaders/PhanJsonTest.php

@@ -7,9 +7,12 @@ class PhanJsonTest extends PhanTextTest
 {
     /** @var  PhanJsonTest */
     protected $phan;
-    protected function setUp()
+
+    /**
+     * @before
+     */
+    protected function setUpTest()
     {
-        parent::setUp();
         $this->phan = new PhanJson(__DIR__ . '/../fixtures/phan.json');
     }
 }