Fix phpunit compatibility

Author: alexander-schranz

.gitignore

@@ -1,3 +1,4 @@
 vendor
 composer.lock
 phpcr.phar
+.phpunit.result.cache

phpunit.xml.dist

@@ -6,6 +6,10 @@
     bootstrap="vendor/autoload.php"
     >
 
+    <php>
+        <env name="SYMFONY_PHPUNIT_REMOVE_RETURN_TYPEHINT" value="1"/>
+    </php>
+
     <testsuites>
         <testsuite name="PHPCR Shell Test Suite">
             <directory>./tests</directory>

tests/PHPCR/Shell/Helper/EditorHelperTest.php

@@ -12,7 +12,9 @@
 
 namespace PHPCR\Shell\Console\Helper;
 
-class EditorHelperTest extends \PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class EditorHelperTest extends TestCase
 {
     protected $helper;
 
@@ -40,11 +42,10 @@ public function testFromValue()
         );
     }
 
-    /**
-     * @expectedException \RuntimeException
-     */
     public function testFromValueNoEditor()
     {
+        $this->expectException(\RuntimeException::class);
+
         putenv('EDITOR=');
         $res = $this->helper->fromString('asd');
     }

tests/PHPCR/Shell/Helper/NodeHelperTest.php

@@ -13,8 +13,9 @@
 namespace PHPCR\Shell\Console\Helper;
 
 use PHPCR\NodeInterface;
+use PHPUnit\Framework\TestCase;
 
-class NodeHelperTest extends \PHPUnit_Framework_TestCase
+class NodeHelperTest extends TestCase
 {
     protected $nodeHelper;
 
@@ -41,10 +42,10 @@ public function provideAssertNodeIsVersionable()
     public function testAssertNodeIsVersionable($isVersionable)
     {
         $this->node->getPath()->willReturn('/');
-        $this->node->isNodeType('mix:versionable')->willReturn($isVersionable);
+        $this->node->isNodeType('mix:versionable')->willReturn($isVersionable)->shouldBeCalled();
 
         if (false == $isVersionable) {
-            $this->setExpectedException('\OutOfBoundsException', 'is not versionable');
+            $this->expectException('\OutOfBoundsException', 'is not versionable');
         }
         $this->helper->assertNodeIsVersionable($this->node->reveal());
     }

tests/PHPCR/Shell/Helper/TextHelperTest.php

@@ -12,7 +12,9 @@
 
 namespace PHPCR\Shell\Console\Helper;
 
-class TextHelperTest extends \PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class TextHelperTest extends TestCase
 {
     protected $textHelper;
 
@@ -76,7 +78,7 @@ public function provideTruncate()
     public function testTruncate($text, $length, $alignment, $truncateString, $expected, $expectedException = null)
     {
         if ($expectedException) {
-            $this->setExpectedException('InvalidArgumentException', $expectedException);
+            $this->expectException('InvalidArgumentException', $expectedException);
         }
         $res = $this->textHelper->truncate($text, $length, $alignment, $truncateString);
         $this->assertEquals($expected, $res);

tests/PHPCR/Shell/Phpcr/PhpcrSessionTest.php

@@ -13,8 +13,9 @@
 namespace PHPCR\Shell\Phpcr;
 
 use PHPCR\PathNotFoundException;
+use PHPUnit\Framework\TestCase;
 
-class PhpcrSessionTest extends \Phpunit_Framework_TestCase
+class PhpcrSessionTest extends TestCase
 {
     public function setUp()
     {