From bb9542973c5642c28d3ddb0906a3ec42120ae9e0 Mon Sep 17 00:00:00 2001 From: Sean Molenaar Date: Fri, 17 Jan 2020 16:42:30 +0800 Subject: [PATCH] PHPUnit 8 compatible --- composer.json | 2 +- composer.lock | 162 ++++++++++++------ src/PHPDraft/In/Tests/ApibFileParserTest.php | 9 +- .../Tests/ArrayStructureElementTest.php | 16 +- .../Tests/BasicStructureElementTest.php | 12 +- .../Tests/EnumStructureElementTest.php | 20 +-- .../Tests/ObjectStructureElementTest.php | 38 ++-- .../Elements/Tests/RequestBodyElementTest.php | 32 ++-- src/PHPDraft/Model/Tests/CategoryTest.php | 20 +-- src/PHPDraft/Model/Tests/HTTPRequestTest.php | 50 +++--- src/PHPDraft/Model/Tests/HTTPResponseTest.php | 30 ++-- .../Model/Tests/HierarchyElementChildTest.php | 12 +- .../Model/Tests/HierarchyElementTest.php | 20 +-- .../Model/Tests/ObjectElementTest.php | 16 +- src/PHPDraft/Model/Tests/ResourceTest.php | 16 +- src/PHPDraft/Model/Tests/TransitionTest.php | 2 +- .../Out/Tests/TemplateGeneratorTest.php | 2 +- src/PHPDraft/Out/Tests/VersionTest.php | 2 +- src/PHPDraft/Parse/Tests/BaseParserTest.php | 10 +- src/PHPDraft/Parse/Tests/DrafterAPITest.php | 9 +- src/PHPDraft/Parse/Tests/DrafterTest.php | 18 +- .../Parse/Tests/LegacyDrafterTest.php | 18 +- 22 files changed, 286 insertions(+), 230 deletions(-) diff --git a/composer.json b/composer.json index d69ead65..fe1d8dbd 100644 --- a/composer.json +++ b/composer.json @@ -28,7 +28,7 @@ }, "require-dev": { "lunr/halo": "dev-master", - "phpunit/phpunit": "~7.0", + "phpunit/phpunit": "~8.0", "theseer/autoload": "~1.0", "phing/phing": "~2.0" }, diff --git a/composer.lock b/composer.lock index 14ac4480..9f7b4af3 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "1c82156b83912aa4f019143072766ae1", + "content-hash": "2e89b6e78f801a1d094a1d92957c3ed8", "packages": [ { "name": "lukasoppermann/http-status", @@ -47,9 +47,9 @@ "authors": [ { "name": "Lukas Oppermann", + "role": "Developer", "email": "lukas@vea.re", - "homepage": "http://vea.re", - "role": "Developer" + "homepage": "http://vea.re" } ], "description": "A minimal package for working with HTTP statuses.", @@ -314,22 +314,22 @@ "source": { "type": "git", "url": "https://github.com/M2Mobi/lunr.halo.git", - "reference": "9cae64034ff09e6d94043264d30d733d60defc96" + "reference": "fdf80f3337f58b7da444294f64b55e9809ef842a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/M2Mobi/lunr.halo/zipball/9cae64034ff09e6d94043264d30d733d60defc96", - "reference": "9cae64034ff09e6d94043264d30d733d60defc96", + "url": "https://api.github.com/repos/M2Mobi/lunr.halo/zipball/fdf80f3337f58b7da444294f64b55e9809ef842a", + "reference": "fdf80f3337f58b7da444294f64b55e9809ef842a", "shasum": "" }, "require": { - "ext-uopz": ">=5.1", - "php": "7.*", + "ext-uopz": ">=6.1", + "php": "~7.2", "psr/log": "~1.1" }, "require-dev": { - "ext-xdebug": ">=2.4", - "phpunit/phpunit": "~7.0" + "ext-xdebug": ">=2.6", + "phpunit/phpunit": "~8.0" }, "type": "library", "autoload": { @@ -348,7 +348,7 @@ "phpunit", "unit tests" ], - "time": "2019-05-21T08:03:42+00:00" + "time": "2019-12-23T15:44:55+00:00" }, { "name": "myclabs/deep-copy", @@ -809,40 +809,40 @@ }, { "name": "phpunit/php-code-coverage", - "version": "6.1.4", + "version": "7.0.10", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "807e6013b00af69b6c5d9ceb4282d0393dbb9d8d" + "reference": "f1884187926fbb755a9aaf0b3836ad3165b478bf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/807e6013b00af69b6c5d9ceb4282d0393dbb9d8d", - "reference": "807e6013b00af69b6c5d9ceb4282d0393dbb9d8d", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/f1884187926fbb755a9aaf0b3836ad3165b478bf", + "reference": "f1884187926fbb755a9aaf0b3836ad3165b478bf", "shasum": "" }, "require": { "ext-dom": "*", "ext-xmlwriter": "*", - "php": "^7.1", - "phpunit/php-file-iterator": "^2.0", + "php": "^7.2", + "phpunit/php-file-iterator": "^2.0.2", "phpunit/php-text-template": "^1.2.1", - "phpunit/php-token-stream": "^3.0", + "phpunit/php-token-stream": "^3.1.1", "sebastian/code-unit-reverse-lookup": "^1.0.1", - "sebastian/environment": "^3.1 || ^4.0", + "sebastian/environment": "^4.2.2", "sebastian/version": "^2.0.1", - "theseer/tokenizer": "^1.1" + "theseer/tokenizer": "^1.1.3" }, "require-dev": { - "phpunit/phpunit": "^7.0" + "phpunit/phpunit": "^8.2.2" }, "suggest": { - "ext-xdebug": "^2.6.0" + "ext-xdebug": "^2.7.2" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "6.1-dev" + "dev-master": "7.0-dev" } }, "autoload": { @@ -868,7 +868,7 @@ "testing", "xunit" ], - "time": "2018-10-31T16:06:48+00:00" + "time": "2019-11-20T13:55:58+00:00" }, { "name": "phpunit/php-file-iterator", @@ -1061,53 +1061,52 @@ }, { "name": "phpunit/phpunit", - "version": "7.5.20", + "version": "8.5.2", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "9467db479d1b0487c99733bb1e7944d32deded2c" + "reference": "018b6ac3c8ab20916db85fa91bf6465acb64d1e0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/9467db479d1b0487c99733bb1e7944d32deded2c", - "reference": "9467db479d1b0487c99733bb1e7944d32deded2c", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/018b6ac3c8ab20916db85fa91bf6465acb64d1e0", + "reference": "018b6ac3c8ab20916db85fa91bf6465acb64d1e0", "shasum": "" }, "require": { - "doctrine/instantiator": "^1.1", + "doctrine/instantiator": "^1.2.0", "ext-dom": "*", "ext-json": "*", "ext-libxml": "*", "ext-mbstring": "*", "ext-xml": "*", - "myclabs/deep-copy": "^1.7", - "phar-io/manifest": "^1.0.2", - "phar-io/version": "^2.0", - "php": "^7.1", - "phpspec/prophecy": "^1.7", - "phpunit/php-code-coverage": "^6.0.7", - "phpunit/php-file-iterator": "^2.0.1", + "ext-xmlwriter": "*", + "myclabs/deep-copy": "^1.9.1", + "phar-io/manifest": "^1.0.3", + "phar-io/version": "^2.0.1", + "php": "^7.2", + "phpspec/prophecy": "^1.8.1", + "phpunit/php-code-coverage": "^7.0.7", + "phpunit/php-file-iterator": "^2.0.2", "phpunit/php-text-template": "^1.2.1", - "phpunit/php-timer": "^2.1", - "sebastian/comparator": "^3.0", - "sebastian/diff": "^3.0", - "sebastian/environment": "^4.0", - "sebastian/exporter": "^3.1", - "sebastian/global-state": "^2.0", + "phpunit/php-timer": "^2.1.2", + "sebastian/comparator": "^3.0.2", + "sebastian/diff": "^3.0.2", + "sebastian/environment": "^4.2.2", + "sebastian/exporter": "^3.1.1", + "sebastian/global-state": "^3.0.0", "sebastian/object-enumerator": "^3.0.3", - "sebastian/resource-operations": "^2.0", + "sebastian/resource-operations": "^2.0.1", + "sebastian/type": "^1.1.3", "sebastian/version": "^2.0.1" }, - "conflict": { - "phpunit/phpunit-mock-objects": "*" - }, "require-dev": { "ext-pdo": "*" }, "suggest": { "ext-soap": "*", "ext-xdebug": "*", - "phpunit/php-invoker": "^2.0" + "phpunit/php-invoker": "^2.0.0" }, "bin": [ "phpunit" @@ -1115,7 +1114,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "7.5-dev" + "dev-master": "8.5-dev" } }, "autoload": { @@ -1141,7 +1140,7 @@ "testing", "xunit" ], - "time": "2020-01-08T08:45:45+00:00" + "time": "2020-01-08T08:49:49+00:00" }, { "name": "sebastian/code-unit-reverse-lookup", @@ -1430,23 +1429,26 @@ }, { "name": "sebastian/global-state", - "version": "2.0.0", + "version": "3.0.0", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/global-state.git", - "reference": "e8ba02eed7bbbb9e59e43dedd3dddeff4a56b0c4" + "reference": "edf8a461cf1d4005f19fb0b6b8b95a9f7fa0adc4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/e8ba02eed7bbbb9e59e43dedd3dddeff4a56b0c4", - "reference": "e8ba02eed7bbbb9e59e43dedd3dddeff4a56b0c4", + "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/edf8a461cf1d4005f19fb0b6b8b95a9f7fa0adc4", + "reference": "edf8a461cf1d4005f19fb0b6b8b95a9f7fa0adc4", "shasum": "" }, "require": { - "php": "^7.0" + "php": "^7.2", + "sebastian/object-reflector": "^1.1.1", + "sebastian/recursion-context": "^3.0" }, "require-dev": { - "phpunit/phpunit": "^6.0" + "ext-dom": "*", + "phpunit/phpunit": "^8.0" }, "suggest": { "ext-uopz": "*" @@ -1454,7 +1456,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.0-dev" + "dev-master": "3.0-dev" } }, "autoload": { @@ -1477,7 +1479,7 @@ "keywords": [ "global state" ], - "time": "2017-04-27T15:39:26+00:00" + "time": "2019-02-01T05:30:01+00:00" }, { "name": "sebastian/object-enumerator", @@ -1666,6 +1668,52 @@ "homepage": "https://www.github.com/sebastianbergmann/resource-operations", "time": "2018-10-04T04:07:39+00:00" }, + { + "name": "sebastian/type", + "version": "1.1.3", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/type.git", + "reference": "3aaaa15fa71d27650d62a948be022fe3b48541a3" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/3aaaa15fa71d27650d62a948be022fe3b48541a3", + "reference": "3aaaa15fa71d27650d62a948be022fe3b48541a3", + "shasum": "" + }, + "require": { + "php": "^7.2" + }, + "require-dev": { + "phpunit/phpunit": "^8.2" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.1-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "Collection of value objects that represent the types of the PHP type system", + "homepage": "https://github.com/sebastianbergmann/type", + "time": "2019-07-02T08:10:15+00:00" + }, { "name": "sebastian/version", "version": "2.0.1", diff --git a/src/PHPDraft/In/Tests/ApibFileParserTest.php b/src/PHPDraft/In/Tests/ApibFileParserTest.php index c1497885..6308d8bc 100644 --- a/src/PHPDraft/In/Tests/ApibFileParserTest.php +++ b/src/PHPDraft/In/Tests/ApibFileParserTest.php @@ -54,14 +54,15 @@ public function testFilenameSetup(): void /** * Test if exception when the file doesn't exist - * @expectedException \PHPDraft\Parse\ExecutionException - * @expectedExceptionCode 1 - * @expectedExceptionMessageRegExp "API File not found: [\w\W]*\/drafter\/non_existing_including_apib" * * @return void */ public function testFilenameSetupWrong(): void { + $this->expectException('\PHPDraft\Parse\ExecutionException'); + $this->expectExceptionMessageMatches('/API File not found: .*\/drafter\/non_existing_including_apib/'); + $this->expectExceptionCode(1); + $property = $this->reflection->getProperty('filename'); $property->setAccessible(true); $property->setValue($this->class, TEST_STATICS . '/drafter/non_existing_including_apib'); @@ -96,4 +97,4 @@ public function testParseBasic(): void $this->assertSame($text, $this->class->__toString()); } -} \ No newline at end of file +} diff --git a/src/PHPDraft/Model/Elements/Tests/ArrayStructureElementTest.php b/src/PHPDraft/Model/Elements/Tests/ArrayStructureElementTest.php index ff5ae1fb..2e366e0b 100644 --- a/src/PHPDraft/Model/Elements/Tests/ArrayStructureElementTest.php +++ b/src/PHPDraft/Model/Elements/Tests/ArrayStructureElementTest.php @@ -22,7 +22,7 @@ class ArrayStructureElementTest extends LunrBaseTest * Set up tests * @return void */ - public function setUp() + public function setUp(): void { $this->class = new ArrayStructureElement(); $this->reflection = new \ReflectionClass('PHPDraft\Model\Elements\ArrayStructureElement'); @@ -50,7 +50,7 @@ public function testSuccesfulParse($object, $expected) * * @return array */ - public function parseObjectProvider() + public function parseObjectProvider(): array { $return = []; $base1 = new ArrayStructureElement(); @@ -163,7 +163,7 @@ public function parseObjectProvider() /** * Test setup of new instances */ - public function testNewInstance() + public function testNewInstance(): void { $method = $this->reflection->getMethod('new_instance'); $method->setAccessible(TRUE); @@ -174,7 +174,7 @@ public function testNewInstance() /** * Test setup of new instances */ - public function testToString() + public function testToString(): void { $return = $this->class->__toString(); $this->assertSame('[ ]', $return); @@ -183,7 +183,7 @@ public function testToString() /** * Test setup of new instances */ - public function testToStringWithArray() + public function testToStringWithArray(): void { $this->class->value = ['string', 'int']; $return = $this->class->__toString(); @@ -193,7 +193,7 @@ public function testToStringWithArray() /** * Test setup of new instances */ - public function testToStringWithString() + public function testToStringWithString(): void { $this->class->value = 'hello'; $return = $this->class->__toString(); @@ -203,10 +203,10 @@ public function testToStringWithString() /** * Test setup of new instances */ - public function testToStringWithComplexArray() + public function testToStringWithComplexArray(): void { $this->class->value = ['Bike', 'car']; $return = $this->class->__toString(); $this->assertSame('', $return); } -} \ No newline at end of file +} diff --git a/src/PHPDraft/Model/Elements/Tests/BasicStructureElementTest.php b/src/PHPDraft/Model/Elements/Tests/BasicStructureElementTest.php index 2b0b5621..879d6cfb 100644 --- a/src/PHPDraft/Model/Elements/Tests/BasicStructureElementTest.php +++ b/src/PHPDraft/Model/Elements/Tests/BasicStructureElementTest.php @@ -38,7 +38,7 @@ public function setUp(): void /** * Test if the value the class is initialized with is correct */ - public function testSetupCorrectly() + public function testSetupCorrectly(): void { $property = $this->reflection->getProperty('element'); $property->setAccessible(TRUE); @@ -48,7 +48,7 @@ public function testSetupCorrectly() /** * Test if the value the class is initialized with is correct */ - public function testDescriptionAsHTML() + public function testDescriptionAsHTML(): void { $property = $this->reflection->getProperty('description'); $property->setAccessible(TRUE); @@ -80,7 +80,7 @@ public function testStringValue($value, $string_value) $this->assertSame($string_value, $return); } - public function stringValueProvider() + public function stringValueProvider(): array { $return = []; @@ -99,7 +99,7 @@ public function stringValueProvider() /** * Test if the value the class is initialized with is correct */ - public function testParseCommonDeps() + public function testParseCommonDeps(): void { $dep = []; @@ -143,7 +143,7 @@ public function testParseCommon($value, $expected_value) $this->assertEquals([], $dep); } - public function parseValueProvider() + public function parseValueProvider(): array { $return = []; @@ -171,4 +171,4 @@ public function parseValueProvider() return $return; } -} \ No newline at end of file +} diff --git a/src/PHPDraft/Model/Elements/Tests/EnumStructureElementTest.php b/src/PHPDraft/Model/Elements/Tests/EnumStructureElementTest.php index 2b3c49de..29f1c90a 100644 --- a/src/PHPDraft/Model/Elements/Tests/EnumStructureElementTest.php +++ b/src/PHPDraft/Model/Elements/Tests/EnumStructureElementTest.php @@ -21,7 +21,7 @@ class EnumStructureElementTest extends LunrBaseTest * Set up tests * @return void */ - public function setUp() + public function setUp(): void { $this->class = new EnumStructureElement(); $this->reflection = new \ReflectionClass('PHPDraft\Model\Elements\EnumStructureElement'); @@ -30,7 +30,7 @@ public function setUp() /** * Test if the value the class is initialized with is correct */ - public function testSetupCorrectly() + public function testSetupCorrectly(): void { $property = $this->reflection->getProperty('element'); $property->setAccessible(TRUE); @@ -40,7 +40,7 @@ public function testSetupCorrectly() /** * Test setup of new instances */ - public function testNewInstance() + public function testNewInstance(): void { $method = $this->reflection->getMethod('new_instance'); $method->setAccessible(TRUE); @@ -51,7 +51,7 @@ public function testNewInstance() /** * Test setup of new instances */ - public function testToString() + public function testToString(): void { $return = $this->class->__toString(); $this->assertSame('//list of options', $return); @@ -60,7 +60,7 @@ public function testToString() /** * Test setup of new instances */ - public function testToStringWithArray() + public function testToStringWithArray(): void { $this->class->value = ['hello'=>'string', 'test'=>'int']; $return = $this->class->__toString(); @@ -70,7 +70,7 @@ public function testToStringWithArray() /** * Test setup of new instances */ - public function testToStringWithString() + public function testToStringWithString(): void { $this->class->value = 'hello'; $this->class->key = 'key'; @@ -82,7 +82,7 @@ public function testToStringWithString() /** * Test setup of new instances */ - public function testToStringWithStringComplex() + public function testToStringWithStringComplex(): void { $this->class->value = 'hello'; $this->class->key = 'key'; @@ -94,7 +94,7 @@ public function testToStringWithStringComplex() /** * Test setup of new instances */ - public function testToStringWithComplexArray() + public function testToStringWithComplexArray(): void { $this->class->value = ['hello'=>'bike', 'test'=>'Car']; $return = $this->class->__toString(); @@ -123,7 +123,7 @@ public function testSuccesfulParse($object, $expected) * * @return array */ - public function parseObjectProvider() + public function parseObjectProvider(): array { $return = []; $base1 = new EnumStructureElement(); @@ -234,4 +234,4 @@ public function parseObjectProvider() return $return; } -} \ No newline at end of file +} diff --git a/src/PHPDraft/Model/Elements/Tests/ObjectStructureElementTest.php b/src/PHPDraft/Model/Elements/Tests/ObjectStructureElementTest.php index 6b736bb6..fcd088ff 100644 --- a/src/PHPDraft/Model/Elements/Tests/ObjectStructureElementTest.php +++ b/src/PHPDraft/Model/Elements/Tests/ObjectStructureElementTest.php @@ -27,7 +27,7 @@ class ObjectStructureElementTest extends LunrBaseTest * * @return void */ - public function setUp() + public function setUp(): void { $this->class = new ObjectStructureElement(); $this->reflection = new ReflectionClass('PHPDraft\Model\Elements\ObjectStructureElement'); @@ -36,7 +36,7 @@ public function setUp() /** * Test the setup of new instances */ - public function testNewInstance() + public function testNewInstance(): void { $method = $this->reflection->getMethod('new_instance'); $method->setAccessible(TRUE); @@ -69,7 +69,7 @@ public function testSuccesfulParse($object, $expected) * * @return array */ - public function parseObjectProvider() + public function parseObjectProvider(): array { $return = []; $base1 = new ObjectStructureElement(); @@ -189,7 +189,7 @@ public function parseObjectProvider() /** * Test the setup of new instances */ - public function testEmptyParse() + public function testEmptyParse(): void { $deps = []; $return = $this->class->parse(NULL, $deps); @@ -203,7 +203,7 @@ public function testEmptyParse() /** * Test the setup of new instances */ - public function testArrayContentEnumContentParse() + public function testArrayContentEnumContentParse(): void { $deps = []; $object = '{"element":"enum","content": [{"content":{"key":{"content":"key"},"value":{"element":"value"}}}]}'; @@ -219,7 +219,7 @@ public function testArrayContentEnumContentParse() /** * Test the setup of new instances */ - public function testArrayContentObjectContentParse() + public function testArrayContentObjectContentParse(): void { $deps = []; $object = '{"element":"object","content": [[]]}'; @@ -235,7 +235,7 @@ public function testArrayContentObjectContentParse() /** * Test the setup of new instances */ - public function testValueStructureEnumContentParse() + public function testValueStructureEnumContentParse(): void { $deps = []; $object = '{"element":"enum","content": {"key":{"content":"key"},"value":{"element":"enum"}}}'; @@ -248,7 +248,7 @@ public function testValueStructureEnumContentParse() /** * Test the setup of new instances */ - public function testValueStructureArrayContentParse() + public function testValueStructureArrayContentParse(): void { $deps = []; $object = '{"element":"enum","content": {"key":{"content":"key"},"value":{"element":"array"}}}'; @@ -261,7 +261,7 @@ public function testValueStructureArrayContentParse() /** * Test the setup of new instances */ - public function testValueStructureObjectContentParse() + public function testValueStructureObjectContentParse(): void { $deps = []; $object = '{"element":"enum","content": {"key":{"content":"key"},"value":{"element":"object"}}}'; @@ -274,7 +274,7 @@ public function testValueStructureObjectContentParse() /** * Test the setup of new instances */ - public function testValueStructureObjectContentParseContent() + public function testValueStructureObjectContentParseContent(): void { $deps = []; $object = '{"element":"enum","content": {"key":{"content":"key"},"value":{"element":"object", "content":{}}}}'; @@ -287,7 +287,7 @@ public function testValueStructureObjectContentParseContent() /** * Test the setup of new instances */ - public function testToStringBasic() + public function testToStringBasic(): void { $return = $this->class->__toString(); $this->assertSame('{ }', $return); @@ -296,7 +296,7 @@ public function testToStringBasic() /** * Test the setup of new instances */ - public function testToStringArray() + public function testToStringArray(): void { $this->class->value = ['hello']; $return = $this->class->__toString(); @@ -310,7 +310,7 @@ public function testToStringArray() /** * Test the setup of new instances */ - public function testToStringNullValue() + public function testToStringNullValue(): void { $this->class->key = 'hello'; $return = $this->class->__toString(); @@ -320,7 +320,7 @@ public function testToStringNullValue() /** * Test the setup of new instances */ - public function testToStringObjectValue() + public function testToStringObjectValue(): void { $this->class->key = 'hello'; $this->class->value = new ObjectStructureElement(); @@ -331,7 +331,7 @@ public function testToStringObjectValue() /** * Test the setup of new instances */ - public function testToStringArrayValue() + public function testToStringArrayValue(): void { $this->class->key = 'hello'; $this->class->value = new ArrayStructureElement(); @@ -342,7 +342,7 @@ public function testToStringArrayValue() /** * Test the setup of new instances */ - public function testToStringEnumValue() + public function testToStringEnumValue(): void { $this->class->key = 'hello'; $this->class->value = new EnumStructureElement(); @@ -353,7 +353,7 @@ public function testToStringEnumValue() /** * Test the setup of new instances */ - public function testToStringBoolValue() + public function testToStringBoolValue(): void { $this->class->key = 'hello'; $this->class->value = TRUE; @@ -364,7 +364,7 @@ public function testToStringBoolValue() /** * Test the setup of new instances */ - public function testToStringOtherValue() + public function testToStringOtherValue(): void { $this->class->key = 'hello'; $this->class->value = 'world'; @@ -375,7 +375,7 @@ public function testToStringOtherValue() /** * Test the setup of new instances */ - public function testToStringOtherValueTypeKnown() + public function testToStringOtherValueTypeKnown(): void { $this->class->type = 'string'; $this->class->key = 'hello'; diff --git a/src/PHPDraft/Model/Elements/Tests/RequestBodyElementTest.php b/src/PHPDraft/Model/Elements/Tests/RequestBodyElementTest.php index 25538b87..1894fab6 100644 --- a/src/PHPDraft/Model/Elements/Tests/RequestBodyElementTest.php +++ b/src/PHPDraft/Model/Elements/Tests/RequestBodyElementTest.php @@ -25,7 +25,7 @@ class RequestBodyElementTest extends LunrBaseTest * Set up tests * @return void */ - public function setUp() + public function setUp(): void { $this->class = new RequestBodyElement(); $this->reflection = new \ReflectionClass('PHPDraft\Model\Elements\RequestBodyElement'); @@ -34,7 +34,7 @@ public function setUp() /** * Test if the value the class is initialized with is correct */ - public function testSetupCorrectly() + public function testSetupCorrectly(): void { $property = $this->reflection->getProperty('element'); $property->setAccessible(TRUE); @@ -44,7 +44,7 @@ public function testSetupCorrectly() /** * Test setup of new instances */ - public function testNewInstance() + public function testNewInstance(): void { $method = $this->reflection->getMethod('new_instance'); $method->setAccessible(TRUE); @@ -55,7 +55,7 @@ public function testNewInstance() /** * Test setup of new instances */ - public function testPrintBasic() + public function testPrintBasic(): void { $this->class->key = 'key'; $return = $this->class->print_request(); @@ -65,7 +65,7 @@ public function testPrintBasic() /** * Test setup of new instances */ - public function testPrintBasicArray() + public function testPrintBasicArray(): void { $this->class->key = 'key'; $this->class->value = 'value'; @@ -79,7 +79,7 @@ public function testPrintBasicArray() /** * Test setup of new instances */ - public function testPrintJson() + public function testPrintJson(): void { $this->class->key = 'key'; $return = $this->class->print_request('application/json'); @@ -89,7 +89,7 @@ public function testPrintJson() /** * Test setup of new instances */ - public function testPrintJsonArray() + public function testPrintJsonArray(): void { $this->class->key = 'key'; $this->class->value = 'value'; @@ -125,7 +125,7 @@ public function testSuccesfulParse($object, $expected) * * @return array */ - public function parseObjectProvider() + public function parseObjectProvider(): array { $return = []; $base1 = new RequestBodyElement(); @@ -245,7 +245,7 @@ public function parseObjectProvider() /** * Test the setup of new instances */ - public function testEmptyParse() + public function testEmptyParse(): void { $deps = []; $return = $this->class->parse(NULL, $deps); @@ -259,7 +259,7 @@ public function testEmptyParse() /** * Test the setup of new instances */ - public function testArrayContentEnumContentParse() + public function testArrayContentEnumContentParse(): void { $deps = []; $object = '{"element":"enum","content": [{"content":{"key":{"content":"key"},"value":{"element":"value"}}}]}'; @@ -275,7 +275,7 @@ public function testArrayContentEnumContentParse() /** * Test the setup of new instances */ - public function testArrayContentObjectContentParse() + public function testArrayContentObjectContentParse(): void { $deps = []; $object = '{"element":"object","content": [[]]}'; @@ -291,7 +291,7 @@ public function testArrayContentObjectContentParse() /** * Test the setup of new instances */ - public function testValueStructureEnumContentParse() + public function testValueStructureEnumContentParse(): void { $deps = []; $object = '{"element":"enum","content": {"key":{"content":"key"},"value":{"element":"enum"}}}'; @@ -304,7 +304,7 @@ public function testValueStructureEnumContentParse() /** * Test the setup of new instances */ - public function testValueStructureArrayContentParse() + public function testValueStructureArrayContentParse(): void { $deps = []; $object = '{"element":"enum","content": {"key":{"content":"key"},"value":{"element":"array"}}}'; @@ -317,7 +317,7 @@ public function testValueStructureArrayContentParse() /** * Test the setup of new instances */ - public function testValueStructureObjectContentParse() + public function testValueStructureObjectContentParse(): void { $deps = []; $object = '{"element":"enum","content": {"key":{"content":"key"},"value":{"element":"object"}}}'; @@ -330,7 +330,7 @@ public function testValueStructureObjectContentParse() /** * Test the setup of new instances */ - public function testValueStructureObjectContentParseContent() + public function testValueStructureObjectContentParseContent(): void { $deps = []; $object = '{"element":"enum","content": {"key":{"content":"key"},"value":{"element":"object", "content":{}}}}'; @@ -339,4 +339,4 @@ public function testValueStructureObjectContentParseContent() $this->assertInstanceOf(ObjectStructureElement::class, $return); $this->assertInstanceOf(ObjectStructureElement::class, $return->value); } -} \ No newline at end of file +} diff --git a/src/PHPDraft/Model/Tests/CategoryTest.php b/src/PHPDraft/Model/Tests/CategoryTest.php index c6f3eeeb..7b0be83d 100644 --- a/src/PHPDraft/Model/Tests/CategoryTest.php +++ b/src/PHPDraft/Model/Tests/CategoryTest.php @@ -20,7 +20,7 @@ class CategoryTest extends HierarchyElementChildTest /** * Set up */ - public function setUp() + public function setUp(): void { parent::setUp(); $this->class = new Category(); @@ -30,7 +30,7 @@ public function setUp() /** * Tear down */ - public function tearDown() + public function tearDown(): void { unset($this->class); unset($this->parent); @@ -40,7 +40,7 @@ public function tearDown() /** * Test if the value the class is initialized with is correct */ - public function testStructuresSetup() + public function testStructuresSetup(): void { $this->assertSame([], $this->class->structures); } @@ -48,7 +48,7 @@ public function testStructuresSetup() /** * Test basic parse functions */ - public function testParseIsCalled() + public function testParseIsCalled(): void { $property = $this->reflection->getProperty('parent'); $property->setAccessible(TRUE); @@ -65,7 +65,7 @@ public function testParseIsCalled() /** * Test basic parse functions where 'element=resource' */ - public function testParseIsCalledResource() + public function testParseIsCalledResource(): void { $property = $this->reflection->getProperty('parent'); $property->setAccessible(TRUE); @@ -85,7 +85,7 @@ public function testParseIsCalledResource() /** * Test basic parse functions where 'element=dataStructure' */ - public function testParseIsCalledObject() + public function testParseIsCalledObject(): void { $property = $this->reflection->getProperty('parent'); $property->setAccessible(TRUE); @@ -105,7 +105,7 @@ public function testParseIsCalledObject() /** * Test basic parse functions where 'element=dataStructure' */ - public function testParseIsCalledObjectMetaID() + public function testParseIsCalledObjectMetaID(): void { $property = $this->reflection->getProperty('parent'); $property->setAccessible(TRUE); @@ -125,7 +125,7 @@ public function testParseIsCalledObjectMetaID() /** * Test basic parse functions where 'element=henk' */ - public function testParseIsCalledDef() + public function testParseIsCalledDef(): void { $property = $this->reflection->getProperty('parent'); $property->setAccessible(TRUE); @@ -149,7 +149,7 @@ public function testParseIsCalledDef() /** * Test basic get_href */ - public function testGetHrefIsCalledWithParent() + public function testGetHrefIsCalledWithParent(): void { $property = $this->reflection->getProperty('parent'); $property->setAccessible(TRUE); @@ -163,4 +163,4 @@ public function testGetHrefIsCalledWithParent() $this->assertSame($result, 'hello-'); } -} \ No newline at end of file +} diff --git a/src/PHPDraft/Model/Tests/HTTPRequestTest.php b/src/PHPDraft/Model/Tests/HTTPRequestTest.php index 4f74b4c9..c4370e8f 100644 --- a/src/PHPDraft/Model/Tests/HTTPRequestTest.php +++ b/src/PHPDraft/Model/Tests/HTTPRequestTest.php @@ -29,7 +29,7 @@ class HTTPRequestTest extends LunrBaseTest /** * Set up */ - public function setUp() + public function setUp(): void { $parent = $this->createMock('\PHPDraft\Model\Transition'); @@ -45,7 +45,7 @@ public function setUp() /** * Tear down */ - public function tearDown() + public function tearDown(): void { unset($this->class); unset($this->reflection); @@ -54,7 +54,7 @@ public function tearDown() /** * Test if the value the class is initialized with is correct */ - public function testSetupCorrectly() + public function testSetupCorrectly(): void { $this->assertIsObject($this->get_reflection_property_value('parent')); $this->assertEquals('a9b7ba70783b617e9998dc4dd82eb3c5', $this->get_reflection_property_value('id')); @@ -63,7 +63,7 @@ public function testSetupCorrectly() /** * Tests if get_id returns the correct ID. */ - public function testGetId() + public function testGetId(): void { $this->assertSame('a9b7ba70783b617e9998dc4dd82eb3c5', $this->class->get_id()); } @@ -71,7 +71,7 @@ public function testGetId() /** * Test basic is_equal_to functions */ - public function testEqualOnStatusCode() + public function testEqualOnStatusCode(): void { $property = $this->reflection->getProperty('method'); $property->setAccessible(TRUE); @@ -87,7 +87,7 @@ public function testEqualOnStatusCode() /** * Test basic is_equal_to functions */ - public function testEqualOnDesc() + public function testEqualOnDesc(): void { $property = $this->reflection->getProperty('body'); $property->setAccessible(TRUE); @@ -103,7 +103,7 @@ public function testEqualOnDesc() /** * Test basic is_equal_to functions */ - public function testEqualOnHeaders() + public function testEqualOnHeaders(): void { $property = $this->reflection->getProperty('headers'); $property->setAccessible(TRUE); @@ -119,7 +119,7 @@ public function testEqualOnHeaders() /** * Test basic is_equal_to functions */ - public function testEqualOnBoth() + public function testEqualOnBoth(): void { $s_property = $this->reflection->getProperty('method'); $s_property->setAccessible(TRUE); @@ -139,7 +139,7 @@ public function testEqualOnBoth() /** * Test basic get_curl_command functions */ - public function testGetCurlCommandNoKey() + public function testGetCurlCommandNoKey(): void { $property = $this->reflection->getProperty('parent'); $property->setAccessible(TRUE); @@ -153,7 +153,7 @@ public function testGetCurlCommandNoKey() /** * Test basic get_curl_command functions */ - public function testGetCurlCommandWithHeaders() + public function testGetCurlCommandWithHeaders(): void { $property = $this->reflection->getProperty('parent'); $property->setAccessible(TRUE); @@ -172,7 +172,7 @@ public function testGetCurlCommandWithHeaders() /** * Test basic get_hurl_link functions */ - public function testGetHurlWithHeaders() + public function testGetHurlWithHeaders(): void { $property = $this->reflection->getProperty('parent'); $property->setAccessible(TRUE); @@ -191,7 +191,7 @@ public function testGetHurlWithHeaders() /** * Test basic get_curl_command functions */ - public function testGetCurlCommandStringBody() + public function testGetCurlCommandStringBody(): void { $property = $this->reflection->getProperty('parent'); $property->setAccessible(TRUE); @@ -208,7 +208,7 @@ public function testGetCurlCommandStringBody() /** * Test basic get_hurl_link functions */ - public function testGetHurlStringBody() + public function testGetHurlStringBody(): void { $property = $this->reflection->getProperty('parent'); $property->setAccessible(TRUE); @@ -225,7 +225,7 @@ public function testGetHurlStringBody() /** * Test basic get_curl_command functions */ - public function testGetCurlCommandArrayBody() + public function testGetCurlCommandArrayBody(): void { $property = $this->reflection->getProperty('parent'); $property->setAccessible(TRUE); @@ -242,7 +242,7 @@ public function testGetCurlCommandArrayBody() /** * Test basic get_hurl_link functions */ - public function testGetHurlArrayBody() + public function testGetHurlArrayBody(): void { $property = $this->reflection->getProperty('parent'); $property->setAccessible(TRUE); @@ -259,7 +259,7 @@ public function testGetHurlArrayBody() /** * Test basic get_curl_command functions */ - public function testGetCurlCommandStructBodyFilled() + public function testGetCurlCommandStructBodyFilled(): void { $property = $this->reflection->getProperty('parent'); $property->setAccessible(TRUE); @@ -294,7 +294,7 @@ public function testGetCurlCommandStructBodyFilled() /** * Test basic get_hurl_link functions */ - public function testGetHurlStructBodyFilled() + public function testGetHurlStructBodyFilled(): void { $property = $this->reflection->getProperty('parent'); $property->setAccessible(TRUE); @@ -329,7 +329,7 @@ public function testGetHurlStructBodyFilled() /** * Test basic get_hurl_link functions */ - public function testGetHurlUrlArgs() + public function testGetHurlUrlArgs(): void { $property = $this->reflection->getProperty('parent'); $property->setAccessible(TRUE); @@ -352,7 +352,7 @@ public function testGetHurlUrlArgs() /** * Test basic parse functions */ - public function testParseIsCalled() + public function testParseIsCalled(): void { $property = $this->reflection->getProperty('parent'); $property->setAccessible(TRUE); @@ -372,7 +372,7 @@ public function testParseIsCalled() /** * Test basic parse functions */ - public function testParseIsCalledWithHeaders() + public function testParseIsCalledWithHeaders(): void { $property = $this->reflection->getProperty('parent'); $property->setAccessible(TRUE); @@ -392,7 +392,7 @@ public function testParseIsCalledWithHeaders() /** * Test basic parse functions */ - public function testParseIsCalledWithPOST() + public function testParseIsCalledWithPOST(): void { $property = $this->reflection->getProperty('parent'); $property->setAccessible(TRUE); @@ -416,7 +416,7 @@ public function testParseIsCalledWithPOST() /** * Test basic parse functions */ - public function testParseIsCalledWithPOSTCopy() + public function testParseIsCalledWithPOSTCopy(): void { $property = $this->reflection->getProperty('parent'); $property->setAccessible(TRUE); @@ -440,7 +440,7 @@ public function testParseIsCalledWithPOSTCopy() /** * Test basic parse functions */ - public function testParseIsCalledWithPOSTStruct() + public function testParseIsCalledWithPOSTStruct(): void { $property = $this->reflection->getProperty('parent'); $property->setAccessible(TRUE); @@ -460,7 +460,7 @@ public function testParseIsCalledWithPOSTStruct() /** * Test basic parse functions */ - public function testParseIsCalledWithPOSTAsset() + public function testParseIsCalledWithPOSTAsset(): void { $property = $this->reflection->getProperty('parent'); $property->setAccessible(TRUE); @@ -480,4 +480,4 @@ public function testParseIsCalledWithPOSTAsset() $header_property->setAccessible(TRUE); $this->assertSame(['Content-Type'=>''], $header_property->getValue($this->class)); } -} \ No newline at end of file +} diff --git a/src/PHPDraft/Model/Tests/HTTPResponseTest.php b/src/PHPDraft/Model/Tests/HTTPResponseTest.php index 3d749eb3..d195cfb3 100644 --- a/src/PHPDraft/Model/Tests/HTTPResponseTest.php +++ b/src/PHPDraft/Model/Tests/HTTPResponseTest.php @@ -38,7 +38,7 @@ class HTTPResponseTest extends LunrBaseTest /** * Set up */ - public function setUp() + public function setUp(): void { $this->parent_transition = $this->createMock('\PHPDraft\Model\Transition'); $this->parent = $this->getMockBuilder('\PHPDraft\Model\HierarchyElement') @@ -52,7 +52,7 @@ public function setUp() /** * Tear down */ - public function tearDown() + public function tearDown(): void { unset($this->class); unset($this->reflection); @@ -61,7 +61,7 @@ public function tearDown() /** * Test if the value the class is initialized with is correct */ - public function testSetupCorrectly() + public function testSetupCorrectly(): void { $this->assertSame($this->parent_transition, $this->get_reflection_property_value('parent')); $this->assertSame('a9b7ba70783b617e9998dc4dd82eb3c5', $this->get_reflection_property_value('id')); @@ -70,7 +70,7 @@ public function testSetupCorrectly() /** * Tests if get_id returns the correct ID. */ - public function testGetId() + public function testGetId(): void { $this->assertSame('a9b7ba70783b617e9998dc4dd82eb3c5', $this->class->get_id()); } @@ -78,7 +78,7 @@ public function testGetId() /** * Test basic parse functions */ - public function testParseIsCalled() + public function testParseIsCalled(): void { $property = $this->reflection->getProperty('parent'); $property->setAccessible(TRUE); @@ -98,7 +98,7 @@ public function testParseIsCalled() /** * Test basic parse functions */ - public function testParseIsCalledExtraHeaders() + public function testParseIsCalledExtraHeaders(): void { $property = $this->reflection->getProperty('parent'); $property->setAccessible(TRUE); @@ -118,7 +118,7 @@ public function testParseIsCalledExtraHeaders() /** * Test basic parse functions */ - public function testParseIsCalledWOAttributes() + public function testParseIsCalledWOAttributes(): void { $property = $this->reflection->getProperty('parent'); $property->setAccessible(TRUE); @@ -138,7 +138,7 @@ public function testParseIsCalledWOAttributes() /** * Test basic parse functions */ - public function testParseIsCalledCopyContent() + public function testParseIsCalledCopyContent(): void { $property = $this->reflection->getProperty('parent'); $property->setAccessible(TRUE); @@ -158,7 +158,7 @@ public function testParseIsCalledCopyContent() /** * Test basic parse functions */ - public function testParseIsCalledStructContentEmpty() + public function testParseIsCalledStructContentEmpty(): void { $property = $this->reflection->getProperty('parent'); $property->setAccessible(TRUE); @@ -178,7 +178,7 @@ public function testParseIsCalledStructContentEmpty() /** * Test basic parse functions */ - public function testParseIsCalledStructContent() + public function testParseIsCalledStructContent(): void { $property = $this->reflection->getProperty('parent'); $property->setAccessible(TRUE); @@ -198,7 +198,7 @@ public function testParseIsCalledStructContent() /** * Test basic parse functions */ - public function testParseIsCalledStructContentHasAttr() + public function testParseIsCalledStructContentHasAttr(): void { $property = $this->reflection->getProperty('parent'); $property->setAccessible(TRUE); @@ -219,7 +219,7 @@ public function testParseIsCalledStructContentHasAttr() /** * Test basic is_equal_to functions */ - public function testEqualOnStatusCode() + public function testEqualOnStatusCode(): void { $property = $this->reflection->getProperty('statuscode'); $property->setAccessible(TRUE); @@ -235,7 +235,7 @@ public function testEqualOnStatusCode() /** * Test basic is_equal_to functions */ - public function testEqualOnDesc() + public function testEqualOnDesc(): void { $property = $this->reflection->getProperty('description'); $property->setAccessible(TRUE); @@ -251,7 +251,7 @@ public function testEqualOnDesc() /** * Test basic is_equal_to functions */ - public function testEqualOnBoth() + public function testEqualOnBoth(): void { $s_property = $this->reflection->getProperty('statuscode'); $s_property->setAccessible(TRUE); @@ -269,4 +269,4 @@ public function testEqualOnBoth() } -} \ No newline at end of file +} diff --git a/src/PHPDraft/Model/Tests/HierarchyElementChildTest.php b/src/PHPDraft/Model/Tests/HierarchyElementChildTest.php index a88f519a..7f705cb1 100644 --- a/src/PHPDraft/Model/Tests/HierarchyElementChildTest.php +++ b/src/PHPDraft/Model/Tests/HierarchyElementChildTest.php @@ -24,7 +24,7 @@ class HierarchyElementChildTest extends LunrBaseTest */ protected $parent; - public function setUp() + public function setUp(): void { $this->parent = $this->getMockBuilder('\PHPDraft\Model\HierarchyElement') ->getMock(); @@ -33,7 +33,7 @@ public function setUp() /** * Test if the value the class is initialized with is correct */ - public function testTitleSetup() + public function testTitleSetup(): void { $this->assertSame(NULL, $this->class->title); } @@ -41,7 +41,7 @@ public function testTitleSetup() /** * Test if the value the class is initialized with is correct */ - public function testDescriptionSetup() + public function testDescriptionSetup(): void { $this->assertSame(NULL, $this->class->description); } @@ -49,7 +49,7 @@ public function testDescriptionSetup() /** * Test if the value the class is initialized with is correct */ - public function testChildrenSetup() + public function testChildrenSetup(): void { $this->assertSame([], $this->class->children); } @@ -57,10 +57,10 @@ public function testChildrenSetup() /** * Test if the value the class is initialized with is correct */ - public function testSetupCorrectly() + public function testSetupCorrectly(): void { $property = $this->reflection->getProperty('parent'); $property->setAccessible(TRUE); $this->assertNull($property->getValue($this->class)); } -} \ No newline at end of file +} diff --git a/src/PHPDraft/Model/Tests/HierarchyElementTest.php b/src/PHPDraft/Model/Tests/HierarchyElementTest.php index eeadff8b..3379cb11 100644 --- a/src/PHPDraft/Model/Tests/HierarchyElementTest.php +++ b/src/PHPDraft/Model/Tests/HierarchyElementTest.php @@ -29,7 +29,7 @@ class HierarchyElementTest extends LunrBaseTest /** * Set up */ - public function setUp() + public function setUp(): void { $this->parent = $this->getMockBuilder('\PHPDraft\Model\Transition') @@ -42,7 +42,7 @@ public function setUp() /** * Tear down */ - public function tearDown() + public function tearDown(): void { unset($this->class); unset($this->reflection); @@ -51,7 +51,7 @@ public function tearDown() /** * Test if the value the class is initialized with is correct */ - public function testSetupCorrectly() + public function testSetupCorrectly(): void { $property = $this->reflection->getProperty('parent'); $property->setAccessible(TRUE); @@ -61,7 +61,7 @@ public function testSetupCorrectly() /** * Test basic parse functions */ - public function testParseIsCalled() + public function testParseIsCalled(): void { $property = $this->reflection->getProperty('parent'); $property->setAccessible(TRUE); @@ -81,7 +81,7 @@ public function testParseIsCalled() /** * Test basic parse functions */ - public function testParseIsCalledLoop() + public function testParseIsCalledLoop(): void { $property = $this->reflection->getProperty('parent'); $property->setAccessible(TRUE); @@ -105,7 +105,7 @@ public function testParseIsCalledLoop() /** * Test basic parse functions */ - public function testParseIsCalledSlice() + public function testParseIsCalledSlice(): void { $property = $this->reflection->getProperty('parent'); $property->setAccessible(TRUE); @@ -130,7 +130,7 @@ public function testParseIsCalledSlice() /** * Test basic get_href */ - public function testGetHrefIsCalledWithParent() + public function testGetHrefIsCalledWithParent(): void { $property = $this->reflection->getProperty('parent'); $property->setAccessible(TRUE); @@ -148,7 +148,7 @@ public function testGetHrefIsCalledWithParent() /** * Test basic get_href */ - public function testGetHrefIsCalledWithoutParent() + public function testGetHrefIsCalledWithoutParent(): void { $result = $this->class->get_href(); @@ -158,7 +158,7 @@ public function testGetHrefIsCalledWithoutParent() /** * Test basic get_href */ - public function testGetHrefIsCalledWithTitleWithSpaces() + public function testGetHrefIsCalledWithTitleWithSpaces(): void { $property = $this->reflection->getProperty('title'); $property->setAccessible(TRUE); @@ -176,4 +176,4 @@ public function testGetHrefIsCalledWithTitleWithSpaces() $this->assertSame($result, 'hello-some-title'); } -} \ No newline at end of file +} diff --git a/src/PHPDraft/Model/Tests/ObjectElementTest.php b/src/PHPDraft/Model/Tests/ObjectElementTest.php index 63b39218..4cf80960 100644 --- a/src/PHPDraft/Model/Tests/ObjectElementTest.php +++ b/src/PHPDraft/Model/Tests/ObjectElementTest.php @@ -15,38 +15,38 @@ */ class ObjectElementTest extends LunrBaseTest { - public function testKeySetup() + public function testKeySetup(): void { $this->assertSame(NULL, $this->class->key); } - public function testTypeSetup() + public function testTypeSetup(): void { $this->assertSame(NULL, $this->class->type); } - public function testDescriptionSetup() + public function testDescriptionSetup(): void { $this->assertSame(NULL, $this->class->description); } - public function testElementSetup() + public function testElementSetup(): void { $this->assertSame(NULL, $this->class->element); } - public function testValueSetup() + public function testValueSetup(): void { $this->assertSame(NULL, $this->class->value); } - public function testStatusSetup() + public function testStatusSetup(): void { $this->assertSame('', $this->class->status); } - public function testDepsSetup() + public function testDepsSetup(): void { $this->assertSame(NULL, $this->class->deps); } -} \ No newline at end of file +} diff --git a/src/PHPDraft/Model/Tests/ResourceTest.php b/src/PHPDraft/Model/Tests/ResourceTest.php index 899c3dc6..b213020a 100644 --- a/src/PHPDraft/Model/Tests/ResourceTest.php +++ b/src/PHPDraft/Model/Tests/ResourceTest.php @@ -31,7 +31,7 @@ class ResourceTest extends LunrBaseTest /** * Set up */ - public function setUp() + public function setUp(): void { $this->parent = $this->getMockBuilder('\PHPDraft\Model\Category') ->getMock(); @@ -42,7 +42,7 @@ public function setUp() /** * Tear down */ - public function tearDown() + public function tearDown(): void { unset($this->class); unset($this->reflection); @@ -51,7 +51,7 @@ public function tearDown() /** * Test if the value the class is initialized with is correct */ - public function testSetupCorrectly() + public function testSetupCorrectly(): void { $this->assertSame($this->parent, $this->get_reflection_property_value('parent')); } @@ -59,7 +59,7 @@ public function testSetupCorrectly() /** * Test basic parse functions */ - public function testParseIsCalled() + public function testParseIsCalled(): void { $property = $this->reflection->getProperty('parent'); $property->setAccessible(TRUE); @@ -79,7 +79,7 @@ public function testParseIsCalled() /** * Test basic parse functions */ - public function testParseIsCalledNoHREF() + public function testParseIsCalledNoHREF(): void { $property = $this->reflection->getProperty('parent'); $property->setAccessible(TRUE); @@ -99,7 +99,7 @@ public function testParseIsCalledNoHREF() /** * Test basic parse functions */ - public function testParseIsCalledIsCopy() + public function testParseIsCalledIsCopy(): void { $property = $this->reflection->getProperty('parent'); $property->setAccessible(TRUE); @@ -119,7 +119,7 @@ public function testParseIsCalledIsCopy() /** * Test basic parse functions */ - public function testParseIsCalledIsNotCopy() + public function testParseIsCalledIsNotCopy(): void { $property = $this->reflection->getProperty('parent'); $property->setAccessible(TRUE); @@ -136,4 +136,4 @@ public function testParseIsCalledIsNotCopy() $this->assertSame($this->parent, $property->getValue($this->class)); $this->assertNotEmpty($child_property->getValue($this->class)); } -} \ No newline at end of file +} diff --git a/src/PHPDraft/Model/Tests/TransitionTest.php b/src/PHPDraft/Model/Tests/TransitionTest.php index f67efdbf..ea87f641 100644 --- a/src/PHPDraft/Model/Tests/TransitionTest.php +++ b/src/PHPDraft/Model/Tests/TransitionTest.php @@ -466,4 +466,4 @@ public function testBuildURLVars(): void $this->assertSame('/url/level', $return); } -} \ No newline at end of file +} diff --git a/src/PHPDraft/Out/Tests/TemplateGeneratorTest.php b/src/PHPDraft/Out/Tests/TemplateGeneratorTest.php index 91d91e42..2f7afe68 100644 --- a/src/PHPDraft/Out/Tests/TemplateGeneratorTest.php +++ b/src/PHPDraft/Out/Tests/TemplateGeneratorTest.php @@ -168,4 +168,4 @@ public function testIncludeFileMultiple(): void $return = $this->class->find_include_file('text', 'txt'); $this->assertSame('templates/text/text.txt', $return); } -} \ No newline at end of file +} diff --git a/src/PHPDraft/Out/Tests/VersionTest.php b/src/PHPDraft/Out/Tests/VersionTest.php index e74cf76d..a6ee6d70 100644 --- a/src/PHPDraft/Out/Tests/VersionTest.php +++ b/src/PHPDraft/Out/Tests/VersionTest.php @@ -111,4 +111,4 @@ public function testSeriesNightly(): void $return = $this->class->series(); $this->assertSame('1.2', $return); } -} \ No newline at end of file +} diff --git a/src/PHPDraft/Parse/Tests/BaseParserTest.php b/src/PHPDraft/Parse/Tests/BaseParserTest.php index 5daed37e..ffc5d0d7 100644 --- a/src/PHPDraft/Parse/Tests/BaseParserTest.php +++ b/src/PHPDraft/Parse/Tests/BaseParserTest.php @@ -123,16 +123,18 @@ public function testParseToJSONMkTmp(): void /** * Check if parsing the fails when invalid JSON * - * @covers \PHPDraft\Parse\Drafter::parseToJson() - * @expectedException \PHPDraft\Parse\ExecutionException - * @expectedExceptionMessage Drafter generated invalid JSON (ERROR) - * @expectedExceptionCode 2 + * @covers \PHPDraft\Parse\Drafter::parseToJson() */ public function testParseToJSONWithInvalidJSON(): void { $this->class->expects($this->once()) ->method('parse') ->will($this->returnValue(NULL)); + + $this->expectException('\PHPDraft\Parse\ExecutionException'); + $this->expectExceptionMessage('Drafter generated invalid JSON (ERROR)'); + $this->expectExceptionCode(2); + $this->mock_function('json_last_error', function () {return JSON_ERROR_DEPTH;}); $this->mock_function('json_last_error_msg', function () {return "ERROR";}); $this->class->parseToJson(); diff --git a/src/PHPDraft/Parse/Tests/DrafterAPITest.php b/src/PHPDraft/Parse/Tests/DrafterAPITest.php index 3ba7ef35..8e13b5c2 100644 --- a/src/PHPDraft/Parse/Tests/DrafterAPITest.php +++ b/src/PHPDraft/Parse/Tests/DrafterAPITest.php @@ -97,13 +97,14 @@ public function testPreRunStringIsEmpty(): void /** * Check if parsing the fails without drafter * - * @covers \PHPDraft\Parse\DrafterAPI::parseToJson() - * @expectedException \PHPDraft\Parse\ResourceException - * @expectedExceptionMessage Drafter webservice failed to parse input - * @expectedExceptionCode 1 + * @covers \PHPDraft\Parse\DrafterAPI::parseToJson() */ public function testParseWithFailingWebservice(): void { + $this->expectException('\PHPDraft\Parse\ResourceException'); + $this->expectExceptionMessage('Drafter webservice failed to parse input'); + $this->expectExceptionCode(1); + $this->mock_function('curl_errno', function() { return 1;}); $this->class->parseToJson(); $this->unmock_function('curl_errno'); diff --git a/src/PHPDraft/Parse/Tests/DrafterTest.php b/src/PHPDraft/Parse/Tests/DrafterTest.php index 3b2068ce..4db861b7 100644 --- a/src/PHPDraft/Parse/Tests/DrafterTest.php +++ b/src/PHPDraft/Parse/Tests/DrafterTest.php @@ -115,13 +115,14 @@ public function testParseToJSONInheritance(): void /** * Check if parsing the APIB to JSON gives the expected result * - * @covers \PHPDraft\Parse\Drafter::parseToJson() - * @expectedException \PHPDraft\Parse\ExecutionException - * @expectedExceptionMessage Parsing encountered errors and stopped - * @expectedExceptionCode 2 + * @covers \PHPDraft\Parse\Drafter::parseToJson() */ public function testParseToJSONWithErrors(): void { + $this->expectException('\PHPDraft\Parse\ExecutionException'); + $this->expectExceptionMessage('Parsing encountered errors and stopped'); + $this->expectExceptionCode(2); + $this->mock_function('shell_exec', function () { return ""; }); file_put_contents(TEST_STATICS . '/drafter/index.json', file_get_contents(TEST_STATICS . '/drafter/json/error.json')); @@ -145,13 +146,14 @@ public function testSetupWithoutDrafter(): void /** * Check if parsing the fails when invalid JSON * - * @covers \PHPDraft\Parse\Drafter::parseToJson() - * @expectedException \PHPDraft\Parse\ExecutionException - * @expectedExceptionMessage Drafter generated invalid JSON (ERROR) - * @expectedExceptionCode 2 + * @covers \PHPDraft\Parse\Drafter::parseToJson() */ public function testParseToJSONWithInvalidJSON(): void { + $this->expectException('\PHPDraft\Parse\ExecutionException'); + $this->expectExceptionMessage('Drafter generated invalid JSON (ERROR)'); + $this->expectExceptionCode(2); + $this->mock_function('json_last_error', function () { return JSON_ERROR_DEPTH; }); $this->mock_function('json_last_error_msg', function () { return "ERROR"; }); file_put_contents(TEST_STATICS . '/drafter/index.json', '["hello: \'world}'); diff --git a/src/PHPDraft/Parse/Tests/LegacyDrafterTest.php b/src/PHPDraft/Parse/Tests/LegacyDrafterTest.php index 3e5faa2b..cde54e83 100644 --- a/src/PHPDraft/Parse/Tests/LegacyDrafterTest.php +++ b/src/PHPDraft/Parse/Tests/LegacyDrafterTest.php @@ -97,13 +97,14 @@ public function testParseToJSONInheritance(): void /** * Check if parsing the APIB to JSON gives the expected result * - * @covers \PHPDraft\Parse\Drafter::parseToJson() - * @expectedException \PHPDraft\Parse\ExecutionException - * @expectedExceptionMessage Parsing encountered errors and stopped - * @expectedExceptionCode 2 + * @covers \PHPDraft\Parse\Drafter::parseToJson() */ public function testParseToJSONWithErrors(): void { + $this->expectException('\PHPDraft\Parse\ExecutionException'); + $this->expectExceptionMessage('Parsing encountered errors and stopped'); + $this->expectExceptionCode(2); + $this->mock_function('shell_exec', function() { return "";}); file_put_contents(TEST_STATICS . '/drafter/index.json', file_get_contents(TEST_STATICS . '/drafter/json/error.json')); @@ -127,13 +128,14 @@ public function testAvailableIsFalseWhenNoDrafter(): void /** * Check if parsing the fails when invalid JSON * - * @covers \PHPDraft\Parse\Drafter::parseToJson() - * @expectedException \PHPDraft\Parse\ExecutionException - * @expectedExceptionMessage Drafter generated invalid JSON (ERROR) - * @expectedExceptionCode 2 + * @covers \PHPDraft\Parse\Drafter::parseToJson() */ public function testParseToJSONWithInvalidJSON(): void { + $this->expectException('\PHPDraft\Parse\ExecutionException'); + $this->expectExceptionMessage('Drafter generated invalid JSON (ERROR)'); + $this->expectExceptionCode(2); + $this->mock_function('json_last_error', function() { return JSON_ERROR_DEPTH;}); $this->mock_function('json_last_error_msg', function() { return "ERROR";}); file_put_contents(TEST_STATICS . '/drafter/index.json', '["hello: \'world}');