Expand dev constraint versions

Author: colinodell

composer.json

@@ -24,10 +24,10 @@
         "ext-mbstring": "*"
     },
     "require-dev": {
-        "phpunit/phpunit": "^4.8.36",
+        "phpunit/phpunit": "^4.8.36|^7.3",
         "mikehaertl/php-shellcommand": "^1.2.5",
         "squizlabs/php_codesniffer": "^2.3",
-        "symfony/finder": "^2.3"
+        "symfony/finder": "^2.8|^3.4|^4.1"
     },
     "autoload": {
         "psr-4": {

phpunit.xml.dist

@@ -22,7 +22,7 @@
     <logging>
         <log type="tap" target="build/report.tap"/>
         <log type="junit" target="build/report.junit.xml"/>
-        <log type="coverage-html" target="build/coverage" charset="UTF-8" yui="true" highlight="true"/>
+        <log type="coverage-html" target="build/coverage"/>
         <log type="coverage-text" target="build/coverage.txt"/>
         <log type="coverage-clover" target="build/logs/clover.xml"/>
     </logging>

test/Functional/MaximumDepthTest.php

@@ -16,15 +16,21 @@
 
 class MaximumDepthTest extends TestCase
 {
+    /**
+     * @expectedException \ColinODell\Json5\SyntaxError
+     * @expectedExceptionMessage Maximum stack depth exceeded
+     */
     public function testMaximumDepthWithArray()
     {
-        $this->setExpectedException('ColinODell\\Json5\\SyntaxError', 'Maximum stack depth exceeded');
         Json5Decoder::decode('[[1]]', false, 2);
     }
 
+    /**
+     * @expectedException \ColinODell\Json5\SyntaxError
+     * @expectedExceptionMessage Maximum stack depth exceeded
+     */
     public function testMaximumDepthWithObject()
     {
-        $this->setExpectedException('ColinODell\\Json5\\SyntaxError', 'Maximum stack depth exceeded');
         Json5Decoder::decode('{"foo": {"bar": "baz"}}', false, 2);
     }
 

test/Functional/ParseTest.php

@@ -89,10 +89,10 @@ public function dataForTestJson5Parsing()
      * @param string $json
      *
      * @dataProvider dataForTestValidES5DisallowedByJson5
+     * @expectedException \ColinODell\Json5\SyntaxError
      */
     public function testValidES5DisallowedByJson5($json)
     {
-        $this->setExpectedException('ColinODell\\Json5\\SyntaxError');
         Json5Decoder::decode($json);
     }
 
@@ -160,15 +160,19 @@ public function testNaNWithSign()
         $this->assertTrue(is_nan(Json5Decoder::decode('+NaN')));
     }
 
+    /**
+     * @expectedException \ColinODell\Json5\SyntaxError
+     */
     public function testBadNumberStartingWithN()
     {
-        $this->setExpectedException('ColinODell\\Json5\\SyntaxError');
         Json5Decoder::decode('NotANumber');
     }
 
+    /**
+     * @expectedException \ColinODell\Json5\SyntaxError
+     */
     public function testBadNumberStartingWithI()
     {
-        $this->setExpectedException('ColinODell\\Json5\\SyntaxError');
         Json5Decoder::decode('+Indigo');
     }
 

test/Functional/RegressionTest.php

@@ -22,16 +22,20 @@ public function testArrayWithFirstElement0()
         $this->assertSame(array(0), json5_decode($json));
     }
 
+    /**
+     * @expectedException \ColinODell\Json5\SyntaxError
+     */
     public function testOpenCurlyBraceOnly()
     {
-        $this->setExpectedException('ColinODell\\Json5\\SyntaxError');
         json5_decode('{');
         $this->fail('Should have thrown a syntax error');
     }
 
+    /**
+     * @expectedException \ColinODell\Json5\SyntaxError
+     */
     public function testOpenSquareBraceOnly()
     {
-        $this->setExpectedException('ColinODell\\Json5\\SyntaxError');
         json5_decode('[');
         $this->fail('Should have thrown a syntax error');
     }