Skip to content

Commit

Permalink
Merge branch '5.4' into 6.0
Browse files Browse the repository at this point in the history
* 5.4:
  [Filesystem] Replace occurrences of `operation system` to `operating system`
  • Loading branch information
fabpot committed Feb 28, 2022
2 parents 7fc9baa + 7976800 commit 6646c13
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
6 changes: 3 additions & 3 deletions Path.php
Original file line number Diff line number Diff line change
Expand Up @@ -183,11 +183,11 @@ public static function getDirectory(string $path): string
* - UNIX
* - Windows8 and upper
*
* If your operation system or environment isn't supported, an exception is thrown.
* If your operating system or environment isn't supported, an exception is thrown.
*
* The result is a canonical path.
*
* @throws RuntimeException If your operation system or environment isn't supported
* @throws RuntimeException If your operating system or environment isn't supported
*/
public static function getHomeDirectory(): string
{
Expand All @@ -201,7 +201,7 @@ public static function getHomeDirectory(): string
return self::canonicalize(getenv('HOMEDRIVE').getenv('HOMEPATH'));
}

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

/**
Expand Down
4 changes: 2 additions & 2 deletions Tests/PathTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -1024,10 +1024,10 @@ public function testJoinVarArgs()
$this->assertSame('/path/to/test/subdir', Path::join('/path', 'to', '/test', 'subdir/'));
}

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

putenv('HOME=');

Expand Down

0 comments on commit 6646c13

Please sign in to comment.