Add tests for Multibyte characters and fix style

Author: Mike van Riel

phpstan.neon

@@ -1 +1,3 @@
 parameters:
+    checkGenericClassInNonGenericObjectType: false
+    checkMissingIterableValueType: false

src/TypeResolver.php

@@ -302,6 +302,8 @@ private function resolveSingleType(string $type, Context $context)
 
     /**
      * Adds a keyword to the list of Keywords and associates it with a specific Value Object.
+     *
+     * @psalm-param class-string<Type> $typeClassName
      */
     public function addKeyword(string $keyword, string $typeClassName) : void
     {

src/Types/Compound.php

@@ -14,7 +14,6 @@
 namespace phpDocumentor\Reflection\Types;
 
 use ArrayIterator;
-use InvalidArgumentException;
 use IteratorAggregate;
 use phpDocumentor\Reflection\Type;
 use function implode;
@@ -66,7 +65,7 @@ public function has(int $index) : bool
     /**
      * Tests if this compound type contains the given type.
      */
-    public function contains(Type $type): bool
+    public function contains(Type $type) : bool
     {
         foreach ($this->types as $typePart) {
             // if the type is duplicate; do not add it
@@ -94,7 +93,7 @@ public function getIterator()
         return new ArrayIterator($this->types);
     }
 
-    private function add(Type $type): void
+    private function add(Type $type) : void
     {
         // if the type is duplicate; do not add it
         if ($this->contains($type)) {

tests/unit/FqsenResolverTest.php

@@ -20,7 +20,7 @@
  * @coversDefaultClass \phpDocumentor\Reflection\FqsenResolver
  * @covers ::<private>
  */
-class FqsenResolverTest extends TestCase
+final class FqsenResolverTest extends TestCase
 {
     /**
      * @covers ::resolve
@@ -32,7 +32,20 @@ public function testResolveFqsen() : void
         $context = new Context('', []);
 
         $result = $fqsenResolver->resolve('\DocBlock', $context);
-        static::assertEquals('\DocBlock', (string) $result);
+        static::assertSame('\DocBlock', (string) $result);
+    }
+
+    /**
+     * @covers ::resolve
+     */
+    public function testResolveFqsenWithEmoji() : void
+    {
+        $fqsenResolver = new FqsenResolver();
+
+        $context = new Context('', []);
+
+        $result = $fqsenResolver->resolve('\My😁DocBlock', $context);
+        static::assertSame('\My😁DocBlock', (string) $result);
     }
 
     /**
@@ -43,7 +56,7 @@ public function testResolveWithoutContext() : void
         $fqsenResolver = new FqsenResolver();
 
         $result = $fqsenResolver->resolve('\DocBlock');
-        static::assertEquals('\DocBlock', (string) $result);
+        static::assertSame('\DocBlock', (string) $result);
     }
 
     /**
@@ -56,7 +69,7 @@ public function testResolveFromAlias() : void
         $context = new Context('somens', ['ns' => 'some\other\ns']);
 
         $result = $fqsenResolver->resolve('ns', $context);
-        static::assertEquals('\some\other\ns', (string) $result);
+        static::assertSame('\some\other\ns', (string) $result);
     }
 
     /**
@@ -69,7 +82,7 @@ public function testResolveFromPartialAlias() : void
         $context = new Context('somens', ['other' => 'some\other']);
 
         $result = $fqsenResolver->resolve('other\ns', $context);
-        static::assertEquals('\some\other\ns', (string) $result);
+        static::assertSame('\some\other\ns', (string) $result);
     }
 
     public function testResolveThrowsExceptionWhenGarbageInputIsPassed() : void

tests/unit/TypeResolverTest.php

@@ -33,8 +33,6 @@ class TypeResolverTest extends TestCase
 {
     /**
      * Call Mockery::close after each test.
-     *
-     * @phpcsSuppress SlevomatCodingStandard.TypeHints.TypeHintDeclaration.MissingReturnTypeHint
      */
     public function tearDown() : void
     {
@@ -669,6 +667,7 @@ public function provideFqcn() : array
         return [
             'namespace' => ['\phpDocumentor\Reflection'],
             'class' => ['\phpDocumentor\Reflection\DocBlock'],
+            'class with emoji' => ['\My😁Class'],
         ];
     }
 }

tests/unit/Types/CompoundTest.php

@@ -14,6 +14,8 @@
 namespace phpDocumentor\Reflection\Types;
 
 use PHPUnit\Framework\TestCase;
+use TypeError;
+use function iterator_to_array;
 
 /**
  * @coversDefaultClass \phpDocumentor\Reflection\Types\Compound
@@ -25,7 +27,7 @@ final class CompoundTest extends TestCase
      */
     public function testCompoundCannotBeConstructedFromType() : void
     {
-        $this->expectException(\TypeError::class);
+        $this->expectException(TypeError::class);
         new Compound(['foo']);
     }