Remove KeyValue and Value classes.

drupol · drupol · commit d44b36f0e66b · 2022-06-06T08:54:45.000+02:00
diff --git a/README.md b/README.md
@@ -36,13 +36,13 @@ use loophp\TypedGenerators\Types\Core\StringType;
 
 include __DIR__ . '/vendor/autoload.php';
 
-$value = Value::new(
-    StringType::new() // Generate strings
-);
+$strings = StringType::new(); // Generate strings
 
-foreach ($value as $v) {
-    var_dump($v);     // Random string generated
+foreach ($strings as $string) {
+    var_dump($string);        // Random string generated
 }
+
+echo $strings();             // Print one random string
 ```
 
 ### Generate KeyValue pairs
@@ -54,19 +54,19 @@ declare(strict_types=1);
 
 namespace Snippet;
 
-use loophp\TypedGenerators\Generator\KeyValue;
+use loophp\TypedGenerators\Types\Core\IteratorType;
 use loophp\TypedGenerators\Types\Core\BoolType;
 use loophp\TypedGenerators\Types\Core\StringType;
 
 include __DIR__ . '/vendor/autoload.php';
 
-$keyValue = KeyValue::new(
-    StringType::new(), // Generate strings for keys
-    BoolType::new()    // Generate booleans for values
+$iteratorStringBool = IteratorType::new(
+    StringType::new(),       // Keys: Generate strings for keys
+    BoolType::new()          // Values: Generate booleans for values
 );
 
-foreach ($keyValue as $k => $v) {
-    var_dump($k, $v);  // Random string for key, random boolean for value.
+foreach ($iteratorStringBool() as $key => $value) {
+    var_dump($key, $value);  // Random string for key, random boolean for value.
 }
 ```
 
@@ -80,7 +80,7 @@ declare(strict_types=1);
 namespace Snippet;
 
 use Faker\Generator;
-use loophp\TypedGenerators\Generator\KeyValue;
+use loophp\TypedGenerators\Types\Core\IteratorType;
 use loophp\TypedGenerators\Types\Core\StringType;
 use loophp\TypedGenerators\Types\Hybrid\FakerType;
 
@@ -91,13 +91,13 @@ $fakerType = FakerType::new(
     fn (Generator $faker): string => $faker->city()
 );
 
-$keyValue = KeyValue::new(
-    StringType::new(4), // A random string of length 4
-    $fakerType          // A random city name
+$iterator = IteratorType::new(
+    StringType::new(4), // Keys: A random string of length 4
+    $fakerType          // Values: A random city name
 );
 
-foreach ($keyValue as $k => $v) {
-    dump($k, $v);
+foreach ($iterator as $key => $value) {
+    var_dump($key, $value);
 }
 ```
 
@@ -113,7 +113,7 @@ declare(strict_types=1);
 namespace Snippet;
 
 use Faker\Generator;
-use loophp\TypedGenerators\Generator\KeyValue;
+use loophp\TypedGenerators\Types\Core\IteratorType;
 use loophp\TypedGenerators\Types\Core\BoolType;
 use loophp\TypedGenerators\Types\Core\IntType;
 use loophp\TypedGenerators\Types\Core\StringType;
@@ -127,16 +127,16 @@ $fakerType = FakerType::new(
     fn (Generator $faker): string => $faker->firstName()
 );
 
-$keyValue = KeyValue::new(
-    BoolType::new(),    // A random boolean for keys.
-    Compound::new(      // A random compound value for values which can be
+$iterator = IteratorType::new(
+    BoolType::new(),    // Keys: A random boolean
+    Compound::new(      // Values: A random compound value which can be
         $fakerType,     // either a firstname
         IntType::new()  // either an integer.
     )
 );
 
-foreach ($keyValue as $k => $v) {
-    dump($k, $v);
+foreach ($iterator as $key => $value) {
+    var_dump($key, $value);
 }
 ```
 
diff --git a/grumphp.yml b/grumphp.yml
@@ -25,7 +25,7 @@ parameters:
         - "/vendor/"
 
     # PHPStan
-    tasks.phpstan.level: 8
+    tasks.phpstan.level: 9
     tasks.phpstan.blocking: true
     tasks.phpstan.ignore_patterns:
         - "/.github/"
diff --git a/src/Generator/KeyValue.php b/src/Generator/KeyValue.php
diff --git a/src/Generator/TypedGenerator.php b/src/Generator/TypedGenerator.php
diff --git a/src/Generator/Value.php b/src/Generator/Value.php
diff --git a/tests/static-analysis/Types/Core/IteratorType.php b/tests/static-analysis/Types/Core/IteratorType.php
@@ -8,12 +8,10 @@
 declare(strict_types=1);
 
 use Faker\Generator;
-use loophp\TypedGenerators\Generator\KeyValue;
+use loophp\TypedGenerators\Types\Core\IteratorType;
 use loophp\TypedGenerators\Types\Core\StringType;
 use loophp\TypedGenerators\Types\Hybrid\FakerType;
 
-include __DIR__ . '/../../../vendor/autoload.php';
-
 /**
  * @param iterable<string, string> $iterable
  */
@@ -28,4 +26,4 @@ static function (Generator $faker): string {
     }
 );
 
-foobar(KeyValue::new(StringType::new(), $fakerType));
+foobar(IteratorType::new(StringType::new(), $fakerType)());
diff --git a/tests/static-analysis/Types/Core/ListType.php b/tests/static-analysis/Types/Core/ListType.php
@@ -7,20 +7,18 @@
 
 declare(strict_types=1);
 
-use loophp\TypedGenerators\Generator\Value;
 use loophp\TypedGenerators\Types\Core\BoolType;
+use loophp\TypedGenerators\Types\Core\ListType;
 use loophp\TypedGenerators\Types\Core\StringType;
 
-include __DIR__ . '/../../../vendor/autoload.php';
-
 /**
  * @param iterable<int, string> $iterable
  */
 function foobarIntString(iterable $iterable): void
 {
 }
 
-foobarIntString(Value::new(StringType::new()));
+foobarIntString(ListType::new(StringType::new())());
 
 /**
  * @param iterable<int, bool> $iterable
@@ -29,4 +27,4 @@ function foobarIntBool(iterable $iterable): void
 {
 }
 
-foobarIntBool(Value::new(BoolType::new()));
+foobarIntBool(ListType::new(BoolType::new())());
diff --git a/tests/unit/Types/Core/IteratorTest.php b/tests/unit/Types/Core/IteratorTest.php
@@ -7,16 +7,16 @@
 
 declare(strict_types=1);
 
-namespace tests\loophp\TypedGenerators;
+namespace tests\loophp\TypedGenerators\Types\Core;
 
 use LimitIterator;
-use loophp\TypedGenerators\Generator\KeyValue;
 use loophp\TypedGenerators\Types\Core\ArrayType;
 use loophp\TypedGenerators\Types\Core\BoolType;
 use loophp\TypedGenerators\Types\Core\ClosureType;
 use loophp\TypedGenerators\Types\Core\DateTimeType;
 use loophp\TypedGenerators\Types\Core\FloatType;
 use loophp\TypedGenerators\Types\Core\IntType;
+use loophp\TypedGenerators\Types\Core\IteratorType;
 use loophp\TypedGenerators\Types\Core\ListType;
 use loophp\TypedGenerators\Types\Core\NullType;
 use loophp\TypedGenerators\Types\Core\ObjectType;
@@ -28,16 +28,16 @@
  * @internal
  * @coversDefaultClass \loophp\TypedGenerators
  */
-final class KeyValueTest extends TestCase
+final class IteratorTest extends TestCase
 {
     /**
      * @dataProvider typeProvider
      */
     public function testKeyValue(TypeGenerator $t1, TypeGenerator $t2)
     {
-        $subject = KeyValue::new($t1, $t2);
+        $subject = IteratorType::new($t1, $t2);
 
-        foreach (new LimitIterator($subject->getIterator(), 0, 3) as $k => $v) {
+        foreach (new LimitIterator($subject(), 0, 3) as $k => $v) {
             self::assertSame($k, $t1->identity($k));
             self::assertSame($v, $t2->identity($v));
         }
diff --git a/tests/unit/Types/Core/ListTest.php b/tests/unit/Types/Core/ListTest.php
@@ -7,10 +7,9 @@
 
 declare(strict_types=1);
 
-namespace tests\loophp\TypedGenerators;
+namespace tests\loophp\TypedGenerators\Types\Core;
 
 use LimitIterator;
-use loophp\TypedGenerators\Generator\Value;
 use loophp\TypedGenerators\Types\Core\ArrayType;
 use loophp\TypedGenerators\Types\Core\BoolType;
 use loophp\TypedGenerators\Types\Core\ClosureType;
@@ -28,18 +27,18 @@
  * @internal
  * @coversDefaultClass \loophp\TypedGenerators
  */
-final class ValueTest extends TestCase
+final class ListTest extends TestCase
 {
     /**
      * @dataProvider typeProvider
      */
     public function testKeyValue(TypeGenerator $t1)
     {
-        $subject = Value::new($t1);
+        $subject = ListType::new($t1);
 
-        foreach (new LimitIterator($subject->getIterator(), 0, 3) as $k => $v) {
-            self::assertSame($k, IntType::new()->identity($k));
-            self::assertSame($v, $t1->identity($v));
+        foreach (new LimitIterator($subject->getIterator(), 0, 3) as $v) {
+            self::assertSame(key($v), IntType::new()->identity(key($v)));
+            self::assertSame(current($v), $t1->identity(current($v)));
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -7,20 +7,18 @@`
`7`	`7`
`8`	`8`	`declare(strict_types=1);`
`9`	`9`
`10`		`-use loophp\TypedGenerators\Generator\Value;`
`11`	`10`	`use loophp\TypedGenerators\Types\Core\BoolType;`
	`11`	`+use loophp\TypedGenerators\Types\Core\ListType;`
`12`	`12`	`use loophp\TypedGenerators\Types\Core\StringType;`
`13`	`13`
`14`		`-include __DIR__ . '/../../../vendor/autoload.php';`
`15`		`-`
`16`	`14`	`/**`
`17`	`15`	`* @param iterable<int, string> $iterable`
`18`	`16`	`*/`
`19`	`17`	`function foobarIntString(iterable $iterable): void`
`20`	`18`	`{`
`21`	`19`	`}`
`22`	`20`
`23`		`-foobarIntString(Value::new(StringType::new()));`
	`21`	`+foobarIntString(ListType::new(StringType::new())());`
`24`	`22`
`25`	`23`	`/**`
`26`	`24`	`* @param iterable<int, bool> $iterable`
`@@ -29,4 +27,4 @@ function foobarIntBool(iterable $iterable): void`
`29`	`27`	`{`
`30`	`28`	`}`
`31`	`29`
`32`		`-foobarIntBool(Value::new(BoolType::new()));`
	`30`	`+foobarIntBool(ListType::new(BoolType::new())());`