Support phpunit 7, let travis test PHP 7.2 and 7.1

diff --git a/.travis.yml b/.travis.yml
index 09c9a859f59a6518c9ec73c89108aea596620a28..c7216ec73284e63b806e2d6857bed9599991eb50 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,7 +6,8 @@ addons:
     - diffutils
     - xsltproc
 php:
     - diffutils
     - xsltproc
 php:

-  - 7
+  - 7.2
+  - 7.1

   - 5.6
 script:
   - cd tests
   - 5.6
 script:
   - cd tests

diff --git a/tests/Lib/Converter/HtmlTest.php b/tests/Lib/Converter/HtmlTest.php
index b02e39c790523605b8a28d06205892e485459508..7af71d793a64b912c97b2af1f0a67b4fbf69b932 100644 (file)
--- a/tests/Lib/Converter/HtmlTest.php
+++ b/tests/Lib/Converter/HtmlTest.php
@@ -2,7 +2,7 @@
 require_once __DIR__ . '/../../../lib/converter/base.php';
 require_once __DIR__ . '/../../../lib/converter/html.php';
 
 require_once __DIR__ . '/../../../lib/converter/base.php';
 require_once __DIR__ . '/../../../lib/converter/html.php';
 

-class Lib_Converter_HtmlTest extends PHPUnit_Framework_TestCase
+class Lib_Converter_HtmlTest extends \PHPUnit\Framework\TestCase

 {
     public function testConvert()
     {
 {
     public function testConvert()
     {


@@ -28,4 +28,4 @@ class Lib_Converter_HtmlTest extends PHPUnit_Framework_TestCase
         );
     }
 }
         );
     }
 }

-?>
\ No newline at end of file
+?>

diff --git a/tests/Lib/Search/QueryParserTest.php b/tests/Lib/Search/QueryParserTest.php
index 122138f9cc3c5dcc3e20bfec2cd0341e300805e4..4e706f90181ed37c3055486bd8870f6d4df5f444 100644 (file)
--- a/tests/Lib/Search/QueryParserTest.php
+++ b/tests/Lib/Search/QueryParserTest.php
@@ -3,7 +3,7 @@ require_once __DIR__ . '/../../../lib/search/queryparser.php';
 
 use OCA\Grauphel\Search\Queryparser;
 
 
 use OCA\Grauphel\Search\Queryparser;
 

-class Lib_Search_QueryParserTest extends PHPUnit_Framework_TestCase
+class Lib_Search_QueryParserTest extends \PHPUnit\Framework\TestCase

 {
     public function testParseSimple()
     {
 {
     public function testParseSimple()
     {

diff --git a/tests/html2tomboyXslTest.php b/tests/html2tomboyXslTest.php
index 5e9139e934803bd1157ed2f9fd10102203db1272..199f2e4d3e799169098015dd19255d4216be5548 100644 (file)
--- a/tests/html2tomboyXslTest.php
+++ b/tests/html2tomboyXslTest.php
@@ -1,5 +1,5 @@
 <?php
 <?php

-class html2tomboyXslTest extends PHPUnit_Framework_TestCase
+class html2tomboyXslTest extends \PHPUnit\Framework\TestCase

 {
     /**
      * Use xsltproc and diff to check if the XSL file generates
 {
     /**
      * Use xsltproc and diff to check if the XSL file generates


@@ -7,6 +7,7 @@ class html2tomboyXslTest extends PHPUnit_Framework_TestCase
      */
     public function testFormat()
     {
      */
     public function testFormat()
     {

+        chdir(__DIR__);

         exec(
             'xsltproc'
             . ' ../templates/html2tomboy.xsl'
         exec(
             'xsltproc'
             . ' ../templates/html2tomboy.xsl'


@@ -21,4 +22,4 @@ class html2tomboyXslTest extends PHPUnit_Framework_TestCase
         );
     }
 }
         );
     }
 }

-?>
\ No newline at end of file
+?>