Add non-zero-int, lowercase-string and uppercase-string types

Author: SerafimArts

src/Platform/StandardPlatform.php

@@ -41,14 +41,29 @@ public function getTypes(Direction $direction): iterable
 
         // Adds support for the "string" type
         yield new Builder\SimpleTypeBuilder(['string', \Stringable::class], Type\StringType::class);
+        if ($direction === Direction::Normalize) {
+            yield new Builder\SimpleTypeBuilder('lowercase-string', Type\StringType::class);
+            yield new Builder\SimpleTypeBuilder('uppercase-string', Type\StringType::class);
+        } else {
+            yield new Builder\SimpleTypeBuilder('lowercase-string', Type\LowercaseString::class);
+            yield new Builder\SimpleTypeBuilder('uppercase-string', Type\UppercaseString::class);
+        }
 
         // Adds support for the "int" type
         yield new Builder\IntRangeTypeBuilder(['int', 'integer']);
-        yield new Builder\PositiveIntBuilder('positive-int');
-        yield new Builder\NonPositiveIntBuilder('non-positive-int');
-        yield new Builder\NegativeIntBuilder('negative-int');
-        yield new Builder\NonNegativeIntBuilder('non-negative-int');
-        yield new Builder\NonZeroIntBuilder('non-zero-int');
+        if ($direction === Direction::Normalize) {
+            yield new Builder\SimpleTypeBuilder('positive-int', Type\IntType::class);
+            yield new Builder\SimpleTypeBuilder('non-positive-int', Type\IntType::class);
+            yield new Builder\SimpleTypeBuilder('negative-int', Type\IntType::class);
+            yield new Builder\SimpleTypeBuilder('non-negative-int', Type\IntType::class);
+            yield new Builder\SimpleTypeBuilder('non-zero-int', Type\IntType::class);
+        } else {
+            yield new Builder\PositiveIntBuilder('positive-int');
+            yield new Builder\NonPositiveIntBuilder('non-positive-int');
+            yield new Builder\NegativeIntBuilder('negative-int');
+            yield new Builder\NonNegativeIntBuilder('non-negative-int');
+            yield new Builder\SimpleTypeBuilder('non-zero-int', Type\NonZeroIntType::class);
+        }
 
         // Adds support for the "float" type
         yield new Builder\SimpleTypeBuilder(['float', 'double', 'real'], Type\FloatType::class);

src/Type/Builder/NegativeIntBuilder.php

@@ -13,7 +13,7 @@
 /**
  * @template-extends NamedTypeBuilder<IntRangeType>
  */
