Merge pull request silverstripe#338 from creative-commoners/pulls/1/s…

…apphire-test-nine [WIP] API phpunit 9 support
open-sausages · Nov 1, 2021 · 775371a · 775371a
2 parents 3628e23 + 9b39e92
commit 775371a
Show file tree

Hide file tree

Showing 27 changed files with 100 additions and 100 deletions.
diff --git a/composer.json b/composer.json
@@ -19,12 +19,14 @@
         }
     ],
     "require": {
-        "silverstripe/framework": "^4.7",
+        "php": "^7.3 || ^8.0",
+        "silverstripe/framework": "^4.10",
         "symfony/cache": "^3.4 || ^4",
         "silverstripe/vendor-plugin": "^1"
     },
     "require-dev": {
-        "sminnee/phpunit": "^5.7",
+        "silverstripe/recipe-testing": "^2",
+        "dms/phpunit-arraysubset-asserts": "^0.3.0",
         "silverstripe/graphql": "^3.5 || ^4",
         "squizlabs/php_codesniffer": "^3"
     },

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,11 +1,9 @@
-<!--
-Standard module phpunit configuration.
-Requires PHPUnit ^5.7
--->
 <phpunit bootstrap="vendor/silverstripe/framework/tests/bootstrap.php" colors="true">
-	<testsuite name="Default">
-		<directory>tests/php</directory>
-    </testsuite>
+    <testsuites>
+        <testsuite name="Default">
+            <directory>tests/php</directory>
+        </testsuite>
+    </testsuites>
     <filter>
         <whitelist addUncoveredFilesFromWhitelist="true">
             <directory suffix=".php">src/</directory>

diff --git a/tests/php/Caching/ProxyCacheFactoryTest.php b/tests/php/Caching/ProxyCacheFactoryTest.php
@@ -8,7 +8,7 @@
 
 class ProxyCacheFactoryTest extends SapphireTest
 {
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
 

diff --git a/tests/php/ChangeSetTest.php b/tests/php/ChangeSetTest.php
@@ -3,7 +3,7 @@
 namespace SilverStripe\Versioned\Tests;
 
 use BadMethodCallException;
-use PHPUnit_Framework_ExpectationFailedException;
+use PHPUnit\Framework\ExpectationFailedException;
 use SebastianBergmann\Comparator\ComparisonFailure;
 use SilverStripe\Dev\SapphireTest;
 use SilverStripe\ORM\DataObject;
@@ -32,7 +32,7 @@ class ChangeSetTest extends SapphireTest
         ChangeSetTest\UnstagedObject::class,
     ];
 
-    protected function tearDown()
+    protected function tearDown(): void
     {
         // Reset overridden permissions
         foreach ($this->getExtraDataObjects() as $dataObjectClass) {
@@ -85,7 +85,7 @@ protected function assertChangeSetLooksLike($cs, $match)
                 }
             }
 
-            throw new PHPUnit_Framework_ExpectationFailedException(
+            throw new ExpectationFailedException(
                 'Change set didn\'t include expected item',
                 new ComparisonFailure(
                     ['Class' => $class, 'ID' => $objectID, 'Added' => $mode],
@@ -106,11 +106,12 @@ protected function assertChangeSetLooksLike($cs, $match)
                     'ChangeType' => $item->getChangeType()
                 ];
             }
-            throw new PHPUnit_Framework_ExpectationFailedException(
+            throw new ExpectationFailedException(
                 'Change set included items that weren\'t expected',
                 new ComparisonFailure([], $extra, '', print_r($extra, true))
             );
         }
+        $this->assertTrue(true, 'Exception was thrown when it should not have been');
     }
 
     public function testAddObject()

diff --git a/tests/php/DataDifferencerTest.php b/tests/php/DataDifferencerTest.php
@@ -22,7 +22,7 @@ class DataDifferencerTest extends SapphireTest
         DataDifferencerTest\HasOneRelationObject::class
     ];
 
-    public function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
 
@@ -40,7 +40,7 @@ public function setUp()
         }
     }
 
