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

Appearance settings

Commit 59cc26c

Browse filesBrowse files
Merge branch '6.3' into 6.4
* 6.3: Fix merge (bis) Fix merge
2 parents af74d12 + d9f15e0 commit 59cc26c
Copy full SHA for 59cc26c

File tree

Expand file treeCollapse file tree

2 files changed

+6
-6
lines changed
Filter options
Expand file treeCollapse file tree

2 files changed

+6
-6
lines changed

‎src/Symfony/Bridge/Twig/Tests/Mime/NotificationEmailTest.php

Copy file name to clipboardExpand all lines: src/Symfony/Bridge/Twig/Tests/Mime/NotificationEmailTest.php
+3-3Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ public function testContext()
142142
'action_url' => null,
143143
'markdown' => false,
144144
'raw' => false,
145-
'footer_text' => 'Notification e-mail sent by Symfony',
145+
'footer_text' => 'Notification email sent by Symfony',
146146
'some' => 'context',
147147
], $email->getContext());
148148

@@ -158,7 +158,7 @@ public function testContext()
158158
'action_url' => null,
159159
'markdown' => false,
160160
'raw' => false,
161-
'footer_text' => 'Notification e-mail sent by Symfony',
161+
'footer_text' => 'Notification email sent by Symfony',
162162
'some' => 'context',
163163
'foo' => 'bar',
164164
], $email->getContext());
@@ -173,7 +173,7 @@ public function testContext()
173173
'action_url' => 'Action URL',
174174
'markdown' => false,
175175
'raw' => false,
176-
'footer_text' => 'Notification e-mail sent by Symfony',
176+
'footer_text' => 'Notification email sent by Symfony',
177177
'some' => 'context',
178178
'foo' => 'bar',
179179
], $email->getContext());

‎src/Symfony/Component/Serializer/Tests/Normalizer/AbstractObjectNormalizerTest.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Serializer/Tests/Normalizer/AbstractObjectNormalizerTest.php
+3-3Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -931,7 +931,7 @@ protected function extractAttributes(object $object, string $format = null, arra
931931
return array_keys((array) $object);
932932
}
933933

934-
protected function getAttributeValue(object $object, string $attribute, string $format = null, array $context = [])
934+
protected function getAttributeValue(object $object, string $attribute, string $format = null, array $context = []): mixed
935935
{
936936
return $object->{$attribute};
937937
}
@@ -971,7 +971,7 @@ protected function extractAttributes(object $object, string $format = null, arra
971971
return array_keys((array) $object);
972972
}
973973

974-
protected function getAttributeValue(object $object, string $attribute, string $format = null, array $context = [])
974+
protected function getAttributeValue(object $object, string $attribute, string $format = null, array $context = []): mixed
975975
{
976976
return $object->{$attribute};
977977
}
@@ -1006,7 +1006,7 @@ protected function extractAttributes(object $object, string $format = null, arra
10061006
return array_keys((array) $object);
10071007
}
10081008

1009-
protected function getAttributeValue(object $object, string $attribute, string $format = null, array $context = [])
1009+
protected function getAttributeValue(object $object, string $attribute, string $format = null, array $context = []): mixed
10101010
{
10111011
return $object->{$attribute};
10121012
}

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.