Try to re-enable 8.1 build using phpunit 9

Author: Seldaek

.github/workflows/continuous-integration.yml

@@ -26,8 +26,7 @@ jobs:
           - "7.3"
           - "7.4"
           - "8.0"
-          # disabled for now as it leads to PHPUnit installing in a very old 4.3 version due to phpspec/prophecy not allowing 8.1
-          # - "8.1"
+          - "8.1"
 
     steps:
       - name: "Checkout"

composer.json

@@ -15,7 +15,7 @@
         "php": "^5.3 || ^7.0 || ^8.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0 || ^8.5.13",
+        "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0 || ^8.5.13 || ^9",
         "phpstan/phpstan": "^0.12.59"
     },
     "autoload": {

tests/JsonParserTest.php

@@ -69,7 +69,7 @@ public function testErrorOnTrailingComma()
 }');
             $this->fail('Invalid trailing comma should be detected');
         } catch (ParsingException $e) {
-            $this->assertContains('It appears you have an extra trailing comma', $e->getMessage());
+            $this->assertStringContainsStringCompat('It appears you have an extra trailing comma', $e->getMessage());
         }
     }
 
@@ -82,7 +82,7 @@ public function testErrorOnInvalidQuotes()
 }');
             $this->fail('Invalid quotes for string should be detected');
         } catch (ParsingException $e) {
-            $this->assertContains('Invalid string, it appears you used single quotes instead of double quotes', $e->getMessage());
+            $this->assertStringContainsStringCompat('Invalid string, it appears you used single quotes instead of double quotes', $e->getMessage());
         }
     }
 
@@ -95,7 +95,7 @@ public function testErrorOnUnescapedBackslash()
 }');
             $this->fail('Invalid unescaped string should be detected');
         } catch (ParsingException $e) {
-            $this->assertContains('Invalid string, it appears you have an unescaped backslash at: \z', $e->getMessage());
+            $this->assertStringContainsStringCompat('Invalid string, it appears you have an unescaped backslash at: \z', $e->getMessage());
         }
     }
 
@@ -144,7 +144,7 @@ public function testErrorOnUnterminatedString()
             $parser->parse('{"bar": "foo}');
             $this->fail('Invalid unterminated string should be detected');
         } catch (ParsingException $e) {
-            $this->assertContains('Invalid string, it appears you forgot to terminate a string, or attempted to write a multiline string which is invalid', $e->getMessage());
+            $this->assertStringContainsStringCompat('Invalid string, it appears you forgot to terminate a string, or attempted to write a multiline string which is invalid', $e->getMessage());
         }
     }
 
@@ -156,7 +156,7 @@ public function testErrorOnMultilineString()
 bar"}');
             $this->fail('Invalid multi-line string should be detected');
         } catch (ParsingException $e) {
-            $this->assertContains('Invalid string, it appears you forgot to terminate a string, or attempted to write a multiline string which is invalid', $e->getMessage());
+            $this->assertStringContainsStringCompat('Invalid string, it appears you forgot to terminate a string, or attempted to write a multiline string which is invalid', $e->getMessage());
         }
     }
 
@@ -169,7 +169,7 @@ public function testErrorAtBeginning()
 ');
             $this->fail('Empty string should be invalid');
         } catch (ParsingException $e) {
-            $this->assertContains("Parse error on line 1:\n\n^", $e->getMessage());
+            $this->assertStringContainsStringCompat("Parse error on line 1:\n\n^", $e->getMessage());
         }
     }
 
@@ -189,7 +189,7 @@ public function testDetectsKeyOverrides()
             $parser->parse('{"a":"b", "a":"c"}', JsonParser::DETECT_KEY_CONFLICTS);
             $this->fail('Duplicate keys should not be allowed');
         } catch (DuplicateKeyException $e) {
-            $this->assertContains('Duplicate key: a', $e->getMessage());
+            $this->assertStringContainsStringCompat('Duplicate key: a', $e->getMessage());
             $this->assertSame('a', $e->getKey());
             $this->assertSame(array('line' => 1, 'key' => 'a'), $e->getDetails());
         }
@@ -206,7 +206,7 @@ public function testDetectsKeyOverridesWithEmpty()
             $parser->parse('{"":"b", "_empty_":"a"}', JsonParser::DETECT_KEY_CONFLICTS);
             $this->fail('Duplicate keys should not be allowed');
         } catch (DuplicateKeyException $e) {
-            $this->assertContains('Duplicate key: _empty_', $e->getMessage());
+            $this->assertStringContainsStringCompat('Duplicate key: _empty_', $e->getMessage());
             $this->assertSame('_empty_', $e->getKey());
             $this->assertSame(array('line' => 1, 'key' => '_empty_'), $e->getDetails());
         }
@@ -258,7 +258,7 @@ public function testFileWithBOM()
             $parser->parse(file_get_contents(dirname(__FILE__) .'/bom.json'));
             $this->fail('BOM should be detected');
         } catch (ParsingException $e) {
-            $this->assertContains('BOM detected', $e->getMessage());
+            $this->assertStringContainsStringCompat('BOM detected', $e->getMessage());
         }
     }
 
@@ -269,4 +269,13 @@ public function testLongString()
         $json = '{"k":"' . str_repeat("a\\n",10000) . '"}';
         $this->assertEquals(json_decode($json), $parser->parse($json));
     }
+
+    public function assertStringContainsStringCompat($needle, $haystack, $message = '')
+    {
+        if (method_exists($this, 'assertStringContainsString')) {
+            $this->assertStringContainsString($needle, $haystack, $message);
+        } else {
+            $this->assertContains($needle, $haystack, $message);
+        }
+    }
 }