Enhance TestSetterAndGetterTrait

* Allow scalar values to be passed as spec (not only strings)
* Throws exception if neither  is defined nor
  the method setterAndGetterData is overridden.

Author: TiSiE

src/TestCase/TestSetterAndGetterTrait.php

@@ -11,6 +11,7 @@
 
 namespace Cross\TestUtils\TestCase;
 
+use Cross\TestUtils\Exception\InvalidUsageException;
 use Cross\TestUtils\Utils\Target;
 
 /**
@@ -107,7 +108,15 @@ trait TestSetterAndGetterTrait
      */
     public function setterAndGetterData(): array
     {
-        return property_exists($this, 'setterAndGetter') ? $this->setterAndGetter : [];
+        if (!property_exists($this, 'setterAndGetter')) {
+            throw InvalidUsageException::fromTrait(
+                __TRAIT__,
+                __CLASS__,
+                'Property $setterAndGetter is not defined and method setterAndGetter is not overridden.'
+            );
+        }
+
+        return $this->setterAndGetter;
     }
 
     /**
@@ -198,7 +207,7 @@ private function setterAndGetterNormalizeSpec($spec, string $name, object $targe
             'exception' => null,
         ];
 
-        if (is_string($spec)) {
+        if (is_scalar($spec)) {
             $normalized['value'] = $spec;
             return $normalized;
         }

test/TestUtilsTest/TestCase/TestSetterAndGetterTraitTest.php

@@ -11,6 +11,8 @@
 
 namespace Cross\TestUtilsTest\TestCase;
 
+use Cross\TestUtils\Exception\InvalidUsageException;
+
 use Cross\TestUtils\TestCase\TestSetterAndGetterTrait;
 use Cross\TestUtils\TestCase\TestUsesTraitsTrait;
 
@@ -37,11 +39,14 @@ public function testSetterAndGetterDataReturnsPropertyValue()
         static::assertEquals([['prop', 'value']], $target->setterAndGetterData());
     }
 
-    public function testSetterAndGetterDataReturnsEmptyArray()
+    public function testSetterAndGetterDataThrowsExceptionIfNotOverridden()
     {
         $target = new class { use TestSetterAndGetterTrait;};
 
-        static::assertEquals([], $target->setterAndGetterData());
+        $this->expectException(InvalidUsageException::class);
+        $this->expectExceptionMessage('$setterAndGetter is not defined');
+
+        $target->setterAndGetterData();
     }
 
     public function testReturnsNullIfSpecIsNotGiven()
@@ -105,6 +110,8 @@ public function normalizationData() : array
     {
         return [
             ['value', ['value' => 'value']],
+            [10, ['value' => 10]],
+            [true, ['value' => true]],
             [new \stdClass, 'Must be array'],
             [['property' => true], ['property' => ['prop', '__VALUE__']]],
             [['property' => ['test']], ['property' => ['prop', 'test']]],
@@ -215,7 +222,7 @@ public function callback() {}
 
         if (is_array($expect)) {
             foreach ($expect as $key => $val) {
-                if ('__TARGET__' == $val) {
+                if ('__TARGET__' === $val) {
                     static::assertSame($target->target, $normalized[$key]);
                 } else {
                     static::assertEquals($val, $normalized[$key]);