diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merged branch Seldaek/wintest (PR #2204)

Browse Source 
Commits
-------

88ebe0c Adjust the way of checking for windows

Discussion
----------

Adjust the way of checking for windows
This commit is contained in:
Fabien Potencier 2011-09-19 07:36:55 +02:00
commit 8c64202979
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Symfony/Component/HttpFoundation/File/MimeType/FileBinaryMimeTypeGuesser.php
View File

@ -45,8 +45,9 @@ class FileBinaryMimeTypeGuesser implements MimeTypeGuesserInterface
*/
static public function isSupported()
{
return !strstr(PHP_OS, 'WIN');
return !defined('PHP_WINDOWS_VERSION_BUILD');
}
/**
* Guesses the mime type of the file with the given path
*

2
tests/Symfony/Tests/Component/HttpFoundation/File/MimeType/MimeTypeTest.php
View File

@ -75,7 +75,7 @@ class MimeTypeTest extends \PHPUnit_Framework_TestCase
public function testGuessWithNonReadablePath()
{
if (strstr(PHP_OS, 'WIN')) {
if (defined('PHP_WINDOWS_VERSION_BUILD')) {
$this->markTestSkipped('Can not verify chmod operations on Windows');
}

2
tests/Symfony/Tests/Component/Process/PhpExecutableFinderTest.php
View File

@ -48,7 +48,7 @@ class PhpExecutableFinderTest extends \PHPUnit_Framework_TestCase
$current = $f->find();
//TODO maybe php executable is custom or even windows
if (false === strstr(PHP_OS, 'WIN')) {
if (!defined('PHP_WINDOWS_VERSION_BUILD')) {
$this->assertEquals($current, PHP_BINDIR.DIRECTORY_SEPARATOR.'php', '::find() returns the executable php with suffixes');
}
}