Skip to content

Commit 461ef69

Browse files
committed
Add new filters from v0.7.1
1 parent 266b722 commit 461ef69

File tree

4 files changed

+13
-7
lines changed

4 files changed

+13
-7
lines changed

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"require": {
2323
"php": "^7.2",
2424
"symfony/dependency-injection": "^4.0",
25-
"squirrelphp/strings": "^0.7"
25+
"squirrelphp/strings": "^0.7.1"
2626
},
2727
"require-dev": {
2828
"captainhook/plugin-composer": "^4.0",

src/DependencyInjection/Compiler/StringFilterPass.php

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,15 @@
1212
use Squirrel\Strings\Filter\LowercaseFilter;
1313
use Squirrel\Strings\Filter\NormalizeLettersToAsciiFilter;
1414
use Squirrel\Strings\Filter\NormalizeNewlinesToUnixStyleFilter;
15+
use Squirrel\Strings\Filter\NormalizeToAlphanumericFilter;
16+
use Squirrel\Strings\Filter\RemoveEmailsFilter;
1517
use Squirrel\Strings\Filter\RemoveExcessSpacesFilter;
1618
use Squirrel\Strings\Filter\RemoveHTMLTagsFilter;
1719
use Squirrel\Strings\Filter\RemoveNonAlphanumericFilter;
1820
use Squirrel\Strings\Filter\RemoveNonAsciiAndControlCharactersFilter;
1921
use Squirrel\Strings\Filter\RemoveNonNumericFilter;
2022
use Squirrel\Strings\Filter\RemoveNonUTF8CharactersFilter;
23+
use Squirrel\Strings\Filter\RemoveURLsFilter;
2124
use Squirrel\Strings\Filter\ReplaceNewlinesWithParagraphsAndBreaksFilter;
2225
use Squirrel\Strings\Filter\ReplaceNewlinesWithSpacesFilter;
2326
use Squirrel\Strings\Filter\ReplaceNonAlphanumericFilter;
@@ -56,12 +59,15 @@ class StringFilterPass implements CompilerPassInterface
5659
LowercaseFilter::class,
5760
NormalizeLettersToAsciiFilter::class,
5861
NormalizeNewlinesToUnixStyleFilter::class,
62+
NormalizeToAlphanumericFilter::class,
5963
RemoveExcessSpacesFilter::class,
64+
RemoveEmailsFilter::class,
6065
RemoveHTMLTagsFilter::class,
6166
RemoveNonAlphanumericFilter::class,
6267
RemoveNonAsciiAndControlCharactersFilter::class,
6368
RemoveNonNumericFilter::class,
6469
RemoveNonUTF8CharactersFilter::class,
70+
RemoveURLsFilter::class,
6571
ReplaceNewlinesWithParagraphsAndBreaksFilter::class,
6672
ReplaceNewlinesWithSpacesFilter::class,
6773
'ReplaceNonAlphanumericWithDash' => ReplaceNonAlphanumericFilter::class,

tests/ExtensionPassTest.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ public function testNoFormNoTwig()
2121

2222
$this->processCompilerPass($container);
2323

24-
// service container + filter selector + 28 default filters + random selector + 4 generators
24+
// service container + filter selector + 31 default filters + random selector + 4 generators
2525
// + annotation processor
26-
$this->assertEquals(36, \count($container->getDefinitions()));
26+
$this->assertEquals(39, \count($container->getDefinitions()));
2727

2828
// Make sure all definitions exist that we expect
2929
$this->assertTrue($container->hasDefinition(StringFilterSelectInterface::class));
@@ -41,9 +41,9 @@ public function testFormAndTwig()
4141

4242
$this->processCompilerPass($container);
4343

44-
// service container + filter selector + 28 default filters + random selector + 4 generators
44+
// service container + filter selector + 31 default filters + random selector + 4 generators
4545
// + annotation processor + form type extension + twig extension + form.factory + twig
46-
$this->assertEquals(40, \count($container->getDefinitions()));
46+
$this->assertEquals(43, \count($container->getDefinitions()));
4747

4848
// Make sure all definitions exist that we expect
4949
$this->assertTrue($container->hasDefinition(StringFilterSelectInterface::class));

tests/StringFilterPassTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public function testDefault()
2020
$this->processCompilerPass($container);
2121

2222
// service container + selector + 28 default filters
23-
$this->assertEquals(30, \count($container->getDefinitions()));
23+
$this->assertEquals(33, \count($container->getDefinitions()));
2424

2525
// Make sure all definitions exist that we expect
2626
$this->assertTrue($container->hasDefinition(StringFilterSelectInterface::class));
@@ -31,7 +31,7 @@ public function testDefault()
3131

3232
$argument = $definition->getArgument(0);
3333

34-
$this->assertEquals(28, \count($argument));
34+
$this->assertEquals(31, \count($argument));
3535

3636
$container->compile();
3737
}

0 commit comments

Comments
 (0)