Skip to content

Commit

Permalink
minor #9869 fixed various typos (fabpot)
Browse files Browse the repository at this point in the history
This PR was merged into the 2.3 branch.

Discussion
----------

fixed various typos

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | n/a
| License       | MIT
| Doc PR        | n/a

Commits
-------

2f15ac7 fixed various typos
  • Loading branch information
fabpot committed Dec 27, 2013
2 parents 18f27c7 + 38411e8 commit f2e1d0c
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
6 changes: 3 additions & 3 deletions Filesystem.php
Expand Up @@ -105,8 +105,8 @@ public function exists($files)
* Sets access and modification time of file.
*
* @param string|array|\Traversable $files A filename, an array of files, or a \Traversable instance to create
* @param integer $time The touch time as a unix timestamp
* @param integer $atime The access time as a unix timestamp
* @param integer $time The touch time as a Unix timestamp
* @param integer $atime The access time as a Unix timestamp
*
* @throws IOException When touch fails
*/
Expand Down Expand Up @@ -306,7 +306,7 @@ public function symlink($originDir, $targetDir, $copyOnWindows = false)
*/
public function makePathRelative($endPath, $startPath)
{
// Normalize separators on windows
// Normalize separators on Windows
if (defined('PHP_WINDOWS_VERSION_MAJOR')) {
$endPath = strtr($endPath, '\\', '/');
$startPath = strtr($startPath, '\\', '/');
Expand Down
8 changes: 4 additions & 4 deletions Tests/FilesystemTest.php
Expand Up @@ -906,7 +906,7 @@ public function testDumpFile()
$this->assertFileExists($filename);
$this->assertSame('bar', file_get_contents($filename));

// skip mode check on windows
// skip mode check on Windows
if (!defined('PHP_WINDOWS_VERSION_MAJOR')) {
$this->assertEquals(753, $this->getFilePermissions($filename));
}
Expand Down Expand Up @@ -962,21 +962,21 @@ private function markAsSkippedIfSymlinkIsMissing()
}

if (defined('PHP_WINDOWS_VERSION_MAJOR') && false === self::$symlinkOnWindows) {
$this->markTestSkipped('symlink requires "Create symbolic links" privilege on windows');
$this->markTestSkipped('symlink requires "Create symbolic links" privilege on Windows');
}
}

private function markAsSkippedIfChmodIsMissing()
{
if (defined('PHP_WINDOWS_VERSION_MAJOR')) {
$this->markTestSkipped('chmod is not supported on windows');
$this->markTestSkipped('chmod is not supported on Windows');
}
}

private function markAsSkippedIfPosixIsMissing()
{
if (defined('PHP_WINDOWS_VERSION_MAJOR') || !function_exists('posix_isatty')) {
$this->markTestSkipped('Posix is not supported');
$this->markTestSkipped('POSIX is not supported');
}
}
}

0 comments on commit f2e1d0c

Please sign in to comment.