Skip to content

Commit 3530bf0

Browse files
authored
Merge pull request #2392 from smoench/drop-symfony-versions
fixes several issues to make the CI pass again
2 parents 3b97786 + a4ad08b commit 3530bf0

15 files changed

+66
-37
lines changed

.github/workflows/continuous-integration.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -28,17 +28,9 @@ jobs:
2828
can-fail: false
2929
- php-version: 7.4
3030
composer-flags: ""
31-
symfony-require: "4.4.*"
32-
can-fail: false
33-
- php-version: 7.4
34-
composer-flags: ""
35-
symfony-require: "5.3.*"
31+
symfony-require: "5.4.*"
3632
can-fail: false
3733
coverage: yes
38-
- php-version: 7.4
39-
composer-flags: ""
40-
can-fail: false
41-
symfony-require: "5.4.*"
4234
- php-version: 8.0
4335
composer-flags: ""
4436
can-fail: false
@@ -47,7 +39,15 @@ jobs:
4739
composer-flags: ""
4840
can-fail: false
4941
symfony-require: "6.1.*"
50-
- php-version: 8.1
42+
- php-version: 8.2
43+
composer-flags: ""
44+
can-fail: false
45+
symfony-require: "6.2.*"
46+
- php-version: 8.2
47+
composer-flags: ""
48+
can-fail: false
49+
symfony-require: "6.3.*"
50+
- php-version: 8.2
5151
composer-flags: ""
5252
can-fail: false
5353

FOSRestBundle.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ class FOSRestBundle extends Bundle
3232
/**
3333
* {@inheritdoc}
3434
*/
35-
public function build(ContainerBuilder $container)
35+
public function build(ContainerBuilder $container): void
3636
{
3737
$container->addCompilerPass(new SerializerConfigurationPass());
3838
$container->addCompilerPass(new ConfigurationCheckPass(), PassConfig::TYPE_BEFORE_OPTIMIZATION, -10);

Serializer/Normalizer/FlattenExceptionNormalizer.php

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,4 +92,11 @@ public function supportsNormalization($data, $format = null, array $context = []
9292

9393
return true;
9494
}
95+
96+
public function getSupportedTypes(?string $format): array
97+
{
98+
return [
99+
FlattenException::class => false,
100+
];
101+
}
95102
}

Serializer/Normalizer/FormErrorNormalizer.php

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,4 +71,11 @@ private function convertFormToArray(FormInterface $data): array
7171

7272
return $form;
7373
}
74+
75+
public function getSupportedTypes(?string $format): array
76+
{
77+
return [
78+
FormInterface::class => false,
79+
];
80+
}
7481
}

Tests/Controller/Annotations/AbstractParamTest.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@
2323
*/
2424
class AbstractParamTest extends TestCase
2525
{
26+
private $param;
27+
2628
protected function setUp(): void
2729
{
2830
$this->param = $this->getMockForAbstractClass(AbstractParam::class);

Tests/Controller/Annotations/AbstractScalarParamTest.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@
2626
*/
2727
class AbstractScalarParamTest extends TestCase
2828
{
29+
private $param;
30+
2931
protected function setUp(): void
3032
{
3133
$this->param = $this->getMockForAbstractClass(AbstractScalarParam::class);

Tests/Controller/Annotations/FileParamTest.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@
2929
*/
3030
class FileParamTest extends TestCase
3131
{
32+
private $param;
33+
3234
protected function setUp(): void
3335
{
3436
$this->param = $this->getMockBuilder(FileParam::class)

Tests/Controller/Annotations/QueryParamTest.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@
2626
*/
2727
class QueryParamTest extends TestCase
2828
{
29+
private $param;
30+
2931
protected function setUp(): void
3032
{
3133
$this->param = $this->getMockBuilder(QueryParam::class)

Tests/Controller/Annotations/RequestParamTest.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@
2626
*/
2727
class RequestParamTest extends TestCase
2828
{
29+
private $param;
30+
2931
protected function setUp(): void
3032
{
3133
$this->param = $this->getMockBuilder(RequestParam::class)

Tests/Functional/DependencyInjectionTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ public function registerBundles(): array
6161
];
6262
}
6363

64-
public function registerContainerConfiguration(LoaderInterface $loader)
64+
public function registerContainerConfiguration(LoaderInterface $loader): void
6565
{
6666
$loader->load(function (ContainerBuilder $container) {
6767
$container->loadFromExtension('framework', [

0 commit comments

Comments
 (0)