Skip to content

Support nullOrAllUuid and nullOrAllIsInstanceOf #312

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.

Sign up for GitHub

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Support nullOrAllUuid and nullOrAllIsInstanceOf #312

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 10 additions & 0 deletions src/Assert.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -415,6 +415,16 @@ public static function isIterable($value, $message = '')
}
}

public static function isIterableOrNull($value, $message = '')
{
if (!\is_array($value) && !($value instanceof Traversable) && $value !== null) {
static::reportInvalidArgument(\sprintf(
$message ?: 'Expected an iterable or null. Got: %s',
static::typeToString($value)
));
}
}

/**
* @psalm-pure
*
Expand Down
18 changes: 18 additions & 0 deletions src/Mixin.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5207,4 +5207,22 @@ public static function allNullOrThrows($expression, $class = 'Exception', $messa
null === $entry || static::throws($entry, $class, $message);
}
}

public static function nullOrAllUuid($value, $message = '')
{
static::isIterableOrNull($value);

foreach ($value ?? [] as $entry) {
null === $entry || static::uuid($entry, $message);
}
}

public static function nullOrAllIsInstanceOf($value, $class, $message = '')
{
static::isIterableOrNull($value);

foreach ($value ?? [] as $entry) {
Copy link
Collaborator

@shadowhand shadowhand Mar 19, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This isn't allowed here, we need to have PHP 7.4 compatibility I believe.

static::isInstanceOf($entry, $class, $message);
}
}
}
26 changes: 26 additions & 0 deletions tests/AssertTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -849,6 +849,32 @@ public function testEnumAssertionErrorMessage(): void

Assert::null(TestEnum::CaseName, 'Expected null. Got: %s');
}

public function testNullOrAllUuid(): void
{
$uuids = [
'5ff2b9b4-7692-4330-8ca9-eda6a5681774',
'bc87-1005f1a8-479a-a094-b51a4962f3a3',
];

$this->expectException('\InvalidArgumentException');
$this->expectExceptionMessage('Value "bc87-1005f1a8-479a-a094-b51a4962f3a3" is not a valid UUID');

Assert::nullOrAllUuid($uuids);
}

public function testNullOrAllIsInstanceOf(): void
{
$objects = [
new DummyClass(),
new StdClass(),
];

$this->expectException('\InvalidArgumentException');
$this->expectExceptionMessage('Expected an instance of Webmozart\Assert\Tests\DummyClass. Got: stdClass');

Assert::nullOrAllIsInstanceOf($objects, DummyClass::class);
}
}

/**
Expand Down
8 changes: 8 additions & 0 deletions tests/DummyClass.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?php

namespace Webmozart\Assert\Tests;

class DummyClass
{

}
Loading