-final class NegativeIntBuilder extends NamedTypeBuilder
+class NegativeIntBuilder extends NamedTypeBuilder
 {
     public function build(
         TypeStatement $statement,

src/Type/Builder/NonNegativeIntBuilder.php

@@ -13,7 +13,7 @@
 /**
  * @template-extends NamedTypeBuilder<IntRangeType>
  */
-final class NonNegativeIntBuilder extends NamedTypeBuilder
+class NonNegativeIntBuilder extends NamedTypeBuilder
 {
     public function build(
         TypeStatement $statement,

src/Type/Builder/NonPositiveIntBuilder.php

@@ -13,7 +13,7 @@
 /**
  * @template-extends NamedTypeBuilder<IntRangeType>
  */
-final class NonPositiveIntBuilder extends NamedTypeBuilder
+class NonPositiveIntBuilder extends NamedTypeBuilder
 {
     public function build(
         TypeStatement $statement,

src/Type/Builder/NonZeroIntBuilder.php

@@ -13,7 +13,7 @@
 /**
  * @template-extends NamedTypeBuilder<IntRangeType>
  */
-final class PositiveIntBuilder extends NamedTypeBuilder
+class PositiveIntBuilder extends NamedTypeBuilder
 {
     public function build(
         TypeStatement $statement,

src/Type/Builder/PositiveIntBuilder.php

@@ -0,0 +1,62 @@
+<?php
+
+declare(strict_types=1);
+
+namespace TypeLang\Mapper\Type;
+
+use TypeLang\Mapper\Context\Context;
+use TypeLang\Mapper\Exception\Mapping\InvalidValueException;
+use TypeLang\Mapper\Type\Coercer\StringTypeCoercer;
+use TypeLang\Mapper\Type\Coercer\TypeCoercerInterface;
+
+/**
+ * @template-implements TypeInterface<non-empty-string>
+ */
+class LowercaseString implements TypeInterface
+{
+    public function __construct(
+        /**
+         * @var TypeCoercerInterface<string>
+         */
+        protected readonly TypeCoercerInterface $coercer = new StringTypeCoercer(),
+    ) {}
+
+    /**
+     * @phpstan-assert-if-true non-empty-string $value
+     */
+    public function match(mixed $value, Context $context): bool
+    {
+        return \is_string($value) && $this->isLowerString($value);
+    }
+
+    private function isLowerString(string $value): bool
+    {
+        if ($value === '') {
+            return true;
+        }
+
+        if (\function_exists('\\ctype_lower')) {
+            return \ctype_lower($value);
+        }
+
+        return !\preg_match('/[^a-z]/', $value);
+    }
+
+    public function cast(mixed $value, Context $context): string
+    {
+        $coerced = $value;
+
+        if (!\is_string($value) && !$context->isStrictTypesEnabled()) {
+            $coerced = $this->coercer->coerce($value, $context);
+        }
+
+        if ($this->match($coerced, $context)) {
+            return $coerced;
+        }
+
+        throw InvalidValueException::createFromContext(
+            value: $value,
+            context: $context,
+        );
+    }
+}

src/Type/LowercaseString.php

@@ -0,0 +1,62 @@
+<?php
+
+declare(strict_types=1);
+
+namespace TypeLang\Mapper\Type;
+
+use TypeLang\Mapper\Context\Context;
+use TypeLang\Mapper\Exception\Mapping\InvalidValueException;
+use TypeLang\Mapper\Type\Coercer\StringTypeCoercer;
+use TypeLang\Mapper\Type\Coercer\TypeCoercerInterface;
+
+/**
+ * @template-implements TypeInterface<non-empty-string>
+ */
+class UppercaseString implements TypeInterface
+{
+    public function __construct(
+        /**
+         * @var TypeCoercerInterface<string>
+         */
+        protected readonly TypeCoercerInterface $coercer = new StringTypeCoercer(),
+    ) {}
+
+    /**
+     * @phpstan-assert-if-true non-empty-string $value
+     */
+    public function match(mixed $value, Context $context): bool
+    {
+        return \is_string($value) && $this->isUpperString($value);
+    }
+
+    private function isUpperString(string $value): bool
+    {
+        if ($value === '') {
+            return true;
+        }
+
+        if (\function_exists('\\ctype_upper')) {
+            return \ctype_upper($value);
+        }
+
+        return !\preg_match('/[^A-Z]/', $value);
+    }
+
+    public function cast(mixed $value, Context $context): string
+    {
+        $coerced = $value;
+
+        if (!\is_string($value) && !$context->isStrictTypesEnabled()) {
+            $coerced = $this->coercer->coerce($value, $context);
+        }
+
+        if ($this->match($coerced, $context)) {
+            return $coerced;
+        }
+
+        throw InvalidValueException::createFromContext(
+            value: $value,
+            context: $context,
+        );
+    }
+}

src/Type/UppercaseString.php

@@ -20,6 +20,7 @@
 
 abstract class PlatformTestCase extends TestCase
 {
+    // v2.1
     protected const TYPES_PHPSTAN = [
         'int',
         'integer',
@@ -30,6 +31,7 @@ abstract class PlatformTestCase extends TestCase
         'non-zero-int',
         'string',
         'lowercase-string',
+        'uppercase-string',
         'literal-string',
         'class-string',
         'interface-string',
@@ -45,6 +47,7 @@ abstract class PlatformTestCase extends TestCase
         'numeric-string',
         'non-empty-string',
         'non-empty-lowercase-string',
+        'non-empty-uppercase-string',
         'truthy-string',
         'non-falsy-string',
         'non-empty-literal-string',

tests/Platform/PlatformTestCase.php

@@ -46,6 +46,9 @@ final class StandardPlatformTest extends PlatformTestCase
         'non-positive-int',
         'negative-int',
         'non-negative-int',
+        'non-zero-int',
+        'lowercase-string',
+        'uppercase-string',
         // composite
         '?int',
         'int|false',