fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-04-24 04:42:14 +09:00
Code Issues Projects Releases Packages Wiki Activity

Rename OS X to macOS (official name change since Sierra)

Browse source
This commit is contained in:
Kijin Sung 2016-06-26 15:41:07 +09:00
parent c9c4d7cda1
commit 38b3db1238
2 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
common/framework/ua.php
View file

@ -191,9 +191,9 @@ class UA
{
$result->os = 'iOS';
}
elseif ($matches[1] === 'Macintosh' && strpos($ua, 'OS X') !== false)
elseif ($matches[1] === 'Macintosh' || $matches[1] === 'OS X')
{
$result->os = 'OS X';
$result->os = 'macOS';
}
else
{

12
tests/unit/framework/UATest.php
View file

@ -161,25 +161,25 @@ class UATest extends \Codeception\TestCase\Test
$this->assertTrue($browser->is_mobile);
$this->assertTrue($browser->is_tablet);
// OS X Safari
// macOS (OS X) Safari
$browser = Rhymix\Framework\UA::getBrowserInfo('Mozilla/5.0 (Macintosh; Intel Mac OS X 10_10_2) AppleWebKit/600.3.18 (KHTML, like Gecko) Version/8.0.3 Safari/600.3.18');
$this->assertEquals('Safari', $browser->browser);
$this->assertEquals('8.0', $browser->version);
$this->assertEquals('OS X', $browser->os);
$this->assertEquals('macOS', $browser->os);
$this->assertFalse($browser->is_mobile);
// OS X Chrome
// macOS (OS X) Chrome
$browser = Rhymix\Framework\UA::getBrowserInfo('Mozilla/5.0 (Macintosh; Intel Mac OS X 10_10_1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/41.0.2227.1 Safari/537.36');
$this->assertEquals('Chrome', $browser->browser);
$this->assertEquals('41.0', $browser->version);
$this->assertEquals('OS X', $browser->os);
$this->assertEquals('macOS', $browser->os);
$this->assertFalse($browser->is_mobile);
// OS X Firefox
// macOS (OS X) Firefox
$browser = Rhymix\Framework\UA::getBrowserInfo('Mozilla/5.0 (Macintosh; Intel Mac OS X 10_10; rv:33.0) Gecko/20100101 Firefox/33.0');
$this->assertEquals('Firefox', $browser->browser);
$this->assertEquals('33.0', $browser->version);
$this->assertEquals('OS X', $browser->os);
$this->assertEquals('macOS', $browser->os);
$this->assertFalse($browser->is_mobile);
// Googlebot