8000 [String] Add AbstractString::containsAny() by nicolas-grekas · Pull Request #35936 · symfony/symfony · GitHub
[go: up one dir, main page]
Skip to content

[String] Add AbstractString::containsAny() #35936

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

Merged
merged 1 commit into from
Mar 16, 2020
Merged

[String] Add AbstractString::containsAny() #35936

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
[String] Add AbstractString::containsAny()
  • Loading branch information
@nicolas-grekas
nicolas-grekas committed Mar 3, 2020
commit de79ae7f35eba45e8a5c26d875ead93b08290553
8 changes: 8 additions & 0 deletions src/Symfony/Component/String/AbstractString.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,6 +254,14 @@ public function collapseWhitespace(): self
return $str;
}

/**
* @param string|string[] $needle
*/
public function containsAny($needle): bool
{
return null !== $this->indexOf($needle);
}

/**
* @param string|string[] $suffix
*/
Expand Down
1 change: 1 addition & 0 deletions src/Symfony/Component/String/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ CHANGELOG
* added the `s()` helper method to get either an `UnicodeString` or `ByteString` instance,
depending of the input string UTF-8 compliancy
* added `$cut` parameter to `Symfony\Component\String\AbstractString::truncate()`
* added `AbstractString::containsAny()`

5.0.0
-----
Expand Down
26 changes: 24 additions & 2 deletions src/Symfony/Component/String/Tests/AbstractAsciiTestCase.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,26 @@ public static function provideBytesAt(): array
];
}

/**
* @dataProvider provideIndexOf
*/
public function testContainsAny(?int $result, string $string, $needle)
{
$instance = static::createFromString($string);

$this->assertSame(null !== $instance->indexOf($needle), $instance->containsAny($needle));
Copy link
Contributor

Choose a reason for hiding this comment

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

Does copy pasting the method content here actually test something? Shouldn't we create dedicated providers for this new methods?

Copy link
Member Author
@nicolas-grekas nicolas-grekas Mar 3, 2020 •
edited
Loading

Choose a reason for hiding this comment

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

It's better this way to me, easier to maintain.

}

/**
* @dataProvider provideIndexOfIgnoreCase
*/
public function testContainsAnyIgnoreCase(?int $result, string $string, $needle)
{
$instance = static::createFromString($string);

$this->assertSame(null !== $instance->ignoreCase()->indexOf($needle), $instance->ignoreCase()->containsAny($needle));
}

public function testUnwrap()
{
$expected = ['hello', 'world'];
Expand Down Expand Up @@ -161,7 +181,7 @@ public static function provideLength(): array
/**
* @dataProvider provideIndexOf
*/
public function testIndexOf(?int $result, string $string, string $needle, int $offset)
public function testIndexOf(?int $result, string $string, $needle, int $offset)
{
$instance = static::createFromString($string);

Expand All @@ -180,6 +200,7 @@ public static function provideIndexOf(): array
[null, 'abc', 'a', -1],
[null, '123abc', 'B', -3],
[null, '123abc', 'b', 6],
[0, 'abc', ['a', 'e'], 0],
[0, 'abc', 'a', 0],
[1, 'abc', 'b', 1],
[2, 'abc', 'c', 1],
Expand All @@ -191,7 +212,7 @@ public static function provideIndexOf(): array
/**
* @dataProvider provideIndexOfIgnoreCase
*/
public function testIndexOfIgnoreCase(?int $result, string $string, string $needle, int $offset)
public function testIndexOfIgnoreCase(?int $result, string $string, $needle, int $offset)
{
$instance = static::createFromString($string);

Expand All @@ -208,6 +229,7 @@ public static function provideIndexOfIgnoreCase(): array
[null, 'abc', 'a', -1],
[null, 'abc', 'A', -1],
[null, '123abc', 'B', 6],
[0, 'ABC', ['a', 'e'], 0],
[0, 'ABC', 'a', 0],
[0, 'ABC', 'A', 0],
[1, 'ABC', 'b', 0],
Expand Down
0