Support PHPUnit 6

jackalope · Nov 21, 2017 · f88a85c · f88a85c
1 parent cacf1ae
commit f88a85c
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/composer.json b/composer.json
@@ -25,7 +25,7 @@
         "phpcr/phpcr-implementation": "2.1.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^5.7"
+        "phpunit/phpunit": "^5.7 || ^6.4"
     },
     "autoload": {
         "psr-0": { "Jackalope\\": "src/" }

diff --git a/tests/Jackalope/PropertyTest.php b/tests/Jackalope/PropertyTest.php
@@ -73,14 +73,14 @@ public function testTypeInstances()
         $this->assertSame(\PHPCR_PropertyType::UNDEFINED, $val->getType());
         $val = new Value('String', '');
         $this->assertSame(\PHPCR_PropertyType::STRING, $val->getType());
-        $this->setExpectedException('\Jackalope\NotImplementedException');
+        $this->expectException('\Jackalope\NotImplementedException');
         $val = new Value('Binary', '');
         // $this->assertSame(\PHPCR_PropertyType::BINARY, $val->getType());
         $val = new Value('Long', '');
         $this->assertSame(\PHPCR_PropertyType::LONG, $val->getType());
         $val = new Value('Double', '');
         $this->assertSame(\PHPCR_PropertyType::DOUBLE, $val->getType());
-        $this->setExpectedException('\Jackalope\NotImplementedException');
+        $this->expectException('\Jackalope\NotImplementedException');
         $val = new Value('Date', '');
         // $this->assertSame(\PHPCR_PropertyType::DATE, $val->getType());
         $val = new Value('Boolean', '');
@@ -97,7 +97,7 @@ public function testTypeInstances()
         $this->assertSame(\PHPCR_PropertyType::URI, $val->getType());
         $val = new Value('Decimal', '');
         $this->assertSame(\PHPCR_PropertyType::DECIMAL, $val->getType());
-        $this->setExpectedException('InvalidArgumentException');
+        $this->expectException('InvalidArgumentException');
         new Value('InvalidArgument', '');
         */
     }

diff --git a/tests/Jackalope/Query/QOM/QomToSql1QueryConverterTest.php b/tests/Jackalope/Query/QOM/QomToSql1QueryConverterTest.php
@@ -8,9 +8,9 @@
 use PHPCR\Query\QOM\QueryObjectModelConstantsInterface as Constants;
 use PHPCR\Query\QOM\ConstraintInterface;
 use PHPCR\Query\QOM\SourceInterface;
-use PHPUnit_Framework_TestCase;
+use PHPUnit\Framework\TestCase;
 
-class QomToSql1QueryConverterTest extends PHPUnit_Framework_TestCase
+class QomToSql1QueryConverterTest extends TestCase
 {
     /**
      * @var QueryObjectModelFactoryInterface

diff --git a/tests/Jackalope/TestCase.php b/tests/Jackalope/TestCase.php
@@ -12,10 +12,10 @@
 use PHPCR\SimpleCredentials;
 use Jackalope\NodeType\NodeTypeManager;
 use Jackalope\NodeType\NodeTypeXmlConverter;
-use PHPUnit_Framework_TestCase;
+use PHPUnit\Framework\TestCase as BaseTestCase;
 use ReflectionClass;
 
-abstract class TestCase extends PHPUnit_Framework_TestCase
+abstract class TestCase extends BaseTestCase
 {
     protected $config;
     protected $credentials;