-    public function tearDown()
+    protected function tearDown(): void
     {
         TestAssetStore::reset();
         parent::tearDown();
@@ -57,7 +57,7 @@ public static function assertContainsIgnoreWhitespace($needle, $haystack, $messa
     {
         $needle = preg_replace('#\s+#', '', $needle);
         $haystack = preg_replace('#\s+#', '', $haystack);
-        return parent::assertContains($needle, $haystack, $message);
+        return parent::assertStringContainsString($needle, $haystack, $message);
     }
 
     public function testArrayValues()

diff --git a/tests/php/GraphQL/Legacy/Extensions/DataObjectScaffolderExtensionTest.php b/tests/php/GraphQL/Legacy/Extensions/DataObjectScaffolderExtensionTest.php
@@ -25,7 +25,7 @@ class DataObjectScaffolderExtensionTest extends SapphireTest
         Fake::class,
     ];
 
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
         if (!class_exists(Manager::class)) {

diff --git a/tests/php/GraphQL/Legacy/Extensions/ReadExtensionTest.php b/tests/php/GraphQL/Legacy/Extensions/ReadExtensionTest.php
@@ -28,7 +28,7 @@ class ReadExtensionTest extends SapphireTest
         Fake::class,
     ];
 
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
         if (!class_exists(Manager::class)) {
@@ -53,7 +53,7 @@ public function testReadExtensionAppliesFilters()
         $read = new Read(Fake::class);
         $read->setUsePagination(false);
         $readScaffold = $read->scaffold($manager);
-        $this->assertInternalType('callable', $readScaffold['resolve']);
+        $this->assertIsCallable($readScaffold['resolve']);
         $readScaffold['resolve'](null, ['Versioning' => true], ['currentUser' => new Member()], new ResolveInfo([]));
     }
 }
