Skip to content
This repository has been archived by the owner on Jan 30, 2020. It is now read-only.

Commit

Permalink
Merge pull request zendframework/zendframework#5369 from ThaDafinser/…
Browse files Browse the repository at this point in the history 
…phpUnitWindows

Php unit windows
  • Loading branch information
@weierophinney
weierophinney committed Oct 30, 2013
119 parents e6d18f9 + 3417ce7 + 6fe2e03 + 3de0bd7 + 700917d + f10c3b2 + 4f82a12 + ba0d8a9 + c140dfc + 6c6a51d + 473be1c + 33a0274 + 56352fd + 8119cdf + 61d3103 + 4a23da8 + aed1a4d + d208606 + 3f667bd + 617a96b + ddb5852 + 6e16921 + 9418fac + 17b5ef4 + 846edfb + 216ac0e + aecb8f4 + ef44cf1 + bc4610b + 8c773ad + 0481606 + d1304e2 + d3d5a56 + 533570c + 6e30cb0 + 82c88d1 + 88c4f3b + c96ebb3 + f0320b1 + cb0afaa + 128be4b + 34cd6a3 + ec2aab9 + 809bd88 + 77026e3 + c2796da + 0ee8602 + bf4e728 + cd33c2d + 32497e5 + 79eb7d0 + 8cc5d58 + 869ab1c + 436e613 + ab7d56c + 6dbeef6 + 84670b1 + cccfba9 + 2717653 + b4dd364 + 460818e + b5ac15d + 2d218aa + 046d669 + 5597f80 + 98dc299 + 01b3149 + b0177b5 + 74f8270 + 62799e5 + 512426e + 5a9a928 + 3b3e691 + 6f57ae9 + 116cf37 + bb991fd + 1ce1893 + 5000327 + 32beb38 + fe88f0e + 49921e6 + 6387996 + 9623b87 + fef33e6 + a55293c + 37a7d0c + aeda378 + 1681df7 + 8557890 + 792de65 + 072f053 + fbc1502 + 482716d + 0da8a0e + 7d9112c + ca312d7 + cef4359 + 711d775 + 7826111 + 14b10f4 + 7b6700e + f304770 + 57e491b + c3425d2 + d591073 + 2235288 + d4694ac + 56d8e16 + 07f05df + 622531f + 641a66a + 4938b37 + 4bda1f3 + b1e478c + bf4b889 + fe09441 + b5e7532 + c8263a5 + efad143 commit 2025c24
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 14 deletions.
2 changes: 1 addition & 1 deletion test/Compress/ZipTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ public function setUp()
$this->markTestSkipped('This adapter needs the zip extension');
}

$this->tmp = sys_get_temp_dir() . '/' . str_replace('\\', '_', __CLASS__);
$this->tmp = sys_get_temp_dir() . DIRECTORY_SEPARATOR . str_replace('\\', '_', __CLASS__);

$files = array(
$this->tmp . '/compressed.zip',
Expand Down
4 changes: 2 additions & 2 deletions test/File/RenameTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -491,7 +491,7 @@ public function testGetRandomizedFile()
$filter->getFile()
);
$fileNoExt = $this->_filesPath . 'newfile';
$this->assertRegExp('#' . $fileNoExt . '_.{13}\.xml#', $filter->getNewName($this->_oldFile));
$this->assertRegExp('#' . str_replace('\\', '\\\\', $fileNoExt) . '_.{13}\.xml#', $filter->getNewName($this->_oldFile));
}

