Fix test scripts

They now all depend on vendor dev deps
Upgrade phpunit
Add coverage check script that can fail the build

Author: mvdbos

.gitignore

@@ -9,3 +9,5 @@ example/results
 .DS_Store
 cache.properties
 .tmp
+.phpunit.result.cache
+.php_cs.cache

.php_cs

@@ -0,0 +1,11 @@
+<?php
+
+$finder = PhpCsFixer\Finder::create()
+    ->in(__DIR__ . '/src/');
+
+return PhpCsFixer\Config::create()
+    ->setRules([
+        '@PSR2' => true
+    ])
+    ->setFinder($finder);
+

.php_cs.dist

@@ -1,4 +1,10 @@
-#!/usr/bin/env sh
+#!/usr/bin/env bash
+
+
+# Go to the root dir so configs and vendor dir is found
+cd $(git rev-parse --show-toplevel)
 
 tmpfile="./.tmp/code-coverage"
-composer exec -- phpunit --colors=auto --coverage-html="$tmpfile" --coverage-text
+tmpfile_php="./.tmp/code-coverage_php"
+
+./vendor/bin/phpunit --colors=auto --coverage-php "$tmpfile_php" --coverage-html="$tmpfile" --coverage-text

bin/coverage

@@ -0,0 +1,20 @@
+<?php
+$requiredLineCoverage = 60.0;
+
+chdir(dirname(__FILE__));
+
+require __DIR__ . '/../vendor/autoload.php';
+
+exec('./coverage');
+$coverage = require_once('../.tmp/code-coverage_php');
+$report = $coverage->getReport();
+$percentage = round(($report->getNumExecutedLines() / $report->getNumExecutableLines()) * 100, 2);
+
+print "Line Coverage: " . $percentage;
+if ($percentage < $requiredLineCoverage) {
+    print "\nTOO LOW: should be >= " . $requiredLineCoverage . "%\n";
+    exit(1);
+} else {
+    print "\nOK\n";
+    exit(0);
+}

bin/coverage-check.php

@@ -1,6 +1,8 @@
-#!/usr/bin/env sh
+#!/usr/bin/env bash
+
+cd $(git rev-parse --show-toplevel)
 
 echo -e "\nPHPCBF"
-phpcbf --standard=PSR2 tests/ src/
+./vendor/bin/phpcbf --standard=PSR2 tests/ src/
 echo -e "\nPHP-CS-FIXER"
-php-cs-fixer fix --verbose
+./vendor/bin/php-cs-fixer fix --verbose

bin/fix-style

@@ -1,22 +1,26 @@
-#!/usr/bin/env sh
+#!/usr/bin/env bash
+
+# Go to the root dir first, so configs and vendor dir is found
+cd $(git rev-parse --show-toplevel)
 
 echo -e "\nPHPLINT src/:"
 find src/ -iname "*.php" -print0 | xargs -0 -n1 php -l 1>/dev/null || exit $?
 echo -e "\nPHPLINT tests/:"
 find tests/ -iname "*.php" -print0 | xargs -0 -n1 php -l 1>/dev/null || exit $?
 echo -e "\nPHPUNIT:"
-composer exec -- phpunit --stop-on-error --stop-on-failure --report-useless-tests --colors=auto || exit $?
+./vendor/bin/phpunit --stop-on-error --stop-on-failure --colors=auto || exit $?
 echo -e "\nPHPCS src/:"
-phpcs --warning-severity=0 --standard=PSR2 src/ || exit $?
+./vendor/bin/phpcs --warning-severity=0 --standard=PSR2 src/ || exit $?
 echo -e "\nPHPCS tests/:"
-phpcs --warning-severity=0 --standard=PSR2 tests/ || exit $?
+./vendor/bin/phpcs --warning-severity=0 --standard=PSR2 tests/ || exit $?
 echo -e "\nPHPMD src/:"
-phpmd src/ text phpmd.xml || exit $?
+./vendor/bin/phpmd src/ text phpmd.xml || exit $?
 echo -e "\nPHPMD tests/:"
-phpmd tests/ text phpmd-tests.xml || exit $?
+./vendor/bin/phpmd tests/ text phpmd-tests.xml || exit $?
 echo -e "\nPHPCPD src/:"
-phpcpd --min-lines=7 --min-tokens=30  --fuzzy -v src/ || exit $?
+./vendor/bin/phpcpd --min-lines=7 --min-tokens=30  --fuzzy -v src/ || exit $?
 echo -e "\nPHPCPD tests/:"
