will/GeoIP2-php
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix for PHP 5.3 where you can't use '$this' in a callback.

Browse Source
This commit is contained in:
Gregory Oschwald 2013-07-16 10:11:06 -07:00
parent 1d1dcec74c
commit e3289ec416
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tests/GeoIp2/Test/Database/ReaderTest.php
View File

@ -9,10 +9,12 @@ class ReaderTest extends \PHPUnit_Framework_TestCase
public function testDefaultLanguage() public function testDefaultLanguage()
{ {
$reader = new Reader('maxmind-db/test-data/GeoIP2-City-Test.mmdb'); $reader = new Reader('maxmind-db/test-data/GeoIP2-City-Test.mmdb');
// Needed for PHP 5.3
$that = $this;
$this->checkAllMethods( $this->checkAllMethods(
function ($method) use (&$reader) { function ($method) use (&$that, &$reader) {
$record = $reader->$method('81.2.69.160'); $record = $reader->$method('81.2.69.160');
$this->assertEquals('United Kingdom', $record->country->name); $that->assertEquals('United Kingdom', $record->country->name);
} }
); );
$reader->close(); $reader->close();
@ -24,10 +26,11 @@ class ReaderTest extends \PHPUnit_Framework_TestCase
'maxmind-db/test-data/GeoIP2-City-Test.mmdb', 'maxmind-db/test-data/GeoIP2-City-Test.mmdb',
array('xx', 'ru', 'pt-BR', 'es', 'en') array('xx', 'ru', 'pt-BR', 'es', 'en')
); );
$that = $this;
$this->checkAllMethods( $this->checkAllMethods(
function ($method) use (&$reader) { function ($method) use (&$that, &$reader) {
$record = $reader->$method('81.2.69.160'); $record = $reader->$method('81.2.69.160');
$this->assertEquals('Великобритания', $record->country->name); $that->assertEquals('Великобритания', $record->country->name);
} }
); );
$reader->close(); $reader->close();
@ -36,10 +39,11 @@ class ReaderTest extends \PHPUnit_Framework_TestCase
public function testHasIpAddress() public function testHasIpAddress()
{ {
$reader = new Reader('maxmind-db/test-data/GeoIP2-City-Test.mmdb'); $reader = new Reader('maxmind-db/test-data/GeoIP2-City-Test.mmdb');
$that = $this;
$this->checkAllMethods( $this->checkAllMethods(
function ($method) use (&$reader) { function ($method) use (&$that, &$reader) {
$record = $reader->$method('81.2.69.160'); $record = $reader->$method('81.2.69.160');
$this->assertEquals('81.2.69.160', $record->traits->ipAddress); $that->assertEquals('81.2.69.160', $record->traits->ipAddress);
} }
); );
$reader->close(); $reader->close();