v3

sunrise-php · Nov 1, 2024 · 7bf685f · 7bf685f
1 parent d9a10f0
commit 7bf685f
Show file tree

Hide file tree

Showing 9 changed files with 281 additions and 41 deletions.
diff --git a/src/Helper/ClassFinder.php b/src/Helper/ClassFinder.php
@@ -35,7 +35,7 @@
 final class ClassFinder
 {
     /**
-     * @return Generator<int, ReflectionClass<object>>
+     * @return Generator<class-string, ReflectionClass<object>>
      *
      * @throws InvalidArgumentException
      * @throws ReflectionException
@@ -63,13 +63,13 @@ public static function getDirClasses(string $dirname): Generator
         foreach (get_declared_classes() as $className) {
             $classReflection = new ReflectionClass($className);
             if (isset($filenames[$classReflection->getFileName()])) {
-                yield $classReflection;
+                yield $className => $classReflection;
             }
         }
     }
 
     /**
-     * @return Generator<int, ReflectionClass<object>>
+     * @return Generator<class-string, ReflectionClass<object>>
      *
      * @throws InvalidArgumentException
      * @throws ReflectionException
@@ -91,7 +91,7 @@ public static function getFileClasses(string $filename): Generator
         foreach (get_declared_classes() as $className) {
             $classReflection = new ReflectionClass($className);
             if ($classReflection->getFileName() === $filename) {
-                yield $classReflection;
+                yield $className => $classReflection;
             }
         }
     }

diff --git a/tests/Entity/Language/ClientLanguageTest.php b/tests/Entity/Language/ClientLanguageTest.php
@@ -11,10 +11,9 @@ final class ClientLanguageTest extends TestCase
 {
     public function testConstructor(): void
     {
-        $language = new ClientLanguage('sr', 'sr-RS', ['q' => '1.0']);
-
-        $this->assertSame('sr', $language->getCode());
-        $this->assertSame('sr-RS', $language->getIdentifier());
-        $this->assertSame(['q' => '1.0'], $language->getParameters());
+        $clientLanguage = new ClientLanguage('sr', 'sr-RS', ['q' => '1.0']);
+        $this->assertSame('sr', $clientLanguage->getCode());
+        $this->assertSame('sr-RS', $clientLanguage->getIdentifier());
+        $this->assertSame(['q' => '1.0'], $clientLanguage->getParameters());
     }
 }
diff --git a/tests/Entity/Language/ServerLanguageTest.php b/tests/Entity/Language/ServerLanguageTest.php
@@ -11,8 +11,7 @@ final class ServerLanguageTest extends TestCase
 {
     public function testConstructor(): void
     {
-        $language = new ServerLanguage('sr');
-
-        $this->assertSame('sr', $language->getCode());
+        $serverLanguage = new ServerLanguage('sr');
+        $this->assertSame('sr', $serverLanguage->getCode());
     }
 }
diff --git a/tests/Entity/MediaType/ClientMediaTypeTest.php b/tests/Entity/MediaType/ClientMediaTypeTest.php
@@ -11,17 +11,15 @@ final class ClientMediaTypeTest extends TestCase
 {
     public function testConstructor(): void
     {
-        $mediaType = new ClientMediaType('application', 'json', ['q' => '1.0']);
-
-        $this->assertSame('application', $mediaType->getType());
-        $this->assertSame('json', $mediaType->getSubtype());
-        $this->assertSame(['q' => '1.0'], $mediaType->getParameters());
+        $clientMediaType = new ClientMediaType('application', 'json', ['q' => '1.0']);
+        $this->assertSame('application', $clientMediaType->getType());
+        $this->assertSame('json', $clientMediaType->getSubtype());
+        $this->assertSame(['q' => '1.0'], $clientMediaType->getParameters());
     }
 
     public function testToString(): void
     {
-        $mediaType = new ClientMediaType('application', 'json', ['q' => '1.0']);
-
-        $this->assertSame('application/json', (string) $mediaType);
+        $clientMediaType = new ClientMediaType('application', 'json', ['q' => '1.0']);
+        $this->assertSame('application/json', (string) $clientMediaType);
     }
 }
diff --git a/tests/Entity/MediaType/ServerMediaTypeTest.php b/tests/Entity/MediaType/ServerMediaTypeTest.php
@@ -11,16 +11,14 @@ final class ServerMediaTypeTest extends TestCase
 {
     public function testConstructor(): void
     {
-        $mediaType = new ServerMediaType('application', 'json');
-
-        $this->assertSame('application', $mediaType->getType());
-        $this->assertSame('json', $mediaType->getSubtype());
+        $serverMediaType = new ServerMediaType('application', 'json');
+        $this->assertSame('application', $serverMediaType->getType());
+        $this->assertSame('json', $serverMediaType->getSubtype());
     }
 
     public function testToString(): void
     {
-        $mediaType = new ServerMediaType('application', 'json');
-
-        $this->assertSame('application/json', (string) $mediaType);
+        $serverMediaType = new ServerMediaType('application', 'json');
+        $this->assertSame('application/json', (string) $serverMediaType);
     }
 }
diff --git a/tests/Event/RoutePostRunEventTest.php b/tests/Event/RoutePostRunEventTest.php
@@ -27,7 +27,6 @@ protected function setUp(): void
     public function testConstructor(): void
     {
         $event = new RoutePostRunEvent($this->routeMock, $this->serverRequestMock, $this->responseMock);
-
         $this->assertSame($this->routeMock, $event->getRoute());
         $this->assertSame($this->serverRequestMock, $event->getRequest());
         $this->assertSame($this->responseMock, $event->getResponse());
@@ -36,11 +35,7 @@ public function testConstructor(): void
     public function testSetResponse(): void
     {
         $event = new RoutePostRunEvent($this->routeMock, $this->serverRequestMock, $this->responseMock);
-
-        $newResponse = clone $this->responseMock;
-        $this->assertNotSame($this->responseMock, $newResponse);
-
-        $event->setResponse($newResponse);
+        $event->setResponse($newResponse = clone $this->responseMock);
         $this->assertSame($newResponse, $event->getResponse());
     }
 }
diff --git a/tests/Event/RoutePreRunEventTest.php b/tests/Event/RoutePreRunEventTest.php
@@ -24,19 +24,14 @@ protected function setUp(): void
     public function testConstructor(): void
     {
         $event = new RoutePreRunEvent($this->routeMock, $this->serverRequestMock);
-
         $this->assertSame($this->routeMock, $event->getRoute());
         $this->assertSame($this->serverRequestMock, $event->getRequest());
     }
 
     public function testSetRequest(): void
     {
         $event = new RoutePreRunEvent($this->routeMock, $this->serverRequestMock);
-
-        $newServerRequest = clone $this->serverRequestMock;
-        $this->assertNotSame($this->serverRequestMock, $newServerRequest);
-
-        $event->setRequest($newServerRequest);
+        $event->setRequest($newServerRequest = clone $this->serverRequestMock);
         $this->assertSame($newServerRequest, $event->getRequest());
     }
 }