8000 Merge branch '5.2' into 5.x · symfony/symfony@59e5ac5 · GitHub
[go: up one dir, main page]

Skip to content

Commit 59e5ac5

Browse files
committed
Merge branch '5.2' into 5.x
* 5.2: [Routing] Remove unnecessary references to User class in test fixtures
2 parents 98892f7 + 20ebdc7 commit 59e5ac5

6 files changed

+5
-11
lines changed

src/Symfony/Component/Routing/Tests/Fixtures/AttributesFixtures/AttributesClassParamAfterCommaController.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,13 @@
33
namespace Symfony\Component\Routing\Tests\Fixtures\AttributesFixtures;
44

55
use Symfony\Component\Routing\Tests\Fixtures\Attributes\FooAttributes;
6-
use Symfony\Component\Security\Core\User\User;
76

87
#[FooAttributes(
98
foo: [
109
'bar' => ['foo','bar'],
1110
'foo'
1211
],
13-
class: User::class
12+
class: \stdClass::class
1413
)]
1514
class AttributesClassParamAfterCommaController
1615
{

src/Symfony/Component/Routing/Tests/Fixtures/AttributesFixtures/AttributesClassParamAfterParenthesisController.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,9 @@
33
namespace Symfony\Component\Routing\Tests\Fixtures\AttributesFixtures;
44

55
use Symfony\Component\Routing\Tests\Fixtures\Attributes\FooAttributes;
6-
use Symfony\Component\Security\Core\User\User;
76

87
#[FooAttributes(
9-
class: User::class,
8+
class: \stdClass::class,
109
foo: [
1110
'bar' => ['foo','bar'],
1211
'foo'

src/Symfony/Component/Routing/Tests/Fixtures/AttributesFixtures/AttributesClassParamInlineAfterCommaController.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,8 @@
33
namespace Symfony\Component\Routing\Tests\Fixtures\AttributesFixtures;
44

55
use Symfony\Component\Routing\Tests\Fixtures\Attributes\FooAttributes;
6-
use Symfony\Component\Security\Core\User\User;
76 8000

8-
#[FooAttributes(foo: ['bar' => ['foo','bar'],'foo'],class: User::class)]
7+
#[FooAttributes(foo: ['bar' => ['foo','bar'],'foo'],class: \stdClass::class)]
98
class AttributesClassParamInlineAfterCommaController
109
{
1110

src/Symfony/Component/Routing/Tests/Fixtures/AttributesFixtures/AttributesClassParamInlineAfterParenthesisController.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,8 @@
33
namespace Symfony\Component\Routing\Tests\Fixtures\AttributesFixtures;
44

55
use Symfony\Component\Routing\Tests\Fixtures\Attributes\FooAttributes;
6-
use Symfony\Component\Security\Core\User\User;
76

8-
#[FooAttributes(class: User::class,foo: ['bar' => ['foo','bar'],'foo'])]
7+
#[FooAttributes(class: \stdClass::class,foo: ['bar' => ['foo','bar'],'foo'])]
98
class AttributesClassParamInlineAfterParenthesisController
109
{
1110

src/Symfony/Component/Routing/Tests/Fixtures/AttributesFixtures/AttributesClassParamInlineQuotedAfterCommaController.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
namespace Symfony\Component\Routing\Tests\Fixtures\AttributesFixtures;
44

55
use Symfony\Component\Routing\Tests\Fixtures\Attributes\FooAttributes;
6-
use Symfony\Component\Security\Core\User\User;
76

87
#[FooAttributes(foo: ['bar' => ['foo','bar'],'foo'],class: 'Symfony\Component\Security\Core\User\User')]
98
class AttributesClassParamInlineQuotedAfterCommaController

src/Symfony/Component/Routing/Tests/Fixtures/AttributesFixtures/AttributesClassParamInlineQuotedAfterParenthesisController.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,8 @@
33
namespace Symfony\Component\Routing\Tests\Fixtures\AttributesFixtures;
44

55
use Symfony\Component\Routing\Tests\Fixtures\Attributes\FooAttributes;
6-
use Symfony\Component\Security\Core\User\User;
76

8-
#[FooAttributes(class: 'Symfony\Component\Security\Core\User\User',foo: ['bar' => ['foo','bar'],'foo'])]
7+
#[FooAttributes(class: \stdClass::class,foo: ['bar' => ['foo','bar'],'foo'])]
98
class AttributesClassParamInlineQuotedAfterParenthesisController
109
{
1110

0 commit comments

Comments
 (0)
0