Update the unit testing enviroment

Author: ghalse

.gitignore

@@ -1 +1,2 @@
+composer.lock
 vendor

composer.json

@@ -2,6 +2,7 @@
     "name": "safire-ac-za/simplesamlphp-module-fticks",
     "description": "SimpleSAMLphp module to record F-Ticks statistics",
     "type": "simplesamlphp-module",
+    "keywords": ["simplesamlphp", "fticks"],
     "license": "MIT",
     "authors": [
         {
@@ -11,17 +12,25 @@
     ],
     "require": {
         "php": ">=5.6",
-        "simplesamlphp/composer-module-installer": "^1.1"
+        "simplesamlphp/composer-module-installer": "~1.1"
     },
     "require-dev": {
         "simplesamlphp/simplesamlphp": ">=1.17",
         "phpunit/phpunit": "~4.8"
     },
+    "autoload": {
+        "psr-4": {
+            "SimpleSAML\\Module\\fticks\\": "lib/"
+        }
+    },
     "autoload-dev": {
-      "files": ["tests/_autoload_modules.php"]
+        "psr-4": {
+            "SimpleSAML\\Test\\Utils\\": "vendor/simplesamlphp/simplesamlphp/tests/Utils"
+        }
     },
     "support": {
         "issues": "https://github.com/safire-ac-za/simplesamlphp-module-fticks/issues",
         "source": "https://github.com/safire-ac-za/simplesamlphp-module-fticks"
     }
 }
+

phpunit.xml

@@ -1,9 +1,19 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<phpunit bootstrap="./vendor/autoload.php" colors="true">
+<phpunit bootstrap="tests/bootstrap.php" colors="true">
     <testsuites>
         <testsuite name="The project's test suite">
-            <directory>./tests</directory>
+            <directory>tests/</directory>
         </testsuite>
     </testsuites>
+    <filter>
+        <whitelist processUncoveredFilesFromWhitelist="true">
+            <directory suffix=".php">./lib</directory>
+        </whitelist>
+    </filter>
+    <logging>
+        <log type="coverage-text" target="php://stdout" showUncoveredFiles="true" />
+        <log type="coverage-html" target="build/coverage" title="PHP Coveralls" charset="UTF-8" yui="true" highlight="true" lowUpperBound="35" highLowerBound="70" />
+        <log type="coverage-clover" target="build/logs/clover.xml" />
+    </logging>
 </phpunit>
 

tests/_autoload_modules.php

@@ -0,0 +1,10 @@
+<?php
+$projectRoot = dirname(__DIR__);
+require_once($projectRoot.'/vendor/autoload.php');
+
+// Symlink module into ssp vendor lib so that templates and urls can resolve correctly
+$linkPath = $projectRoot.'/vendor/simplesamlphp/simplesamlphp/modules/consent';
+if (file_exists($linkPath) === false) {
+    echo "Linking '$linkPath' to '$projectRoot'\n";
+    symlink($projectRoot, $linkPath);
+}

tests/bootstrap.php

@@ -2,12 +2,6 @@
 
 namespace SimpleSAML\Test\Module\fticks\Auth\Process;
 
-// Alias the PHPUnit 6.0 ancestor if available, else fall back to legacy ancestor
-if (class_exists('\PHPUnit\Framework\TestCase', true) and !class_exists('\PHPUnit_Framework_TestCase', true)) {
-    class_alias('\PHPUnit\Framework\TestCase', '\PHPUnit_Framework_TestCase', true);
-}
-require_once(dirname(dirname(dirname(dirname(dirname(__FILE__))))).'/lib/Auth/Process/Fticks.php');
-
 /**
  * Test for the core:CardinalitySingle filter.
  */