Adapt tests to PHPUnit 8

tgalopin · tgalopin · commit 943e1819be15 · 2021-10-05T15:03:48.000+02:00
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -16,6 +16,8 @@ jobs:
         docker:
             - image: circleci/php:<< parameters.php-version >>
         steps:
+            - run: sudo composer self-update
+
             - checkout
 
             # Dependencies
@@ -41,8 +43,10 @@ jobs:
 
     release:
         docker:
-            - image: circleci/php:8.0
+            - image: circleci/php:7.1
         steps:
+            - run: sudo composer self-update
+
             - checkout
 
             # Dependencies
diff --git a/.phpunit.result.cache b/.phpunit.result.cache
@@ -0,0 +1 @@
+{"version":1,"defects":{"SensioLabs\\Insight\\Sdk\\Tests\\ApiTest::testConstructorWithoutOption":6,"SensioLabs\\Insight\\Sdk\\Tests\\ParserTest::testParseErrorsFailedIfDocumentIfInvalid with data set #0":6,"SensioLabs\\Insight\\Sdk\\Tests\\ParserTest::testParseErrorsFailedIfDocumentIfInvalid with data set #1":6,"SensioLabs\\Insight\\Sdk\\Tests\\ParserTest::testParseErrorsFailedIfDocumentIfInvalid with data set #2":6},"times":{"SensioLabs\\Insight\\Sdk\\Tests\\ApiTest::testConstructorWithoutOption":0.007,"SensioLabs\\Insight\\Sdk\\Tests\\ApiTest::testGetProjects":0.021,"SensioLabs\\Insight\\Sdk\\Tests\\ApiTest::testGetProjectsWithPage":0.004,"SensioLabs\\Insight\\Sdk\\Tests\\ApiTest::testGetProject":0.008,"SensioLabs\\Insight\\Sdk\\Tests\\ApiTest::testCreateProjectOk":0.008,"SensioLabs\\Insight\\Sdk\\Tests\\ApiTest::testCreateProjectNOk":0.001,"SensioLabs\\Insight\\Sdk\\Tests\\ApiTest::testupdateProjectOk":0.008,"SensioLabs\\Insight\\Sdk\\Tests\\ApiTest::testupdateProjectNOk":0.001,"SensioLabs\\Insight\\Sdk\\Tests\\ApiTest::testGetAnalyses":0.002,"SensioLabs\\Insight\\Sdk\\Tests\\ApiTest::testGetAnalysis":0.007,"SensioLabs\\Insight\\Sdk\\Tests\\ApiTest::testGetAnalysisStatus":0.002,"SensioLabs\\Insight\\Sdk\\Tests\\ApiTest::testAnalyze":0.008,"SensioLabs\\Insight\\Tests\\Sdk\\Model\\ViolationsTest::testCount":0,"SensioLabs\\Insight\\Tests\\Sdk\\Model\\ViolationsTest::testIterable":0,"SensioLabs\\Insight\\Sdk\\Tests\\ParserTest::testParseErrorsFailedIfDocumentIfInvalid with data set #0":0,"SensioLabs\\Insight\\Sdk\\Tests\\ParserTest::testParseErrorsFailedIfDocumentIfInvalid with data set #1":0,"SensioLabs\\Insight\\Sdk\\Tests\\ParserTest::testParseErrorsFailedIfDocumentIfInvalid with data set #2":0.001,"SensioLabs\\Insight\\Sdk\\Tests\\ParserTest::testParseErrors":0}}
diff --git a/Sdk/Tests/ApiTest.php b/Sdk/Tests/ApiTest.php
@@ -25,7 +25,7 @@ class ApiTest extends TestCase
     private $api;
     private $logger;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->logger = $this->getMockBuilder('Psr\Log\LoggerInterface')->getMock();
     }
@@ -218,7 +218,7 @@ public function testAnalyze()
         $this->assertInstanceOf('SensioLabs\Insight\Sdk\Model\Analysis', $analysis);
     }
 
-    protected function tearDown()
+    protected function tearDown(): void
     {
         $this->logger = null;
         $this->api = null;
diff --git a/Sdk/Tests/ParserTest.php b/Sdk/Tests/ParserTest.php
@@ -21,7 +21,7 @@ class ParserTest extends TestCase
      */
     private $parser;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->parser = new Parser();
     }
@@ -65,7 +65,7 @@ public function testParseErrors()
         $this->assertSame($expectedFields, $error->getEntityBodyParameters());
     }
 
-    protected function tearDown()
+    protected function tearDown(): void
     {
         $this->parser = null;
     }
