diff --git a/composer.lock b/composer.lock
index e4713c1d..32e8c5ba 100644
--- a/composer.lock
+++ b/composer.lock
@@ -8,16 +8,16 @@
"packages": [
{
"name": "laminas/laminas-filter",
- "version": "2.39.0",
+ "version": "2.40.0",
"source": {
"type": "git",
"url": "https://github.com/laminas/laminas-filter.git",
- "reference": "515f081cdbea90721bfbffdd15184564b256478e"
+ "reference": "9b32ba7c45a302ed349bf42061308e854d56e75b"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/laminas/laminas-filter/zipball/515f081cdbea90721bfbffdd15184564b256478e",
- "reference": "515f081cdbea90721bfbffdd15184564b256478e",
+ "url": "https://api.github.com/repos/laminas/laminas-filter/zipball/9b32ba7c45a302ed349bf42061308e854d56e75b",
+ "reference": "9b32ba7c45a302ed349bf42061308e854d56e75b",
"shasum": ""
},
"require": {
@@ -83,7 +83,7 @@
"type": "community_bridge"
}
],
- "time": "2024-10-31T21:18:49+00:00"
+ "time": "2025-01-06T21:36:57+00:00"
},
{
"name": "laminas/laminas-servicemanager",
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
index 048e7943..ba59ba7d 100644
--- a/psalm-baseline.xml
+++ b/psalm-baseline.xml
@@ -105,6 +105,13 @@
+
+ [$serviceName, $service, $instanceOf]
diff --git a/test/InputFilterAbstractServiceFactoryTest.php b/test/InputFilterAbstractServiceFactoryTest.php
index 8924ddb6..6d079a58 100644
--- a/test/InputFilterAbstractServiceFactoryTest.php
+++ b/test/InputFilterAbstractServiceFactoryTest.php
@@ -7,14 +7,12 @@
use Laminas\Filter;
use Laminas\Filter\FilterChain;
use Laminas\Filter\FilterPluginManager;
-use Laminas\InputFilter\FileInput;
use Laminas\InputFilter\InputFilter;
use Laminas\InputFilter\InputFilterAbstractServiceFactory;
use Laminas\InputFilter\InputFilterInterface;
use Laminas\InputFilter\InputFilterPluginManager;
use Laminas\InputFilter\InputInterface;
use Laminas\ServiceManager\ServiceManager;
-use Laminas\Validator;
use Laminas\Validator\ValidatorChain;
use Laminas\Validator\ValidatorInterface;
use Laminas\Validator\ValidatorPluginManager;
@@ -23,7 +21,10 @@
use PHPUnit\Framework\Attributes\Depends;
use PHPUnit\Framework\TestCase;
+use function assert;
use function call_user_func_array;
+use function is_string;
+use function strrev;
#[CoversClass(InputFilterAbstractServiceFactory::class)]
class InputFilterAbstractServiceFactoryTest extends TestCase
@@ -220,7 +221,20 @@ public function testAllowsPassingNonPluginManagerContainerToFactoryWithServiceMa
*/
public function testWillUseCustomFiltersWhenProvided(): void
{
- $filter = $this->createMock(Filter\FilterInterface::class);
+ $filter = new class implements Filter\FilterInterface
+ {
+ public function filter(mixed $value): string
+ {
+ assert(is_string($value));
+
+ return strrev($value);
+ }
+
+ public function __invoke(mixed $value): string
+ {
+ return $this->filter($value);
+ }
+ };
$filters = new FilterPluginManager($this->services);
$filters->setService('CustomFilter', $filter);
@@ -234,31 +248,9 @@ public function testWillUseCustomFiltersWhenProvided(): void
'input_filter_specs' => [
'test' => [
[
- 'name' => 'a-file-element',
- 'type' => FileInput::class,
+ 'name' => 'value',
'required' => true,
- 'validators' => [
- [
- 'name' => Validator\File\UploadFile::class,
- 'options' => [
- 'breakchainonfailure' => true,
- ],
- ],
- [
- 'name' => Validator\File\Size::class,
- 'options' => [
- 'breakchainonfailure' => true,
- 'max' => '6GB',
- ],
- ],
- [
- 'name' => Validator\File\Extension::class,
- 'options' => [
- 'breakchainonfailure' => true,
- 'extension' => 'csv,zip',
- ],
- ],
- ],
+ 'validators' => [],
'filters' => [
['name' => 'CustomFilter'],
],
@@ -273,14 +265,14 @@ public function testWillUseCustomFiltersWhenProvided(): void
$inputFilter = $this->services->get(InputFilterPluginManager::class)->get('test');
self::assertInstanceOf(InputFilterInterface::class, $inputFilter);
- $input = $inputFilter->get('a-file-element');
- self::assertInstanceOf(FileInput::class, $input);
+ $input = $inputFilter->get('value');
+ self::assertInstanceOf(InputInterface::class, $input);
$filters = $input->getFilterChain();
self::assertCount(1, $filters);
$callback = $filters->getFilters()->top();
- self::assertIsArray($callback);
- self::assertSame($filter, $callback[0]);
+ self::assertIsCallable($callback);
+ self::assertSame('oof', $callback('foo'));
}
}