' . $throwable->getCode() . "\n";
$xml .= ' Hello
'; $this->email->setMsgHtml($html); @@ -52,7 +49,7 @@ public function testAddOpenTrackingImageWithBody() /** * */ - public function testAddOpenTrackingImageWithoutBody() + public function testAddOpenTrackingImageWithoutBody(): void { $html = 'Hello
| ${this.patterns?"{=COLOR}":''}{=NAME} | +{=VALUE} | +
with html
'); @@ -368,18 +321,12 @@ public function testParseOne() $this->assertEquals('with html
', $ret); } - /** - * @return void - */ - public function testValidationMethods() + public function testValidationMethods(): void { $this->assertIsArray($this->obj->validationMethods()); } - /** - * @return void - */ - public function testValidateMaxLength() + public function testValidateMaxLength(): void { $this->obj->setMaxLength(5); $this->obj->setVal('1234'); @@ -407,10 +354,7 @@ public function testValidateMaxLength() $this->assertNotTrue($this->obj->validateMaxLength()); } - /** - * @return void - */ - public function testValidateMaxLengthWithZeroMaxLengthReturnsTrue() + public function testValidateMaxLengthWithZeroMaxLengthReturnsTrue(): void { $this->obj->setMaxLength(0); @@ -420,10 +364,7 @@ public function testValidateMaxLengthWithZeroMaxLengthReturnsTrue() $this->assertTrue($this->obj->validateMaxLength()); } - /** - * @return void - */ - public function testValidateMinLength() + public function testValidateMinLength(): void { $this->obj->setMinLength(5); @@ -452,10 +393,7 @@ public function testValidateMinLength() $this->assertNotTrue($this->obj->validateMinLength()); } - /** - * @return void - */ - public function testValidateMinLengthAllowEmpty() + public function testValidateMinLengthAllowEmpty(): void { $this->obj->setAllowNull(false); $this->obj->setMinLength(5); @@ -468,10 +406,7 @@ public function testValidateMinLengthAllowEmpty() $this->assertNotTrue($this->obj->validateMinLength()); } - /** - * @return void - */ - public function testValidateMinLengthWithoutValReturnsFalse() + public function testValidateMinLengthWithoutValReturnsFalse(): void { $this->obj->setAllowNull(false); $this->obj->setMinLength(5); @@ -479,10 +414,7 @@ public function testValidateMinLengthWithoutValReturnsFalse() $this->assertNotTrue($this->obj->validateMinLength()); } - /** - * @return void - */ - public function testValidateMinLengthWithoutMinLengthReturnsTrue() + public function testValidateMinLengthWithoutMinLengthReturnsTrue(): void { $this->assertTrue($this->obj->validateMinLength()); @@ -490,10 +422,7 @@ public function testValidateMinLengthWithoutMinLengthReturnsTrue() $this->assertTrue($this->obj->validateMinLength()); } - /** - * @return void - */ - public function testValidateRegexp() + public function testValidateRegexp(): void { /** Without RegExp */ $this->assertTrue($this->obj->validateRegexp()); @@ -502,7 +431,7 @@ public function testValidateRegexp() $this->assertTrue($this->obj->validateRegexp()); /** With RegExp */ - $this->obj->setRegexp('/[0-9]+/'); + $this->obj->setRegexp('/\d+/'); $this->obj->setVal('123'); $this->assertTrue($this->obj->validateRegexp()); @@ -511,10 +440,7 @@ public function testValidateRegexp() $this->assertNotTrue($this->obj->validateRegexp()); } - /** - * @return void - */ - public function testValidateAllowEmpty() + public function testValidateAllowEmpty(): void { $this->obj->setAllowEmpty(false); diff --git a/packages/property/tests/Charcoal/Property/StructurePropertyTest.php b/packages/property/tests/Charcoal/Property/StructurePropertyTest.php index f103fb186..219688a67 100644 --- a/packages/property/tests/Charcoal/Property/StructurePropertyTest.php +++ b/packages/property/tests/Charcoal/Property/StructurePropertyTest.php @@ -21,9 +21,6 @@ class StructurePropertyTest extends AbstractTestCase */ public $obj; - /** - * @return void - */ protected function setUp(): void { $container = $this->getContainer(); @@ -35,15 +32,12 @@ protected function setUp(): void ]); } - /** - * @return void - */ - public function testType() + public function testType(): void { $this->assertEquals('structure', $this->obj->type()); } - public function testParseOneNull() + public function testParseOneNull(): void { $this->obj->setAllowNull(true); $this->assertNull($this->obj->parseOne(null)); @@ -53,7 +47,7 @@ public function testParseOneNull() $this->obj->parseOne(null); } - public function testParseOneString() + public function testParseOneString(): void { $this->assertEquals('', $this->obj->parseOne('')); // $this->assertEquals('foo', $this->obj->parseOne('foo')); @@ -61,7 +55,7 @@ public function testParseOneString() $this->assertEquals(['foo'=>'bar'], $this->obj->parseOne('{"foo":"bar"}')); } - public function testSqlType() + public function testSqlType(): void { $this->assertEquals('TEXT', $this->obj->sqlType()); @@ -85,23 +79,23 @@ public function testSqlType() $this->obj->setSqlType('foobar'); } - public function testSetSqlTypeNullException() + public function testSetSqlTypeNullException(): void { $this->expectException(InvalidArgumentException::class); $this->obj->setSqlType(false); } - public function testSqlPdoType() + public function testSqlPdoType(): void { $this->assertEquals(\PDO::PARAM_STR, $this->obj->sqlPdoType()); } - public function testSqlExtra() + public function testSqlExtra(): void { $this->assertEquals('', $this->obj->sqlExtra()); } - public function testInputVal() + public function testInputVal(): void { $this->assertEquals('', $this->obj->inputVal('')); $this->assertEquals('', $this->obj->inputVal(null)); @@ -109,7 +103,7 @@ public function testInputVal() $this->assertEquals('[]', $this->obj->inputVal([])); } - public function testStorageVal() + public function testStorageVal(): void { $this->assertEquals('', $this->obj->inputVal('')); $this->assertEquals(null, $this->obj->inputVal(null)); diff --git a/packages/property/tests/Charcoal/Property/TextPropertyTest.php b/packages/property/tests/Charcoal/Property/TextPropertyTest.php index 8be63c1f1..624feab63 100644 --- a/packages/property/tests/Charcoal/Property/TextPropertyTest.php +++ b/packages/property/tests/Charcoal/Property/TextPropertyTest.php @@ -1,5 +1,7 @@ getContainer(); @@ -34,15 +33,13 @@ protected function setUp(): void /** * Asserts that the `type()` method returns "text". - * - * @return void */ - public function testType() + public function testType(): void { $this->assertEquals('text', $this->obj->type()); } - public function testDefaults() + public function testDefaults(): void { $this->assertFalse($this->obj['required']); $this->assertFalse($this->obj['unique']); @@ -57,20 +54,16 @@ public function testDefaults() /** * Asserts that the `defaultMaxLength` method returns 0 (no limit). - * - * @return void */ - public function testDefaultMaxLength() + public function testDefaultMaxLength(): void { $this->assertEquals(0, $this->obj->defaultMaxLength()); } /** * Asserts that the `sqlType()` method returns "TEXT". - * - * @return void */ - public function testSqlType() + public function testSqlType(): void { $this->assertEquals('TEXT', $this->obj->sqlType()); diff --git a/packages/property/tests/Charcoal/Property/UrlPropertyTest.php b/packages/property/tests/Charcoal/Property/UrlPropertyTest.php index b7b0a5242..f71c77a3a 100644 --- a/packages/property/tests/Charcoal/Property/UrlPropertyTest.php +++ b/packages/property/tests/Charcoal/Property/UrlPropertyTest.php @@ -1,5 +1,7 @@ getContainer(); @@ -33,15 +32,13 @@ protected function setUp(): void /** * Asserts that the `type()` method returns "url". - * - * @return void */ - public function testType() + public function testType(): void { $this->assertEquals('url', $this->obj->type()); } - public function testParseOne() + public function testParseOne(): void { $this->assertEquals('example.com', $this->obj->parseOne('example.com')); $this->assertEquals('https://example.com:2020', $this->obj->parseOne('https:// example.com:2020 ')); diff --git a/packages/property/tests/Charcoal/ReflectionsTrait.php b/packages/property/tests/Charcoal/ReflectionsTrait.php index 3a63ff2b1..047d2c172 100644 --- a/packages/property/tests/Charcoal/ReflectionsTrait.php +++ b/packages/property/tests/Charcoal/ReflectionsTrait.php @@ -18,13 +18,10 @@ trait ReflectionsTrait * * @param mixed $class The class name or object that contains the method. * @param string $name The method name to reflect. - * @return ReflectionMethod */ - public function getMethod($class, $name) + public function getMethod($class, $name): \ReflectionMethod { - $reflected = new ReflectionMethod($class, $name); - $reflected->setAccessible(true); - return $reflected; + return new ReflectionMethod($class, $name); } /** @@ -38,7 +35,7 @@ public function getMethod($class, $name) public function callMethod($object, $name, array $args = []) { $method = $this->getMethod($object, $name); - if (empty($args)) { + if ($args === []) { return $method->invoke($object); } else { return $method->invokeArgs($object, $args); @@ -65,13 +62,10 @@ public function callMethodWith($object, $name, ...$args) * * @param mixed $class The class name or object that contains the property. * @param string $name The property name to reflect. - * @return ReflectionProperty */ - public function getProperty($class, $name) + public function getProperty($class, $name): \ReflectionProperty { - $reflected = new ReflectionProperty($class, $name); - $reflected->setAccessible(true); - return $reflected; + return new ReflectionProperty($class, $name); } /** @@ -92,9 +86,8 @@ public function getPropertyValue($object, $name) * @param mixed $object The object to access. * @param string $name The property name to affect. * @param mixed $value The new value. - * @return void */ - public function setPropertyValue($object, $name, $value) + public function setPropertyValue($object, $name, $value): void { $this->getProperty($object, $name)->setValue($object, $value); } diff --git a/packages/property/tests/bootstrap.php b/packages/property/tests/bootstrap.php new file mode 100644 index 000000000..90929e3b5 --- /dev/null +++ b/packages/property/tests/bootstrap.php @@ -0,0 +1,14 @@ + -