Merge pull request #308 from oleibman/TypeResolver2

Support non-decimal-int-string

Author: jaapio

src/PseudoTypes/DecimalIntString.php

@@ -0,0 +1,39 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * This file is part of phpDocumentor.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @link      http://phpdoc.org
+ */
+
+namespace phpDocumentor\Reflection\PseudoTypes;
+
+use phpDocumentor\Reflection\PseudoType;
+use phpDocumentor\Reflection\Type;
+use phpDocumentor\Reflection\Types\String_;
+
+/**
+ * Value Object representing the type 'numeric-string'.
+ *
+ * @psalm-immutable
+ */
+final class DecimalIntString extends String_ implements PseudoType
+{
+    public function underlyingType(): Type
+    {
+        return new String_();
+    }
+
+    /**
+     * Returns a rendered output of the Type as it would be used in a DocBlock.
+     */
+    public function __toString(): string
+    {
+        return 'decimal-int-string';
+    }
+}

src/PseudoTypes/NonDecimalIntString.php

@@ -0,0 +1,39 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * This file is part of phpDocumentor.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @link      http://phpdoc.org
+ */
+
+namespace phpDocumentor\Reflection\PseudoTypes;
+
+use phpDocumentor\Reflection\PseudoType;
+use phpDocumentor\Reflection\Type;
+use phpDocumentor\Reflection\Types\String_;
+
+/**
+ * Value Object representing the type 'numeric-string'.
+ *
+ * @psalm-immutable
+ */
+final class NonDecimalIntString extends String_ implements PseudoType
+{
+    public function underlyingType(): Type
+    {
+        return new String_();
+    }
+
+    /**
+     * Returns a rendered output of the Type as it would be used in a DocBlock.
+     */
+    public function __toString(): string
+    {
+        return 'non-decimal-int-string';
+    }
+}

src/TypeResolver.php

@@ -25,6 +25,7 @@
 use phpDocumentor\Reflection\PseudoTypes\Conditional;
 use phpDocumentor\Reflection\PseudoTypes\ConditionalForParameter;
 use phpDocumentor\Reflection\PseudoTypes\ConstExpression;
+use phpDocumentor\Reflection\PseudoTypes\DecimalIntString;
 use phpDocumentor\Reflection\PseudoTypes\EnumString;
 use phpDocumentor\Reflection\PseudoTypes\False_;
 use phpDocumentor\Reflection\PseudoTypes\FloatValue;
@@ -44,6 +45,7 @@
 use phpDocumentor\Reflection\PseudoTypes\NegativeInteger;
 use phpDocumentor\Reflection\PseudoTypes\NeverReturn;
 use phpDocumentor\Reflection\PseudoTypes\NeverReturns;
+use phpDocumentor\Reflection\PseudoTypes\NonDecimalIntString;
 use phpDocumentor\Reflection\PseudoTypes\NonEmptyArray;
 use phpDocumentor\Reflection\PseudoTypes\NonEmptyList;
 use phpDocumentor\Reflection\PseudoTypes\NonEmptyLowercaseString;
@@ -155,6 +157,8 @@ final class TypeResolver
         'non-empty-lowercase-string' => NonEmptyLowercaseString::class,
         'non-empty-string' => NonEmptyString::class,
         'numeric-string' => NumericString::class,
+        'non-decimal-int-string' => NonDecimalIntString::class,
+        'decimal-int-string' => DecimalIntString::class,
         'numeric' => Numeric_::class,
         'trait-string' => TraitString::class,
         'enum-string' => EnumString::class,

tests/unit/PseudoTypes/DecimalIntStringTest.php

@@ -0,0 +1,32 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * This file is part of phpDocumentor.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @link      http://phpdoc.org
+ */
+
+namespace phpDocumentor\Reflection\PseudoTypes;
+
+use phpDocumentor\Reflection\Types\String_;
+use PHPUnit\Framework\TestCase;
+
+final class DecimalIntStringTest extends TestCase
+{
+    public function testCreate(): void
+    {
+        $type = new DecimalIntString();
+
+        $this->assertEquals(new String_(), $type->underlyingType());
+    }
+
+    public function testToString(): void
+    {
+        $this->assertSame('decimal-int-string', (string) (new DecimalIntString()));
+    }
+}

tests/unit/PseudoTypes/NonDecimalIntStringTest.php

@@ -0,0 +1,32 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * This file is part of phpDocumentor.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @link      http://phpdoc.org
+ */
+
+namespace phpDocumentor\Reflection\PseudoTypes;
+
+use phpDocumentor\Reflection\Types\String_;
+use PHPUnit\Framework\TestCase;
+
+final class NonDecimalIntStringTest extends TestCase
+{
+    public function testCreate(): void
+    {
+        $type = new NonDecimalIntString();
+
+        $this->assertEquals(new String_(), $type->underlyingType());
+    }
+
+    public function testToString(): void
+    {
+        $this->assertSame('non-decimal-int-string', (string) (new NonDecimalIntString()));
+    }
+}