Fix phpunit compatibility

Author: alexander-schranz

.gitignore

@@ -2,3 +2,4 @@ composer.lock
 vendor
 tests/data
 tests/migrations
+.phpunit.result.cache

phpunit.xml.dist

@@ -7,6 +7,7 @@
     >
     <php>
         <env name="SYMFONY_PHPUNIT_REMOVE_RETURN_TYPEHINT" value="1"/>
+        <env name="SYMFONY_PHPUNIT_REMOVE" value="symfony/yaml"/>
     </php>
 
     <testsuites>

tests/BaseTestCase.php

@@ -13,9 +13,10 @@
 
 use Jackalope\RepositoryFactoryFilesystem;
 use PHPCR\SimpleCredentials;
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\Filesystem\Filesystem;
 
-class BaseTestCase extends \PHPUnit_Framework_TestCase
+class BaseTestCase extends TestCase
 {
     protected $session;
 

tests/Functional/MigrationTest.php

@@ -12,6 +12,7 @@
 namespace PHPCR\Migrations\tests\Functional;
 
 use PHPCR\Migrations\BaseTestCase;
+use PHPCR\Migrations\Exception\MigratorException;
 use PHPCR\Migrations\Migrator;
 use PHPCR\Migrations\VersionFinder;
 use PHPCR\Migrations\VersionStorage;
@@ -161,15 +162,16 @@ public function testInitialize()
 
     /**
      * It should throw an exception if trying to reiniitialize.
-     *
-     * @expectedException PHPCR\Migrations\Exception\MigratorException
-     * @expectedExceptionMessage Will not re-initialize
      */
     public function testReinitialize()
     {
         $this->addVersion(self::VERSION1);
         $this->addVersion(self::VERSION2);
+
         $this->getMigrator()->initialize();
+
+        $this->expectException(MigratorException::class);
+        $this->expectExceptionMessage('Will not re-initialize');
         $this->getMigrator()->initialize();
     }
 

tests/Unit/MigratorFactoryTest.php

@@ -17,8 +17,9 @@
 use PHPCR\Migrations\VersionFinder;
 use PHPCR\Migrations\VersionStorage;
 use PHPCR\SessionInterface;
+use PHPUnit\Framework\TestCase;
 
-class MigratorFactoryTest extends \PHPUnit_Framework_TestCase
+class MigratorFactoryTest extends TestCase
 {
     public function testFactory()
     {

tests/Unit/MigratorUtilTest.php

@@ -12,8 +12,9 @@
 namespace PHPCR\Migrations\tests\Unit;
 
 use PHPCR\Migrations\MigratorUtil;
+use PHPUnit\Framework\TestCase;
 
-class MigratorUtilTest extends \PHPUnit_Framework_TestCase
+class MigratorUtilTest extends TestCase
 {
     /**
      * It should return the classname of a file.

tests/Unit/VersionCollectionTest.php

@@ -13,8 +13,9 @@
 
 use PHPCR\Migrations\VersionCollection;
 use PHPCR\Migrations\VersionInterface;
+use PHPUnit\Framework\TestCase;
 
-class VersionCollectionTest extends \PHPUnit_Framework_TestCase
+class VersionCollectionTest extends TestCase
 {
     const VERSION1 = '201501010000';
     const VERSION2 = '201501020000';

tests/Unit/VersionFinderTest.php

@@ -13,8 +13,9 @@
 
 use PHPCR\Migrations\VersionCollection;
 use PHPCR\Migrations\VersionFinder;
+use PHPUnit\Framework\TestCase;
 
-class VersionFinderTest extends \PHPUnit_Framework_TestCase
+class VersionFinderTest extends TestCase
 {
     public function setUp()
     {
@@ -38,13 +39,11 @@ public function testGetCollection()
 
     /**
      * It should do nothing if no migrations paths are given.
-     *
-     * @expectedException \RuntimeException
-     * @expectedExceptionMessage No paths were provided
      */
     public function testNoMigrationPaths()
     {
-        $collection = (new VersionFinder(array()))->getCollection();
-        $versions = $collection->getAllVersions();
+        $this->expectException(\RuntimeException::class);
+        $this->expectExceptionMessage('No paths were provided');
+        $versionFinder = new VersionFinder(array());
     }
 }