-phpcpd --min-lines=7 --min-tokens=30  --fuzzy tests/ #|| exit $?
+./vendor/bin/phpcpd --min-lines=7 --min-tokens=30  --fuzzy tests/ || exit $?
+
 
-echo "\n\n All Done, no failures.\n"
+echo -e "\n\n All Done, no failures.\n"

bin/test

@@ -24,7 +24,11 @@
         "vdb/uri": "^0.2"
     },
     "require-dev": {
-        "phpunit/phpunit": "^5.7.0"
+        "phpunit/phpunit": "^8.0.0",
+        "squizlabs/php_codesniffer": "^3.0.0",
+        "phpmd/phpmd": "^2.0.0",
+        "sebastian/phpcpd": "^4.0.0",
+        "friendsofphp/php-cs-fixer": "^2.0.0"
     },
     "autoload": {
         "psr-0": {

composer.json

@@ -5,7 +5,6 @@
     colors="true"
     processIsolation="false"
     stopOnFailure="false"
-    syntaxCheck="false"
     bootstrap="./vendor/autoload.php">
     <filter>
         <whitelist processUncoveredFilesFromWhitelist="true">

phpunit.xml.dist

@@ -54,7 +54,7 @@ public function __construct($seed, $spiderId = null)
 
         // This makes the spider handle signals gracefully and allows us to do cleanup
         if (php_sapi_name() == 'cli') {
-            declare (ticks = 1);
+            declare(ticks = 1);
             if (function_exists('pcntl_signal')) {
                 pcntl_signal(SIGTERM, array($this, 'handleSignal'));
                 pcntl_signal(SIGINT, array($this, 'handleSignal'));

src/VDB/Spider/Spider.php

@@ -126,5 +126,5 @@ public function getFragment()
         return $this->decorated->getFragment();
     }
 
-   // @codeCoverageIgnoreEnd
+    // @codeCoverageIgnoreEnd
 }

src/VDB/Spider/Uri/UriDecorator.php

@@ -26,7 +26,7 @@ class DiscovererSetTest extends DiscovererTestCase
     private $discovererSet;
 
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
     }

tests/VDB/Spider/Tests/Discoverer/DiscovererSetTest.php

@@ -37,7 +37,7 @@ abstract class DiscovererTestCase extends TestCase
 
     protected $uriInBody1;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->uriInBody1 = 'http://php-spider.org/contact/';
 

tests/VDB/Spider/Tests/Discoverer/DiscovererTestCase.php

@@ -39,7 +39,7 @@ class DownloaderTest extends TestCase
      */
     protected $html;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->html = file_get_contents(__DIR__ . '/../Fixtures/DownloaderTestHTMLResource.html');
         $this->resource = new Resource(

tests/VDB/Spider/Tests/Downloader/DownloaderTest.php

@@ -26,7 +26,7 @@ class MimeTypeFilterTest extends TestCase
     /** @var DiscoveredUri */
     protected $uri;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->uri = new DiscoveredUri(new Uri('http://foobar.com/image.jpg'));
 

tests/VDB/Spider/Tests/Filter/Postfetch/MimeTypeFilterTest.php

@@ -27,7 +27,7 @@ class FileSerializedResourcePersistenceHandlerTest extends TestCase
     protected $persistenceRootPath;
 
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->persistenceRootPath = sys_get_temp_dir() . DIRECTORY_SEPARATOR . 'spider-UT' . DIRECTORY_SEPARATOR;
         exec('rm -rf ' . $this->persistenceRootPath);

tests/VDB/Spider/Tests/PersistenceHandler/FileSerializedResourcePersistenceHandlerTest.php

@@ -20,7 +20,7 @@ class ResourceTest extends TestCase
      */
     protected $html;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->html = file_get_contents(__DIR__ . '/Fixtures/ResourceTestHTMLResource.html');
         $this->resource = new Resource(

tests/VDB/Spider/Tests/ResourceTest.php

@@ -83,7 +83,7 @@ class SpiderTest extends TestCase
      *
      * Note: E links to F.
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->spider = new Spider('http://php-spider.org/A');
 

tests/VDB/Spider/Tests/SpiderTest.php

@@ -16,10 +16,12 @@
 use VDB\Spider\Uri\DiscoveredUri;
 use VDB\Uri\Uri;
 
+use PHPUnit\Framework\TestCase as PHPUnitTestCase;
+
 /**
  *
  */
-class TestCase extends \PHPUnit_Framework_TestCase
+class TestCase extends PHPUnitTestCase
 {
     /**
      * @param DiscoveredUri $uri