MNT Remove polyfill

silverstripe · Nov 4, 2021 · 7b5d6f6 · 7b5d6f6
1 parent 3628e23
commit 7b5d6f6
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/composer.json b/composer.json
@@ -24,7 +24,7 @@
         "silverstripe/vendor-plugin": "^1"
     },
     "require-dev": {
-        "sminnee/phpunit": "^5.7",
+        "silverstripe/recipe-testing": "^2",
         "silverstripe/graphql": "^3.5 || ^4",
         "squizlabs/php_codesniffer": "^3"
     },

diff --git a/tests/php/VersionedTest.php b/tests/php/VersionedTest.php
@@ -26,7 +26,6 @@
 
 class VersionedTest extends SapphireTest
 {
-
     protected static $fixture_file = 'VersionedTest.yml';
 
     public static $extra_dataobjects = [
@@ -662,7 +661,10 @@ public function testGetVersion()
             'Versioned.stage' => Versioned::DRAFT,
         ];
         $this->assertEquals($archiveParms, $page2v1->getInheritableQueryParams());
-        $this->assertArraySubset($archiveParms, $page2v1->Children()->getQueryParams());
+        $queryParms = $page2v1->Children()->getQueryParams();
+        foreach ($archiveParms as $key => $val) {
+            $this->assertSame($val, $queryParms[$key], "queryParms[$key] should be $val");
+        }
         $this->assertListEquals(
             [
                 ['Title' => 'Page 2a'],
@@ -684,7 +686,10 @@ public function testGetVersion()
             'Versioned.stage' => Versioned::DRAFT,
         ];
         $this->assertEquals($archiveParms, $page2v2->getInheritableQueryParams());
-        $this->assertArraySubset($archiveParms, $page2v2->Children()->getQueryParams());
+        $queryParms = $page2v1->Children()->getQueryParams();
+        foreach ($archiveParms as $key => $val) {
+            $this->assertSame($val, $queryParms[$key], "queryParms[$key] should be $val");
+        }
         $this->assertListEquals(
             [
                 ['Title' => 'Page 2a - v2'],