Framework assertions

daikon-cqrs · Jun 10, 2020 · 0145924 · 0145924
1 parent 7405087
commit 0145924
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 16 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/src/CallbackMetadataEnricher.php b/src/CallbackMetadataEnricher.php
@@ -21,6 +21,6 @@ public function __construct(Closure $callable)
 
     public function enrich(MetadataInterface $metadata): MetadataInterface
     {
-        return call_user_func($this->callable, $metadata);
+        return ($this->callable)($metadata);
     }
 }
diff --git a/src/MetadataEnricherList.php b/src/MetadataEnricherList.php
@@ -17,7 +17,7 @@ public function __construct(iterable $enrichers = [])
         $this->init($enrichers, [MetadataEnricherInterface::class]);
     }
 
-    public function prependEnricher(string $key, string $value): self
+    public function enrichWith(string $key, string $value): self
     {
         return $this->unshift(
             new CallbackMetadataEnricher(

diff --git a/...Metadata/CallbackMetadataEnricherTest.php → tests/CallbackMetadataEnricherTest.php b/...Metadata/CallbackMetadataEnricherTest.php → tests/CallbackMetadataEnricherTest.php
@@ -16,9 +16,10 @@ final class CallbackMetadataEnricherTest extends TestCase
 {
     public function testEnrich(): void
     {
-        $metadata = (new CallbackMetadataEnricher(function (Metadata $metadata) {
-            return $metadata->with('message', 'hello world');
-        }))->enrich(Metadata::makeEmpty());
+        $metadata = (new CallbackMetadataEnricher(
+            fn(Metadata $metadata): Metadata => $metadata->with('message', 'hello world')
+        ))->enrich(Metadata::makeEmpty());
+
         $this->assertEquals($metadata->get('message'), 'hello world');
     }
 }
diff --git a/tests/Metadata/MetadataEnricherListTest.php → tests/MetadataEnricherListTest.php b/tests/Metadata/MetadataEnricherListTest.php → tests/MetadataEnricherListTest.php
@@ -40,7 +40,7 @@ public function testPrependEnricher(): void
         $mockEnricher = $this->createMock(MetadataEnricherInterface::class);
         $mockEnricher->expects($this->once())->method('enrich')->willReturnArgument(0);
         $enricherList = new MetadataEnricherList([$mockEnricher]);
-        $newList = $enricherList->prependEnricher('key', 'value');
+        $newList = $enricherList->enrichWith('key', 'value');
         $this->assertCount(2, $newList);
         $this->assertNotSame($enricherList, $newList);
         $this->assertFalse($enricherList === $newList);

diff --git a/tests/Metadata/MetadataTest.php → tests/MetadataTest.php b/tests/Metadata/MetadataTest.php → tests/MetadataTest.php
@@ -8,7 +8,7 @@
 
 namespace Daikon\Tests\Metadata;
 
-use Assert\InvalidArgumentException;
+use Daikon\Interop\InvalidArgumentException;
 use Daikon\Metadata\Metadata;
 use PHPUnit\Framework\TestCase;