diff --git a/tests/php/GraphQL/Legacy/Extensions/ReadOneExtensionTest.php b/tests/php/GraphQL/Legacy/Extensions/ReadOneExtensionTest.php
@@ -29,7 +29,7 @@ class ReadOneExtensionTest extends SapphireTest
         Fake::class,
     ];
 
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
         if (class_exists(Schema::class)) {
@@ -44,7 +44,7 @@ public function testReadOneExtensionAppliesFilters()
         $manager->addType(new ObjectType(['name' => StaticSchema::inst()->typeNameForDataObject(Fake::class)]));
         $read = new ReadOne(Fake::class);
         $readScaffold = $read->scaffold($manager);
-        $this->assertInternalType('callable', $readScaffold['resolve']);
+        $this->assertIsCallable($readScaffold['resolve']);
         $doResolve = function ($mode, $ID, $version = null) use ($readScaffold) {
             $args = [
                 'ID' => $ID,
@@ -94,7 +94,7 @@ public function testReadOneExtensionAppliesFilters()
         $this->assertEquals($record->ID, $result->ID);
         $this->assertEquals('First', $result->Name);
 
-        $this->expectException(InvalidArgumentException::class);
+        $this->expectException(\InvalidArgumentException::class);
         $doResolve('version', $record->ID, null);
     }
 }
diff --git a/tests/php/GraphQL/Legacy/Extensions/SchemaScaffolderExtensionTest.php b/tests/php/GraphQL/Legacy/Extensions/SchemaScaffolderExtensionTest.php
@@ -28,7 +28,7 @@ class SchemaScaffolderExtensionTest extends SapphireTest
         Fake::class,
     ];
 
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
         if (class_exists(Schema::class)) {

diff --git a/tests/php/GraphQL/Legacy/Operations/CopyToStageTest.php b/tests/php/GraphQL/Legacy/Operations/CopyToStageTest.php
@@ -31,7 +31,7 @@ class CopyToStageTest extends SapphireTest
         Fake::class,
     ];
 
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
         if (class_exists(Schema::class)) {
@@ -48,7 +48,7 @@ public function testCopyToStage()
         $manager->addType(new ObjectType(['name' => $typeName]));
         $copyToStage = new CopyToStage(Fake::class);
         $scaffold = $copyToStage->scaffold($manager);
-        $this->assertInternalType('callable', $scaffold['resolve']);
+        $this->assertIsCallable($scaffold['resolve']);
 
         /* @var Fake|Versioned $record */
         $record = new Fake();
@@ -100,7 +100,7 @@ public function testCopyToStage()
         $this->assertEquals('Second', $recordLive->Title);
 
         // Test error
-        $this->expectException(InvalidArgumentException::class);
+        $this->expectException(\InvalidArgumentException::class);
         $scaffold['resolve'](
             null,
             [

diff --git a/tests/php/GraphQL/Legacy/Operations/PublishTest.php b/tests/php/GraphQL/Legacy/Operations/PublishTest.php
@@ -29,7 +29,7 @@ class PublishTest extends SapphireTest
         Fake::class,
     ];
 
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
         if (class_exists(Schema::class)) {
@@ -45,7 +45,7 @@ public function testPublish()
 
         $publish = new Publish(Fake::class);
         $scaffold = $publish->scaffold($manager);
-        $this->assertInternalType('callable', $scaffold['resolve']);
+        $this->assertIsCallable($scaffold['resolve']);
 
         $record = new Fake();
         $record->Name = 'First';
@@ -73,7 +73,7 @@ public function testPublish()
         $this->assertEquals('First', $result->Name);
 
         $this->expectException(Exception::class);
-        $this->expectExceptionMessageRegExp('/^Not allowed/');
+        $this->expectExceptionMessageMatches('/^Not allowed/');
         $scaffold['resolve'](
             null,
             [

diff --git a/tests/php/GraphQL/Legacy/Operations/ReadVersionsTest.php b/tests/php/GraphQL/Legacy/Operations/ReadVersionsTest.php
@@ -32,7 +32,7 @@ class ReadVersionsTest extends SapphireTest
         Fake::class,
     ];
 
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
         if (class_exists(Schema::class)) {
@@ -50,10 +50,10 @@ public function testItThrowsIfAppliedToAnUnversionedObject()
         $readVersions = new ReadVersions(UnversionedWithField::class, 'Test');
         $readVersions->setUsePagination(false);
         $scaffold = $readVersions->scaffold($manager);
-        $this->assertInternalType('callable', $scaffold['resolve']);
+        $this->assertIsCallable($scaffold['resolve']);
 
         $this->expectException(Exception::class);
-        $this->expectExceptionMessageRegExp('/must have the Versioned extension/');
+        $this->expectExceptionMessageMatches('/must have the Versioned extension/');
         $scaffold['resolve'](
             new UnversionedWithField(),
             [],
@@ -71,10 +71,10 @@ public function testItThrowsIfYouCantReadStages()
         $readVersions = new ReadVersions(Fake::class, 'Test');
         $readVersions->setUsePagination(false);
         $scaffold = $readVersions->scaffold($manager);
-        $this->assertInternalType('callable', $scaffold['resolve']);
+        $this->assertIsCallable($scaffold['resolve']);
 
         $this->expectException(Exception::class);
-        $this->expectExceptionMessageRegExp('/Cannot view versions/');
+        $this->expectExceptionMessageMatches('/Cannot view versions/');
         $scaffold['resolve'](
             new Fake(),
             [],
@@ -92,7 +92,7 @@ public function testItReadsVersions()
         $readVersions = new ReadVersions(Fake::class, 'Test');
         $readVersions->setUsePagination(false);
         $scaffold = $readVersions->scaffold($manager);
-        $this->assertInternalType('callable', $scaffold['resolve']);
+        $this->assertIsCallable($scaffold['resolve']);
         $this->logInWithPermission('ADMIN');
         $member = Security::getCurrentUser();
 

diff --git a/tests/php/GraphQL/Legacy/Operations/RollbackTest.php b/tests/php/GraphQL/Legacy/Operations/RollbackTest.php
@@ -28,20 +28,18 @@ class RollbackTest extends SapphireTest
         FakeDataObjectStub::class,
     ];
 
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
         if (class_exists(Schema::class)) {
             $this->markTestSkipped('Skipped GraphQL 3 test ' . __CLASS__);
         }
     }
 
-    /**
-     * @expectedException InvalidArgumentException
-     * @expectedExceptionMessage Current user does not have permission to roll back this resource
-     */
     public function testRollbackCannotBePerformedWithoutEditPermission()
     {
+        $this->expectException(\InvalidArgumentException::class);
+        $this->expectExceptionMessage('Current user does not have permission to roll back this resource');
         // Create a fake version of our stub
         $stub = FakeDataObjectStub::create();
         $stub->Name = 'First';
@@ -76,7 +74,7 @@ protected function doMutation(DataObject $stub, $toVersion = 1, $member = null)
 
         $mutation = new Rollback($stubClass);
         $scaffold = $mutation->scaffold($manager);
-        $this->assertInternalType('callable', $scaffold['resolve'], 'Resolve function is scaffolded correctly');
+        $this->assertIsCallable($scaffold['resolve'], 'Resolve function is scaffolded correctly');
 
         $args = [
             'ID' => $stub->ID,

diff --git a/tests/php/GraphQL/Legacy/Operations/UnpublishTest.php b/tests/php/GraphQL/Legacy/Operations/UnpublishTest.php
@@ -30,7 +30,7 @@ class UnpublishTest extends SapphireTest
         Fake::class,
     ];
 
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
         if (class_exists(Schema::class)) {
@@ -46,7 +46,7 @@ public function testPublish()
 
         $publish = new Unpublish(Fake::class);
         $scaffold = $publish->scaffold($manager);
-        $this->assertInternalType('callable', $scaffold['resolve']);
+        $this->assertIsCallable($scaffold['resolve']);
 
         $record = new Fake();
         $record->Name = 'First';
@@ -76,7 +76,7 @@ public function testPublish()
 
         $record->copyVersionToStage(Versioned::DRAFT, Versioned::LIVE);
         $this->expectException(Exception::class);
-        $this->expectExceptionMessageRegExp('/^Not allowed/');
+        $this->expectExceptionMessageMatches('/^Not allowed/');
         $scaffold['resolve'](
             null,
             [