Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add Assert::numericString() #255

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,6 @@ jobs:
strategy:
matrix:
php-version:
- "7.2"
- "7.3"
- "7.4"
- "8.0"
- "8.1"
Expand Down
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ Changelog

## UNRELEASED

* Added `Assert::numericString()`

## 1.11.0

### Added
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ Method | Description
-------------------------------------------------------- | --------------------------------------------------
`string($value, $message = '')` | Check that a value is a string
`stringNotEmpty($value, $message = '')` | Check that a value is a non-empty string
`numericString($value, $message = '')` | Check that a value is a numeric-string
`integer($value, $message = '')` | Check that a value is an integer
`integerish($value, $message = '')` | Check that a value casts to an integer
`positiveInteger($value, $message = '')` | Check that a value is a positive (non-zero) integer
Expand Down
20 changes: 20 additions & 0 deletions src/Assert.php
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,26 @@ public static function string($value, $message = '')
}
}

/**
* @psalm-pure
* @psalm-assert numeric-string $value
*
* @param mixed $value
*
* @throws InvalidArgumentException
*/
public static function numericString($value, string $message = ''): void
{
static::string($value, $message ?: 'Expected a numeric string. Got: %s');

if (!\is_numeric($value)) {
static::reportInvalidArgument(\sprintf(
$message ?: 'Expected a numeric string. Got: %s',
static::typeToString($value)
));
}
}

/**
* @psalm-pure
* @psalm-assert non-empty-string $value
Expand Down
53 changes: 53 additions & 0 deletions src/Mixin.php
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,59 @@ public static function allNullOrString($value, $message = '')
}
}

/**
* @psalm-pure
* @psalm-assert numeric-string|null $value
*
* @param mixed $value
*
* @throws InvalidArgumentException
*
* @return void
*/
public static function nullOrNumericString($value, $message = '')
{
null === $value || static::numericString($value, $message);
}

/**
* @psalm-pure
* @psalm-assert iterable<numeric-string> $value
*
* @param mixed $value
*
* @throws InvalidArgumentException
*
* @return void
*/
public static function allNumericString($value, $message = '')
{
static::isIterable($value);

foreach ($value as $entry) {
static::numericString($entry, $message);
}
}

/**
* @psalm-pure
* @psalm-assert iterable<numeric-string|null> $value
*
* @param mixed $value
*
* @throws InvalidArgumentException
*
* @return void
*/
public static function allNullOrNumericString($value, $message = '')
{
static::isIterable($value);

foreach ($value as $entry) {
null === $entry || static::numericString($entry, $message);
}
}

/**
* @psalm-pure
* @psalm-assert non-empty-string|null $value
Expand Down
47 changes: 47 additions & 0 deletions tests/static-analysis/assert-numericString.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
<?php

namespace Webmozart\Assert\Tests\StaticAnalysis;

use Webmozart\Assert\Assert;

/**
* @psalm-pure
*
* @param mixed $value
*
* @return numeric-string
*/
function numericString($value): string
{
Assert::numericString($value);

return $value;
}

/**
* @psalm-pure
*
* @param mixed $value
*
* @return numeric-string|null
*/
function nullOrNumericString($value): ?string
{
Assert::nullOrNumericString($value);

return $value;
}

/**
* @psalm-pure
*
* @param mixed $value
*
* @return iterable<numeric-string>
*/
function allNumericString($value): iterable
{
Assert::allNumericString($value);

return $value;
}
Loading