Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit61a23a3

Browse files
[Serializer] Fix Serializer deprecations merge
1 parentf314f65 commit61a23a3

File tree

7 files changed

+9
-276
lines changed

7 files changed

+9
-276
lines changed

‎UPGRADE-7.0.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -547,6 +547,7 @@ Serializer
547547
// ...
548548
}
549549
```
550+
* Remove`AnnotationLoader`, use`AttributeLoader` instead
550551

551552
Templating
552553
----------

‎src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1858,9 +1858,9 @@ private function registerSerializerConfiguration(array $config, ContainerBuilder
18581858

18591859
$serializerLoaders = [];
18601860
if (isset($config['enable_attributes']) &&$config['enable_attributes']) {
1861-
$annotationLoader =newDefinition(AttributeLoader::class);
1861+
$attributeLoader =newDefinition(AttributeLoader::class);
18621862

1863-
$serializerLoaders[] =$annotationLoader;
1863+
$serializerLoaders[] =$attributeLoader;
18641864
}
18651865

18661866
$fileRecorder =function ($extension,$path)use (&$serializerLoaders) {

‎src/Symfony/Component/Serializer/CHANGELOG.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ CHANGELOG
1313
* Require explicit argument when calling`AttributeMetadata::setSerializedName()` and`ClassMetadata::setClassDiscriminatorMapping()`
1414
* Add argument`$context` to`NormalizerInterface::supportsNormalization()` and`DenormalizerInterface::supportsDenormalization()`
1515
* Remove Doctrine annotations support in favor of native attributes
16-
* Removethe annotation reader parameter from the constructor of`AnnotationLoader`
16+
* Remove`AnnotationLoader`, use`AttributeLoader` instead
1717

1818
6.4
1919
---

‎src/Symfony/Component/Serializer/Mapping/Loader/AttributeLoader.php‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,3 @@ private function getPropertyAnnotations(\ReflectionProperty $reflector): array
307307
return$annotations;
308308
}
309309
}
310-
311-
if (!class_exists(AnnotationLoader::class,false)) {
312-
class_alias(AttributeLoader::class, AnnotationLoader::class);
313-
}

‎src/Symfony/Component/Serializer/Tests/Mapping/Loader/AnnotationLoaderTest.php‎

Lines changed: 0 additions & 257 deletions
This file was deleted.

‎src/Symfony/Component/Serializer/Tests/Mapping/Loader/AttributeLoaderTestCase.php‎renamed to ‎src/Symfony/Component/Serializer/Tests/Mapping/Loader/AttributeLoaderTest.php‎

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,12 @@
1818
useSymfony\Component\Serializer\Mapping\AttributeMetadata;
1919
useSymfony\Component\Serializer\Mapping\ClassDiscriminatorMapping;
2020
useSymfony\Component\Serializer\Mapping\ClassMetadata;
21-
useSymfony\Component\Serializer\Mapping\Loader\AnnotationLoader;
2221
useSymfony\Component\Serializer\Mapping\Loader\AttributeLoader;
2322
useSymfony\Component\Serializer\Mapping\Loader\LoaderInterface;
2423
useSymfony\Component\Serializer\Tests\Fixtures\Attributes\AbstractDummy;
2524
useSymfony\Component\Serializer\Tests\Fixtures\Attributes\AbstractDummyFirstChild;
2625
useSymfony\Component\Serializer\Tests\Fixtures\Attributes\AbstractDummySecondChild;
2726
useSymfony\Component\Serializer\Tests\Fixtures\Attributes\AbstractDummyThirdChild;
28-
useSymfony\Component\Serializer\Tests\Fixtures\Attributes\BadAttributeDummy;
2927
useSymfony\Component\Serializer\Tests\Fixtures\Attributes\BadMethodContextDummy;
3028
useSymfony\Component\Serializer\Tests\Fixtures\Attributes\ContextDummyParent;
3129
useSymfony\Component\Serializer\Tests\Fixtures\Attributes\ContextDummyPromotedProperties;
@@ -46,19 +44,16 @@
4644
/**
4745
* @author Kévin Dunglas <dunglas@gmail.com>
4846
*/
49-
<<<<<<<<HEAD:src/Symfony/Component/Serializer/Tests/Mapping/Loader/AnnotationLoaderTest.php
50-
========
51-
abstract class AttributeLoaderTestCase extends TestCase
52-
>>>>>>>>6.4:src/Symfony/Component/Serializer/Tests/Mapping/Loader/AttributeLoaderTestCase.php
47+
class AttributeLoaderTestextends TestCase
5348
{
5449
use ContextMappingTestTrait;
5550
use ExpectDeprecationTrait;
5651

57-
private AnnotationLoader$loader;
52+
protectedAttributeLoader$loader;
5853

5954
protectedfunctionsetUp():void
6055
{
61-
$this->loader =newAnnotationLoader();
56+
$this->loader =newAttributeLoader();
6257
}
6358

6459
publicfunctiontestInterface()
@@ -226,9 +221,7 @@ public function testLoadGroupsOnClass()
226221
self::assertSame(['a'],$attributesMetadata['baz']->getGroups());
227222
}
228223

229-
abstractprotectedfunction createLoader():AttributeLoader;
230-
231-
protectedfunctiongetLoaderForContextMapping():AnnotationLoader
224+
protectedfunctiongetLoaderForContextMapping():AttributeLoader
232225
{
233226
return$this->loader;
234227
}

‎src/Symfony/Component/Serializer/Tests/Mapping/Loader/AttributeLoaderWithAttributesTest.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
useSymfony\Component\Serializer\Mapping\ClassMetadata;
1616
useSymfony\Component\Serializer\Mapping\Loader\AttributeLoader;
1717

18-
class AttributeLoaderWithAttributesTestextendsAttributeLoaderTestCase
18+
class AttributeLoaderWithAttributesTestextendsAttributeLoaderTest
1919
{
2020
protectedfunctioncreateLoader():AttributeLoader
2121
{

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp