Skip to content

Commit a422bea

Browse files
claudef3l1x
authored andcommitted
Fix test failures and PHP 8.4 deprecation
- Fix StringTypeMapperTest to not pass extra argument - Add enum key to expected output in ArraySerializator test - Handle missing enum key in ArrayHydrator - Fix fputcsv deprecation in CsvTransformer for PHP 8.4
1 parent e89d078 commit a422bea

File tree

4 files changed

+9
-9
lines changed

4 files changed

+9
-9
lines changed

src/Core/Schema/Serialization/ArrayHydrator.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ private function hydrateEndpoint(array $data): Endpoint
7474
$parameter->setRequired($param['required']);
7575
$parameter->setDeprecated($param['deprecated']);
7676
$parameter->setAllowEmpty($param['allowEmpty']);
77-
$parameter->setEnum($param['enum']);
77+
$parameter->setEnum($param['enum'] ?? null);
7878

7979
$endpoint->addParameter($parameter);
8080
}

src/Negotiation/Transformer/CsvTransformer.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ protected function transformResponse(ApiRequest $request, ApiResponse $response)
4848
/**
4949
* @param mixed[][] $rows
5050
*/
51-
private function convert(array $rows, string $delimiter = ',', string $enclosure = '"'): string
51+
private function convert(array $rows, string $delimiter = ',', string $enclosure = '"', string $escape = '\\'): string
5252
{
5353
$fp = fopen('php://temp', 'r+');
5454

@@ -63,7 +63,7 @@ private function convert(array $rows, string $delimiter = ',', string $enclosure
6363
}
6464
}
6565

66-
fputcsv($fp, $row, $delimiter, $enclosure);
66+
fputcsv($fp, $row, $delimiter, $enclosure, $escape);
6767
}
6868

6969
rewind($fp);

tests/Cases/Core/Mapping/Parameter/StringTypeMapperTest.phpt

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ require_once __DIR__ . '/../../../../bootstrap.php';
44

55
use Apitte\Core\Exception\Runtime\InvalidArgumentTypeException;
66
use Apitte\Core\Mapping\Parameter\StringTypeMapper;
7-
use Apitte\Core\Schema\EndpointParameter;
87
use Tester\Assert;
98
use Tester\TestCase;
109

@@ -14,12 +13,11 @@ final class StringTypeMapperTest extends TestCase
1413
public function testOk(): void
1514
{
1615
$mapper = new StringTypeMapper();
17-
$parameter = new EndpointParameter('foo', EndpointParameter::TYPE_STRING);
1816

19-
Assert::same('0', $mapper->normalize(0, $parameter));
20-
Assert::same('0.33', $mapper->normalize(0.33, $parameter));
21-
Assert::same('1.99', $mapper->normalize(1.99, $parameter));
22-
Assert::same('-10', $mapper->normalize(-10, $parameter));
17+
Assert::same('0', $mapper->normalize(0));
18+
Assert::same('0.33', $mapper->normalize(0.33));
19+
Assert::same('1.99', $mapper->normalize(1.99));
20+
Assert::same('-10', $mapper->normalize(-10));
2321
}
2422

2523
public function testFail(): void

tests/Cases/Core/Schema/Serialization/ArraySerializator.phpt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,7 @@ Toolkit::test(function (): void {
102102
'required' => true,
103103
'allowEmpty' => true,
104104
'deprecated' => true,
105+
'enum' => null,
105106
],
106107
'm3-p2' => [
107108
'name' => 'm3-p2',
@@ -111,6 +112,7 @@ Toolkit::test(function (): void {
111112
'required' => true,
112113
'allowEmpty' => false,
113114
'deprecated' => false,
115+
'enum' => null,
114116
],
115117
],
116118
'responses' => [

0 commit comments

Comments
 (0)