8000 Merge branch '6.0' into 6.1 · symfony/symfony@3e763df · GitHub
[go: up one dir, main page]
Skip to content

Commit 3e763df

Browse files
fabpotfabpot
committed
Merge branch '6.0' into 6.1
* 6.0: [Mime] Fix TextPart broken after being serialized [String] CamelCase/SnakeCase on uppercase word
2 parents 4fc8274 + 07c632d commit 3e763df

File tree

5 files changed

+13
-3
lines changed

5 files changed

+13
-3
lines changed

‎src/Symfony/Component/Mime/Part/TextPart.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -202,6 +202,7 @@ public function __sleep(): array
202202
// convert resources to strings for serialization
203203
if (null !== $this->seekable) {
204204
$this->body = $this->getBody();
205+
$this->seekable = null;
205206
}
206207

207208
$this->_headers = $this->getHeaders();

‎src/Symfony/Component/Mime/Tests/Part/TextPartTest.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,8 @@ public function testSerialize()
8787
$p = new TextPart($r);
8888
$p->getHeaders()->addTextHeader('foo', 'bar');
8989
$expected = clone $p;
90-
$this->assertEquals($expected->toString(), unserialize(serialize($p))->toString());
90+
$n = unserialize(serialize($p));
91+
$this->assertEquals($expected->toString(), $p->toString());
92+
$this->assertEquals($expected->toString(), $n->toString());
9193
}
9294
}

‎src/Symfony/Component/String/AbstractUnicodeString.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ public function ascii(array $rules = []): self
159159
public function camel(): static
160160
{
161161
$str = clone $this;
162-
$str->string = str_replace(' ', '', preg_replace_callback('/\b./u', static function ($m) use (&$i) {
162+
$str->string = str_replace(' ', '', preg_replace_callback('/\b.(?![A-Z]{2,})/u', static function ($m) use (&$i) {
163163
return 1 === ++$i ? ('İ' === $m[0] ? 'i̇' : mb_strtolower($m[0], 'UTF-8')) : mb_convert_case($m[0], \MB_CASE_TITLE, 'UTF-8');
164164
}, preg_replace('/[^\pL0-9]++/u', ' ', $this->string)));
165165

‎src/Symfony/Component/String/ByteString.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,10 @@ public function append(string ...$suffix): static
103103
public function camel(): static
104104
{
105105
$str = clone $this;
106-
$str->string = lcfirst(str_replace(' ', '', ucwords(preg_replace('/[^a-zA-Z0-9\x7f-\xff]++/', ' ', $this->string))));
106+
107+
$parts = explode(' ', trim(ucwords(preg_replace('/[^a-zA-Z0-9\x7f-\xff]++/', ' ', $this->string))));
108+
$parts[0] = 1 !== \strlen($parts[0]) && ctype_upper($parts[0]) ? $parts[0] : lcfirst($parts[0]);
109+
$str->string = implode('', $parts);
107110

108111
return $str;
109112
}

‎src/Symfony/Component/String/Tests/AbstractAsciiTestCase.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1042,11 +1042,13 @@ public static function provideCamel()
10421042
return [
10431043
['', ''],
10441044
['xY', 'x_y'],
1045+
['xuYo', 'xu_yo'],
10451046
['symfonyIsGreat', 'symfony_is_great'],
10461047
['symfony5IsGreat', 'symfony_5_is_great'],
10471048
['symfonyIsGreat', 'Symfony is great'],
10481049
['symfonyIsAGreatFramework', 'Symfony is a great framework'],
10491050
['symfonyIsGREAT', '*Symfony* is GREAT!!'],
1051+
['SYMFONY', 'SYMFONY'],
10501052
];
10511053
}
10521054

@@ -1066,13 +1068,15 @@ public static function provideSnake()
10661068
['', ''],
10671069
['x_y', 'x_y'],
10681070
['x_y', 'X_Y'],
1071+
['xu_yo', 'xu_yo'],
10691072
['symfony_is_great', 'symfonyIsGreat'],
10701073
['symfony5_is_great', 'symfony5IsGreat'],
10711074
['symfony5is_great', 'symfony5isGreat'],
10721075
['symfony_is_great', 'Symfony is great'],
10731076
['symfony_is_a_great_framework', 'symfonyIsAGreatFramework'],
10741077
['symfony_is_great', 'symfonyIsGREAT'],
10751078
['symfony_is_really_great', 'symfonyIsREALLYGreat'],
1079+
['symfony', 'SYMFONY'],
10761080
];
10771081
}
10781082

0 commit comments

Comments
 (0)
0