From f4deb2f65368466f89ce56205688b70cd54209bc Mon Sep 17 00:00:00 2001 From: Sean Molenaar Date: Mon, 17 Jul 2023 09:39:26 +0200 Subject: [PATCH] chore: fix PHPUnit 10 compat --- .gitignore | 1 + composer.lock | 9 +- .../Tests/ArrayStructureElementTest.php | 2 +- .../Tests/BasicStructureElementTest.php | 4 +- .../Tests/EnumStructureElementTest.php | 2 +- .../Tests/ObjectStructureElementTest.php | 4 +- .../Elements/Tests/RequestBodyElementTest.php | 2 +- src/PHPDraft/Model/Tests/CategoryTest.php | 19 ++- ....php => HierarchyElementChildTestBase.php} | 22 +--- .../Model/Tests/ObjectElementTest.php | 23 +++- src/PHPDraft/Model/Tests/TransitionTest.php | 12 +- .../Out/Tests/TemplateRendererTest.php | 4 +- tests/phpunit.xml | 117 +++++++----------- tests/statics/drafter/index.apib | 0 14 files changed, 115 insertions(+), 106 deletions(-) rename src/PHPDraft/Model/Tests/{HierarchyElementChildTest.php => HierarchyElementChildTestBase.php} (50%) delete mode 100644 tests/statics/drafter/index.apib diff --git a/.gitignore b/.gitignore index 7f2e1c1f..fb051901 100644 --- 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 index 7950485d..e990a45b 100644 --- a/composer.lock +++ b/composer.lock @@ -717,12 +717,12 @@ "source": { "type": "git", "url": "https://github.com/lunr-php/lunr.halo.git", - "reference": "b7f450eae024ae815efcf109199766821d703bf0" + "reference": "13d4cdbad2109e4e74d7ddfc2a4181dd95505dcc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/lunr-php/lunr.halo/zipball/b7f450eae024ae815efcf109199766821d703bf0", - "reference": "b7f450eae024ae815efcf109199766821d703bf0", + "url": "https://api.github.com/repos/lunr-php/lunr.halo/zipball/13d4cdbad2109e4e74d7ddfc2a4181dd95505dcc", + "reference": "13d4cdbad2109e4e74d7ddfc2a4181dd95505dcc", "shasum": "" }, "require": { @@ -732,6 +732,7 @@ "require-dev": { "ext-xdebug": ">=3.0", "phpunit/phpunit": ">=9.0 <9.6", + "psr/container": ">=2.0.2", "psr/log": ">=1.1" }, "default-branch": true, @@ -756,7 +757,7 @@ "issues": "https://github.com/lunr-php/lunr.halo/issues", "source": "https://github.com/lunr-php/lunr.halo/tree/master" }, - "time": "2023-05-06T19:34:06+00:00" + "time": "2023-07-05T13:45:49+00:00" }, { "name": "myclabs/deep-copy", diff --git a/src/PHPDraft/Model/Elements/Tests/ArrayStructureElementTest.php b/src/PHPDraft/Model/Elements/Tests/ArrayStructureElementTest.php index c81d6ed7..bdaecf8e 100644 --- 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 index 56c4b6b3..b555cf67 100644 --- 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 index 1a9bb325..494d39ca 100644 --- 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 index 8feec1e0..631e42ed 100644 --- 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 index 42a69018..e2414295 100644 --- 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 index fb881b62..e1a958dd 100644 --- 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/src/PHPDraft/Model/Tests/HierarchyElementChildTest.php b/src/PHPDraft/Model/Tests/HierarchyElementChildTestBase.php similarity index 50% rename from src/PHPDraft/Model/Tests/HierarchyElementChildTest.php rename to src/PHPDraft/Model/Tests/HierarchyElementChildTestBase.php index 68f362d9..adb60ee4 100644 --- a/src/PHPDraft/Model/Tests/HierarchyElementChildTest.php +++ b/src/PHPDraft/Model/Tests/HierarchyElementChildTestBase.php @@ -1,7 +1,7 @@ @@ -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 index 90f57c64..fe15054c 100644 --- 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 index 7be196f0..bafd8688 100644 --- 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 index 40201943..72863cad 100644 --- 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> */ - 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> */ - public function requestMethodProvider(): array + public static function requestMethodProvider(): array { $return = []; diff --git a/tests/phpunit.xml b/tests/phpunit.xml index 6396d7e9..7ac9607c 100755 --- a/tests/phpunit.xml +++ b/tests/phpunit.xml @@ -1,72 +1,49 @@ - - - - - - - ../src/PHPDraft/Parse/Tests/BaseParserTest.php - ../src/PHPDraft/Parse/Tests/DrafterTest.php - ../src/PHPDraft/Parse/Tests/DrafterAPITest.php - ../src/PHPDraft/Parse/Tests/HtmlGeneratorTest.php - ../src/PHPDraft/Parse/Tests/BaseHtmlGeneratorTest.php - ../src/PHPDraft/Parse/Tests/ParserFactoryTest.php - - - ../src/PHPDraft/Model/Tests/CategoryTest.php - ../src/PHPDraft/Model/Tests/HierarchyElementTest.php - ../src/PHPDraft/Model/Tests/HTTPRequestTest.php - ../src/PHPDraft/Model/Tests/HTTPResponseTest.php - ../src/PHPDraft/Model/Tests/ResourceTest.php - ../src/PHPDraft/Model/Tests/TransitionTest.php - ../src/PHPDraft/Model/Elements/Tests/BasicStructureElementTest.php - ../src/PHPDraft/Model/Elements/Tests/EnumStructureElementTest.php - ../src/PHPDraft/Model/Elements/Tests/ObjectStructureElementTest.php - ../src/PHPDraft/Model/Elements/Tests/ArrayStructureElementTest.php - ../src/PHPDraft/Model/Elements/Tests/RequestBodyElementTest.php - ../src/PHPDraft/Model/Elements/Tests/ElementStructureElementTest.php - - - ../src/PHPDraft/In/Tests/ApibFileParserTest.php - - - ../src/PHPDraft/Out/Tests/VersionTest.php - ../src/PHPDraft/Out/Tests/SortingTest.php - ../src/PHPDraft/Out/Tests/TemplateRendererTest.php - ../src/PHPDraft/Out/Tests/TwigFactoryTest.php - - - - - ../src/PHPDraft/ - - - ../src/PHPDraft/Core/ - ../src/PHPDraft/In/Tests/ - ../src/PHPDraft/Model/Tests/ - ../src/PHPDraft/Model/Elements/Tests/ - ../src/PHPDraft/Out/Tests/ - ../src/PHPDraft/Out/HTML/ - ../src/PHPDraft/Parse/Tests/ - ../src/PHPDraft/Model/Comparable.php - ../src/PHPDraft/Model/Elements/StructureElement.php - ../src/PHPDraft/Out/Minifier.php - ../src/PHPDraft/Parse/ResourceException.php - ../src/PHPDraft/**Exception.php - - - - - - - - - + + + + + + + ../src/PHPDraft/In/Tests/ + + + ../src/PHPDraft/Model/Tests/ + ../src/PHPDraft/Model/Elements/Tests/ + + + ../src/PHPDraft/Out/Tests/ + + + ../src/PHPDraft/Parse/Tests/ + + + + + + + + + + + + + + ../src/PHPDraft/ + + + ../src/PHPDraft/Core/ + ../src/PHPDraft/In/Tests/ + ../src/PHPDraft/Model/Tests/ + ../src/PHPDraft/Model/Elements/Tests/ + ../src/PHPDraft/Out/Tests/ + ../src/PHPDraft/Out/HTML/ + ../src/PHPDraft/Parse/Tests/ + ../src/PHPDraft/Model/Comparable.php + ../src/PHPDraft/Model/Elements/StructureElement.php + ../src/PHPDraft/Out/Minifier.php + ../src/PHPDraft/Parse/ResourceException.php + ../src/PHPDraft/**Exception.php + + diff --git a/tests/statics/drafter/index.apib b/tests/statics/drafter/index.apib deleted file mode 100644 index e69de29b..00000000