Commit 228b59d
committed
[Security/Core] fix merge
1 parent 1627583 commit 228b59dCopy full SHA for 228b59d
4 files changed
+5-8Lines changed: 5 additions & 8 deletions
File tree
Expand file treeCollapse file tree
Open diff view settings
Filter options
- src/Symfony/Component/Security/Core/Authentication/Token
Expand file treeCollapse file tree
Open diff view settings
Collapse file
src/Symfony/Component/Security/Core/Authentication/Token/AbstractToken.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Security/Core/Authentication/Token/AbstractToken.php+2-2Lines changed: 2 additions & 2 deletions
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| ||
31 | 31 | |
32 | 32 | |
33 | 33 | |
34 | | - |
| 34 | + |
35 | 35 | |
36 | 36 | |
37 | 37 | |
| ||
41 | 41 | |
42 | 42 | |
43 | 43 | |
44 | | - |
| 44 | + |
45 | 45 | |
46 | 46 | |
47 | 47 | |
|
Collapse file
src/Symfony/Component/Security/Core/Authentication/Token/AnonymousToken.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Security/Core/Authentication/Token/AnonymousToken.php+1-2Lines changed: 1 addition & 2 deletions
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| ||
11 | 11 | |
12 | 12 | |
13 | 13 | |
14 | | - |
15 | 14 | |
16 | 15 | |
17 | 16 | |
| ||
26 | 25 | |
27 | 26 | |
28 | 27 | |
29 | | - |
| 28 | + |
30 | 29 | |
31 | 30 | |
32 | 31 | |
|
Collapse file
src/Symfony/Component/Security/Core/Authentication/Token/PreAuthenticatedToken.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Security/Core/Authentication/Token/PreAuthenticatedToken.php+1-2Lines changed: 1 addition & 2 deletions
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| ||
11 | 11 | |
12 | 12 | |
13 | 13 | |
14 | | - |
15 | 14 | |
16 | 15 | |
17 | 16 | |
| ||
28 | 27 | |
29 | 28 | |
30 | 29 | |
31 | | - |
| 30 | + |
32 | 31 | |
33 | 32 | |
34 | 33 | |
|
Collapse file
src/Symfony/Component/Security/Core/Authentication/Token/UsernamePasswordToken.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Security/Core/Authentication/Token/UsernamePasswordToken.php+1-2Lines changed: 1 addition & 2 deletions
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| ||
11 | 11 | |
12 | 12 | |
13 | 13 | |
14 | | - |
15 | 14 | |
16 | 15 | |
17 | 16 | |
| ||
28 | 27 | |
29 | 28 | |
30 | 29 | |
31 | | - |
| 30 | + |
32 | 31 | |
33 | 32 | |
34 | 33 | |
|
0 commit comments