diff --git a/composer.json b/composer.json
@@ -13,8 +13,8 @@
     },
     "require-dev": {
         "monolog/monolog": "^1.4",
-        "symfony/phpunit-bridge": "^4.4",
-        "symfony/var-dumper": "^4.4"
+        "symfony/phpunit-bridge": "^4.4|^5.3",
+        "symfony/var-dumper": "^4.4|^5.3"
     },
     "suggest": {
         "monolog/monolog": "Will add some log capability to this library"
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -9,12 +9,11 @@
     convertWarningsToExceptions = "true"
     processIsolation            = "false"
     stopOnFailure               = "false"
-    syntaxCheck                 = "false"
     bootstrap                   = "vendor/autoload.php" >
 
     <php>
         <ini name="error_reporting" value="-1" />
-        <server name="SYMFONY_PHPUNIT_VERSION" value="8.5" />
+        <server name="SYMFONY_MAX_PHPUNIT_VERSION" value="8" />
     </php>
 
     <testsuites>

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	+{"version":1,"defects":{"SensioLabs\\Insight\\Sdk\\Tests\\ApiTest::testConstructorWithoutOption":6,"SensioLabs\\Insight\\Sdk\\Tests\\ParserTest::testParseErrorsFailedIfDocumentIfInvalid with data set #0":6,"SensioLabs\\Insight\\Sdk\\Tests\\ParserTest::testParseErrorsFailedIfDocumentIfInvalid with data set #1":6,"SensioLabs\\Insight\\Sdk\\Tests\\ParserTest::testParseErrorsFailedIfDocumentIfInvalid with data set #2":6},"times":{"SensioLabs\\Insight\\Sdk\\Tests\\ApiTest::testConstructorWithoutOption":0.007,"SensioLabs\\Insight\\Sdk\\Tests\\ApiTest::testGetProjects":0.021,"SensioLabs\\Insight\\Sdk\\Tests\\ApiTest::testGetProjectsWithPage":0.004,"SensioLabs\\Insight\\Sdk\\Tests\\ApiTest::testGetProject":0.008,"SensioLabs\\Insight\\Sdk\\Tests\\ApiTest::testCreateProjectOk":0.008,"SensioLabs\\Insight\\Sdk\\Tests\\ApiTest::testCreateProjectNOk":0.001,"SensioLabs\\Insight\\Sdk\\Tests\\ApiTest::testupdateProjectOk":0.008,"SensioLabs\\Insight\\Sdk\\Tests\\ApiTest::testupdateProjectNOk":0.001,"SensioLabs\\Insight\\Sdk\\Tests\\ApiTest::testGetAnalyses":0.002,"SensioLabs\\Insight\\Sdk\\Tests\\ApiTest::testGetAnalysis":0.007,"SensioLabs\\Insight\\Sdk\\Tests\\ApiTest::testGetAnalysisStatus":0.002,"SensioLabs\\Insight\\Sdk\\Tests\\ApiTest::testAnalyze":0.008,"SensioLabs\\Insight\\Tests\\Sdk\\Model\\ViolationsTest::testCount":0,"SensioLabs\\Insight\\Tests\\Sdk\\Model\\ViolationsTest::testIterable":0,"SensioLabs\\Insight\\Sdk\\Tests\\ParserTest::testParseErrorsFailedIfDocumentIfInvalid with data set #0":0,"SensioLabs\\Insight\\Sdk\\Tests\\ParserTest::testParseErrorsFailedIfDocumentIfInvalid with data set #1":0,"SensioLabs\\Insight\\Sdk\\Tests\\ParserTest::testParseErrorsFailedIfDocumentIfInvalid with data set #2":0.001,"SensioLabs\\Insight\\Sdk\\Tests\\ParserTest::testParseErrors":0}}
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ class ApiTest extends TestCase`
`25`	`25`	`private $api;`
`26`	`26`	`private $logger;`
`27`	`27`
`28`		`- protected function setUp()`
	`28`	`+ protected function setUp(): void`
`29`	`29`	`{`
`30`	`30`	`$this->logger = $this->getMockBuilder('Psr\Log\LoggerInterface')->getMock();`
`31`	`31`	`}`
`@@ -218,7 +218,7 @@ public function testAnalyze()`
`218`	`218`	`$this->assertInstanceOf('SensioLabs\Insight\Sdk\Model\Analysis', $analysis);`
`219`	`219`	`}`
`220`	`220`
`221`		`- protected function tearDown()`
	`221`	`+ protected function tearDown(): void`
`222`	`222`	`{`
`223`	`223`	`$this->logger = null;`
`224`	`224`	`$this->api = null;`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ class ParserTest extends TestCase`
`21`	`21`	`*/`
`22`	`22`	`private $parser;`
`23`	`23`
`24`		`- protected function setUp()`
	`24`	`+ protected function setUp(): void`
`25`	`25`	`{`
`26`	`26`	`$this->parser = new Parser();`
`27`	`27`	`}`
`@@ -65,7 +65,7 @@ public function testParseErrors()`
`65`	`65`	`$this->assertSame($expectedFields, $error->getEntityBodyParameters());`
`66`	`66`	`}`
`67`	`67`
`68`		`- protected function tearDown()`
	`68`	`+ protected function tearDown(): void`
`69`	`69`	`{`
`70`	`70`	`$this->parser = null;`
`71`	`71`	`}`