Skip to content

Commit

Permalink
Merge branch '6.4' into 7.0
Browse files Browse the repository at this point in the history
* 6.4:
  [DependencyInjection] Remove inaccurate `@throws` on `Container::get()`
  Add annotation -> attribute aliases
  • Loading branch information
nicolas-grekas committed Oct 30, 2023
2 parents 9e7c1b8 + 40d8bea commit 33bfa56
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion Tests/Fixtures/Dummy.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

namespace Symfony\Component\PropertyInfo\Tests\Fixtures;

use Symfony\Component\Serializer\Annotation\Groups;
use Symfony\Component\Serializer\Attribute\Groups;

/**
* @author Kévin Dunglas <dunglas@gmail.com>
Expand Down
4 changes: 2 additions & 2 deletions Tests/Fixtures/IgnorePropertyDummy.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@

namespace Symfony\Component\PropertyInfo\Tests\Fixtures;

use Symfony\Component\Serializer\Annotation\Groups;
use Symfony\Component\Serializer\Annotation\Ignore;
use Symfony\Component\Serializer\Attribute\Groups;
use Symfony\Component\Serializer\Attribute\Ignore;

/**
* @author Vadim Borodavko <vadim.borodavko@gmail.com>
Expand Down

0 comments on commit 33bfa56

Please sign in to comment.