/**
Expand All @@ -515,7 +515,7 @@ public function testGetRandomizedFileWithoutExtension()
)),
$filter->getFile()
);
$this->assertRegExp('#' . $fileNoExt . '_.{13}#', $filter->getNewName($this->_oldFile));
$this->assertRegExp('#' . str_replace('\\', '\\\\', $fileNoExt) . '_.{13}#', $filter->getNewName($this->_oldFile));
}

/**
Expand Down
22 changes: 11 additions & 11 deletions test/File/RenameUploadTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,9 +66,9 @@ public function setUp()
mkdir($this->_filesPath);
mkdir($this->_newDir);

$this->_oldFile = $this->_filesPath . '/testfile.txt';
$this->_newFile = $this->_filesPath . '/newfile.xml';
$this->_newDirFile = $this->_newDir . '/testfile.txt';
$this->_oldFile = $this->_filesPath . DIRECTORY_SEPARATOR . 'testfile.txt';
$this->_newFile = $this->_filesPath . DIRECTORY_SEPARATOR . 'newfile.xml';
$this->_newDirFile = $this->_newDir . DIRECTORY_SEPARATOR . 'testfile.txt';

touch($this->_oldFile);
}
Expand Down Expand Up @@ -245,18 +245,18 @@ public function testCannotOverwriteExistingFile()
*/
public function testGetRandomizedFile()
{
$fileNoExt = $this->_filesPath . '/newfile';
$fileNoExt = $this->_filesPath . DIRECTORY_SEPARATOR . 'newfile';
$filter = new RenameUploadMock(array(
'target' => $this->_newFile,
'randomize' => true,
));

$this->assertRegExp('#' . $fileNoExt . '_.{13}\.xml#', $filter($this->_oldFile));
$this->assertRegExp('#' . str_replace('\\', '\\\\', $fileNoExt) . '_.{13}\.xml#', $filter($this->_oldFile));
}

public function testGetFileWithOriginalExtension()
{
$fileNoExt = $this->_filesPath . '/newfile';
$fileNoExt = $this->_filesPath . DIRECTORY_SEPARATOR . 'newfile';
$filter = new RenameUploadMock(array(
'target' => $this->_newFile,
'use_upload_extension' => true,
Expand All @@ -266,14 +266,14 @@ public function testGetFileWithOriginalExtension()
$oldFilePathInfo = pathinfo($this->_oldFile);

$this->assertRegExp(
'#' . $fileNoExt . '.'.$oldFilePathInfo['extension'].'#',
'#' . str_replace('\\', '\\\\', $fileNoExt) . '.'.$oldFilePathInfo['extension'].'#',
$filter($this->_oldFile)
);
}

public function testGetRandomizedFileWithOriginalExtension()
{
$fileNoExt = $this->_filesPath . '/newfile';
$fileNoExt = $this->_filesPath . DIRECTORY_SEPARATOR . 'newfile';
$filter = new RenameUploadMock(array(
'target' => $this->_newFile,
'use_upload_extension' => true,
Expand All @@ -283,7 +283,7 @@ public function testGetRandomizedFileWithOriginalExtension()
$oldFilePathInfo = pathinfo($this->_oldFile);

$this->assertRegExp(
'#' . $fileNoExt . '_.{13}\.'.$oldFilePathInfo['extension'].'#',
'#' . str_replace('\\', '\\\\', $fileNoExt) . '_.{13}\.'.$oldFilePathInfo['extension'].'#',
$filter($this->_oldFile)
);
}
Expand All @@ -293,13 +293,13 @@ public function testGetRandomizedFileWithOriginalExtension()
*/
public function testGetRandomizedFileWithoutExtension()
{
$fileNoExt = $this->_filesPath . '/newfile';
$fileNoExt = $this->_filesPath . DIRECTORY_SEPARATOR . 'newfile';
$filter = new RenameUploadMock(array(
'target' => $fileNoExt,
'randomize' => true,
));

$this->assertRegExp('#' . $fileNoExt . '_.{13}#', $filter($this->_oldFile));
$this->assertRegExp('#' . str_replace('\\', '\\\\', $fileNoExt) . '_.{13}#', $filter($this->_oldFile));
}

/**
Expand Down

0 comments on commit 2025c24

Please sign in to comment.