Skip to content

Commit 4272799

Browse files
committed
Merge branch '6.0' into 6.1
* 6.0: [WebProfilerBundle] Fixes HTML syntax regression introduced by #44570 Bump Symfony version to 6.0.6 Update VERSION for 6.0.5 Update CHANGELOG for 6.0.5 Bump Symfony version to 5.4.6 Update VERSION for 5.4.5 Update CHANGELOG for 5.4.5 Bump Symfony version to 4.4.39 Update VERSION for 4.4.38 Update CONTRIBUTORS for 4.4.38 Update CHANGELOG for 4.4.38 [Filesystem] Replace occurrences of `operation system` to `operating system`
2 parents 371ac55 + 6646c13 commit 4272799

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

Path.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -183,11 +183,11 @@ public static function getDirectory(string $path): string
183183
* - UNIX
184184
* - Windows8 and upper
185185
*
186-
* If your operation system or environment isn't supported, an exception is thrown.
186+
* If your operating system or environment isn't supported, an exception is thrown.
187187
*
188188
* The result is a canonical path.
189189
*
190-
* @throws RuntimeException If your operation system or environment isn't supported
190+
* @throws RuntimeException If your operating system or environment isn't supported
191191
*/
192192
public static function getHomeDirectory(): string
193193
{
@@ -201,7 +201,7 @@ public static function getHomeDirectory(): string
201201
return self::canonicalize(getenv('HOMEDRIVE').getenv('HOMEPATH'));
202202
}
203203

204-
throw new RuntimeException("Cannot find the home directory path: Your environment or operation system isn't supported.");
204+
throw new RuntimeException("Cannot find the home directory path: Your environment or operating system isn't supported.");
205205
}
206206

207207
/**

Tests/PathTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1024,10 +1024,10 @@ public function testJoinVarArgs()
10241024
$this->assertSame('/path/to/test/subdir', Path::join('/path', 'to', '/test', 'subdir/'));
10251025
}
10261026

1027-
public function testGetHomeDirectoryFailsIfNotSupportedOperationSystem()
1027+
public function testGetHomeDirectoryFailsIfNotSupportedOperatingSystem()
10281028
{
10291029
$this->expectException(\RuntimeException::class);
1030-
$this->expectExceptionMessage('Your environment or operation system isn\'t supported');
1030+
$this->expectExceptionMessage('Your environment or operating system isn\'t supported');
10311031

10321032
putenv('HOME=');
10331033

0 commit comments

Comments
 (0)