chore: fix PHPUnit 10 compat (#489)

SMillerDev · Jul 17, 2023 · 980b1bc · 980b1bc
1 parent 23fb7be
commit 980b1bc
Show file tree

Hide file tree

Showing 14 changed files with 115 additions and 106 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,6 @@
 /.idea/
 /.phpintel/
+/tests/.phpunit.cache/**
 /tests/.phpunit.result.cache
 
 # IntelliJ

diff --git a/composer.lock b/composer.lock
diff --git a/src/PHPDraft/Model/Elements/Tests/ArrayStructureElementTest.php b/src/PHPDraft/Model/Elements/Tests/ArrayStructureElementTest.php
@@ -53,7 +53,7 @@ public function testSuccessfulParse(string $object, ArrayStructureElement $expec
  *
  * @return array
  */
- public function parseObjectProvider(): array
+ public static function parseObjectProvider(): array
  {
  $return = [];
  $base1 = new ArrayStructureElement();

diff --git a/src/PHPDraft/Model/Elements/Tests/BasicStructureElementTest.php b/src/PHPDraft/Model/Elements/Tests/BasicStructureElementTest.php
@@ -70,7 +70,7 @@ public function testStringValue(mixed $value, mixed $string_value): void
  *
  * @return array
  */
- public function stringValueProvider(): array
+ public static function stringValueProvider(): array
  {
  $return = [];
 
@@ -134,7 +134,7 @@ public function testParseCommon($value, BasicStructureElement $expected_value):
  $this->assertEquals([], $dep);
  }
 
- public function parseValueProvider(): array
+ public static function parseValueProvider(): array
  {
  $return = [];
 

diff --git a/src/PHPDraft/Model/Elements/Tests/EnumStructureElementTest.php b/src/PHPDraft/Model/Elements/Tests/EnumStructureElementTest.php
@@ -141,7 +141,7 @@ public function testSuccessfulParse(string $object, EnumStructureElement $expect
  *
  * @return array
  */
- public function parseObjectProvider(): array
+ public static function parseObjectProvider(): array
  {
  $value1 = new ElementStructureElement();
  $value1->value = 'item';

diff --git a/src/PHPDraft/Model/Elements/Tests/ObjectStructureElementTest.php b/src/PHPDraft/Model/Elements/Tests/ObjectStructureElementTest.php
@@ -57,7 +57,7 @@ public function testNewInstance(): void
  *
  * @covers \PHPDraft\Model\Elements\ObjectStructureElement::parse
  */
- public function testSuccesfulParse(string $object, ObjectStructureElement $expected): void
+ public function testSuccessfulParse(string $object, ObjectStructureElement $expected): void
  {
  $dep = [];
  $res = $this->class->parse(json_decode($object), $dep);
@@ -73,7 +73,7 @@ public function testSuccesfulParse(string $object, ObjectStructureElement $expec
  *
  * @return array
  */
- public function parseObjectProvider(): array
+ public static function parseObjectProvider(): array
  {
  $return = [];
  $base1 = new ObjectStructureElement();

diff --git a/src/PHPDraft/Model/Elements/Tests/RequestBodyElementTest.php b/src/PHPDraft/Model/Elements/Tests/RequestBodyElementTest.php
@@ -135,7 +135,7 @@ public function testSuccessfulParse(string $object, ObjectStructureElement $expe
  *
  * @return array
  */
- public function parseObjectProvider(): array
+ public static function parseObjectProvider(): array
  {
  $return = [];
  $base1 = new RequestBodyElement();

diff --git a/src/PHPDraft/Model/Tests/CategoryTest.php b/src/PHPDraft/Model/Tests/CategoryTest.php
@@ -16,7 +16,7 @@
  * Class CategoryTest
  * @covers \PHPDraft\Model\Category
  */
-class CategoryTest extends HierarchyElementChildTest
+class CategoryTest extends HierarchyElementChildTestBase
 {
  /**
  * Set up
@@ -38,6 +38,23 @@ public function tearDown(): void
  unset($this->reflection);
  }
 
+ /**
+ * Test if the value the class is initialized with is correct
+ * @covers \PHPDraft\Model\HierarchyElement
+ */
+ public function testChildrenSetup(): void
+ {
+ $this->assertSame([], $this->class->children);
+ }
+
+ /**
+ * Test if the value the class is initialized with is correct
+ */
+ public function testSetupCorrectly(): void
+ {
+ $this->assertPropertySame('parent', null);
+ }
+
  /**
  * Test if the value the class is initialized with is correct
  */

diff --git a/...Model/Tests/HierarchyElementChildTest.php → ...l/Tests/HierarchyElementChildTestBase.php b/...Model/Tests/HierarchyElementChildTest.php → ...l/Tests/HierarchyElementChildTestBase.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * This file contains the HierarchyElementChildTest.php
+ * This file contains the HierarchyElementChildTestBase.php
  *
  * @package PHPDraft\Model
  * @author Sean Molenaar<[email protected]>
@@ -17,7 +17,7 @@
  * Class HierarchyElementChildTest
  * @package PHPDraft\Model\Tests
  */
-class HierarchyElementChildTest extends LunrBaseTest
+abstract class HierarchyElementChildTestBase extends LunrBaseTest
 {
  /**
  * Mock of the parent class
@@ -31,22 +31,4 @@ public function setUp(): void
  $this->parent = $this->getMockBuilder('\PHPDraft\Model\HierarchyElement')
  ->getMock();
  }
-
- /**
- * Test if the value the class is initialized with is correct
- */
- public function testChildrenSetup(): void
- {
- $this->assertSame([], $this->class->children);
- }
-
- /**
- * Test if the value the class is initialized with is correct
- */
- public function testSetupCorrectly(): void
- {
- $property = $this->reflection->getProperty('parent');
- $property->setAccessible(true);
- $this->assertNull($property->getValue($this->class));
- }
 }
diff --git a/src/PHPDraft/Model/Tests/ObjectElementTest.php b/src/PHPDraft/Model/Tests/ObjectElementTest.php
@@ -16,36 +16,57 @@
  */
 class ObjectElementTest extends LunrBaseTest
 {
+ /**
+ * @covers \PHPDraft\Model\Elements\ObjectStructureElement
+ */
  public function testKeySetup(): void
  {
  $this->assertSame(null, $this->class->key);
  }
 
+ /**
+ * @covers \PHPDraft\Model\Elements\ObjectStructureElement
+ */
  public function testTypeSetup(): void
  {
  $this->assertSame(null, $this->class->type);
  }
 
+ /**
+ * @covers \PHPDraft\Model\Elements\ObjectStructureElement
+ */
  public function testDescriptionSetup(): void
  {
  $this->assertSame(null, $this->class->description);
  }
 
+ /**
+ * @covers \PHPDraft\Model\Elements\ObjectStructureElement
+ */
  public function testElementSetup(): void
  {
  $this->assertSame(null, $this->class->element);
  }
 
+ /**
+ * @covers \PHPDraft\Model\Elements\ObjectStructureElement
+ */
  public function testValueSetup(): void
  {
  $this->assertSame(null, $this->class->value);
  }
 
+ /**
+ * @covers \PHPDraft\Model\Elements\ObjectStructureElement
+ */
  public function testStatusSetup(): void
  {
- $this->assertSame('', $this->class->status);
+ $this->assertSame(null, $this->class->status);
  }
 
+ /**
+ * @covers \PHPDraft\Model\Elements\ObjectStructureElement
+ */
  public function testDepsSetup(): void
  {
  $this->assertSame(null, $this->class->deps);

diff --git a/src/PHPDraft/Model/Tests/TransitionTest.php b/src/PHPDraft/Model/Tests/TransitionTest.php
@@ -16,7 +16,7 @@
  * Class TransitionTest
  * @covers \PHPDraft\Model\Transition
  */
-class TransitionTest extends HierarchyElementChildTest
+class TransitionTest extends HierarchyElementChildTestBase
 {
  /**
  * Set up
@@ -40,6 +40,16 @@ public function tearDown(): void
  unset($this->parent);
  }
 
+
+ /**
+ * Test if the value the class is initialized with is correct
+ * @covers \PHPDraft\Model\HierarchyElement
+ */
+ public function testChildrenSetup(): void
+ {
+ $this->assertSame([], $this->class->children);
+ }
+
  /**
  * Test if the value the class is initialized with is correct
  */

diff --git a/src/PHPDraft/Out/Tests/TemplateRendererTest.php b/src/PHPDraft/Out/Tests/TemplateRendererTest.php
@@ -60,7 +60,7 @@ public function testStripSpaces(): void
  * Provide HTTP status codes
  * @return array<int, array<int, int|string>>
  */
- public function responseStatusProvider(): array
+ public static function responseStatusProvider(): array
  {
  $return = [];
 
@@ -93,7 +93,7 @@ public function testResponseStatus(int $code, string $text): void
  * Provide HTTP methods
  * @return array<int, array<int, string>>
  */
- public function requestMethodProvider(): array
+ public static function requestMethodProvider(): array
  {
  $return = [];
 

diff --git a/tests/phpunit.xml b/tests/phpunit.xml
@@ -1,72 +1,49 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd"
- bootstrap="test.bootstrap.inc.php"
- backupGlobals="false"
- backupStaticAttributes="false"
- forceCoversAnnotation="true"
- colors="true"
- verbose="true">
- <php>
- <ini name="zend.enable_gc" value="1" />
- </php>
- <testsuites>
- <testsuite name="Parse">
- <file>../src/PHPDraft/Parse/Tests/BaseParserTest.php</file>
- <file>../src/PHPDraft/Parse/Tests/DrafterTest.php</file>
- <file>../src/PHPDraft/Parse/Tests/DrafterAPITest.php</file>
- <file>../src/PHPDraft/Parse/Tests/HtmlGeneratorTest.php</file>
- <file>../src/PHPDraft/Parse/Tests/BaseHtmlGeneratorTest.php</file>
- <file>../src/PHPDraft/Parse/Tests/ParserFactoryTest.php</file>
- </testsuite>
- <testsuite name="Model">
- <file>../src/PHPDraft/Model/Tests/CategoryTest.php</file>
- <file>../src/PHPDraft/Model/Tests/HierarchyElementTest.php</file>
- <file>../src/PHPDraft/Model/Tests/HTTPRequestTest.php</file>
- <file>../src/PHPDraft/Model/Tests/HTTPResponseTest.php</file>
- <file>../src/PHPDraft/Model/Tests/ResourceTest.php</file>
- <file>../src/PHPDraft/Model/Tests/TransitionTest.php</file>
- <file>../src/PHPDraft/Model/Elements/Tests/BasicStructureElementTest.php</file>
- <file>../src/PHPDraft/Model/Elements/Tests/EnumStructureElementTest.php</file>
- <file>../src/PHPDraft/Model/Elements/Tests/ObjectStructureElementTest.php</file>
- <file>../src/PHPDraft/Model/Elements/Tests/ArrayStructureElementTest.php</file>
- <file>../src/PHPDraft/Model/Elements/Tests/RequestBodyElementTest.php</file>
- <file>../src/PHPDraft/Model/Elements/Tests/ElementStructureElementTest.php</file>
- </testsuite>
- <testsuite name="In">
- <file>../src/PHPDraft/In/Tests/ApibFileParserTest.php</file>
- </testsuite>
- <testsuite name="Out">
- <file>../src/PHPDraft/Out/Tests/VersionTest.php</file>
- <file>../src/PHPDraft/Out/Tests/SortingTest.php</file>
- <file>../src/PHPDraft/Out/Tests/TemplateRendererTest.php</file>
- <file>../src/PHPDraft/Out/Tests/TwigFactoryTest.php</file>
- </testsuite>
- </testsuites>
- <coverage>
- <include>
- <directory>../src/PHPDraft/</directory>
- </include>
- <exclude>
- <directory>../src/PHPDraft/Core/</directory>
- <directory>../src/PHPDraft/In/Tests/</directory>
- <directory>../src/PHPDraft/Model/Tests/</directory>
- <directory>../src/PHPDraft/Model/Elements/Tests/</directory>
- <directory>../src/PHPDraft/Out/Tests/</directory>
- <directory>../src/PHPDraft/Out/HTML/</directory>
- <directory>../src/PHPDraft/Parse/Tests/</directory>
- <file>../src/PHPDraft/Model/Comparable.php</file>
- <file>../src/PHPDraft/Model/Elements/StructureElement.php</file>
- <file>../src/PHPDraft/Out/Minifier.php</file>
- <file>../src/PHPDraft/Parse/ResourceException.php</file>
- <file>../src/PHPDraft/**Exception.php</file>
- </exclude>
- <report>
- <clover outputFile="../build/logs/clover.xml"/>
- <html outputDirectory="../build/coverage" lowUpperBound="35" highLowerBound="70"/>
- </report>
- </coverage>
- <logging>
- <junit outputFile="../build/logs/junit.xml"/>
- </logging>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.2/phpunit.xsd" bootstrap="test.bootstrap.inc.php" backupGlobals="false" colors="true" cacheDirectory=".phpunit.cache" backupStaticProperties="false" requireCoverageMetadata="true">
+ <php>
+ <ini name="zend.enable_gc" value="1"/>
+ </php>
+ <testsuites>
+ <testsuite name="In">
+ <directory>../src/PHPDraft/In/Tests/</directory>
+ </testsuite>
+ <testsuite name="Model">
+ <directory>../src/PHPDraft/Model/Tests/</directory>
+ <directory>../src/PHPDraft/Model/Elements/Tests/</directory>
+ </testsuite>
+ <testsuite name="Out">
+ <directory>../src/PHPDraft/Out/Tests/</directory>
+ </testsuite>
+ <testsuite name="Parse">
+ <directory>../src/PHPDraft/Parse/Tests/</directory>
+ </testsuite>
+ </testsuites>
+ <coverage>
+ <report>
+ <clover outputFile="../build/logs/clover.xml"/>
+ <html outputDirectory="../build/coverage" lowUpperBound="35" highLowerBound="70"/>
+ </report>
+ </coverage>
+ <logging>
+ <junit outputFile="../build/logs/junit.xml"/>
+ </logging>
+ <source>
+ <include>
+ <directory>../src/PHPDraft/</directory>
+ </include>
+ <exclude>
+ <directory>../src/PHPDraft/Core/</directory>
+ <directory>../src/PHPDraft/In/Tests/</directory>
+ <directory>../src/PHPDraft/Model/Tests/</directory>
+ <directory>../src/PHPDraft/Model/Elements/Tests/</directory>
+ <directory>../src/PHPDraft/Out/Tests/</directory>
+ <directory>../src/PHPDraft/Out/HTML/</directory>
+ <directory>../src/PHPDraft/Parse/Tests/</directory>
+ <file>../src/PHPDraft/Model/Comparable.php</file>
+ <file>../src/PHPDraft/Model/Elements/StructureElement.php</file>
+ <file>../src/PHPDraft/Out/Minifier.php</file>
+ <file>../src/PHPDraft/Parse/ResourceException.php</file>
+ <file>../src/PHPDraft/**Exception.php</file>
+ </exclude>
+ </source>
 </phpunit>
diff --git a/tests/statics/drafter/index.apib b/tests/statics/drafter/index.apib