Prepare for 2.1.1

This commit is contained in:
Gregory Oschwald 2014-12-03 06:59:16 -08:00
parent 64f2262093
commit 01f58d749b
5 changed files with 34 additions and 6 deletions

View File

@ -1,6 +1,12 @@
CHANGELOG CHANGELOG
========= =========
2.1.1 (2014-12-03)
------------------
* The 2.1.0 Phar builds included a shebang line, causing issues when loading
it as a library. This has been corrected. GitHub #33.
2.1.0 (2014-10-29) 2.1.0 (2014-10-29)
------------------ ------------------

View File

@ -114,7 +114,7 @@ print($record->location->longitude . "\n"); // -93.2323
``` ```
### Anonymoous-IP Example ### ### Anonymous IP Example ###
```php ```php
<?php <?php

View File

@ -29,8 +29,8 @@
"in": "vendor" "in": "vendor"
} }
], ],
"directories": ["compat", "src/"], "directories": ["compat", "src/"],
"git-version": "git-version", "git-version": "git-version",
"shebang": "",
"stub": true "stub": true
} }

16
dev-bin/phar-test.php Executable file
View File

@ -0,0 +1,16 @@
#!/usr/bin/env php
<?php
require_once 'geoip2.phar';
use GeoIp2\Database\Reader;
$reader = new Reader('maxmind-db/test-data/GeoIP2-City-Test.mmdb');
$record = $reader->city('81.2.69.160');
if ( $record->country->isoCode === 'GB' ) {
exit(0);
}
print('Problem with Phar!');
exit(1);

View File

@ -25,12 +25,18 @@ fi
php composer.phar self-update php composer.phar self-update
php composer.phar update --no-dev php composer.phar update --no-dev
if [ ! -f box.phar ]; then # We currently use a custom version of Box due to
wget -O box.phar "https://github.com/kherge-archive/Box/releases/download/2.4.4/box-2.4.4.phar" # https://github.com/box-project/box2/issues/88. There are PRs from Greg with
fi # the fixes.
#
# if [ ! -f box.phar ]; then
# wget -O box.phar "https://github.com/kherge-archive/Box/releases/download/2.4.4/box-2.4.4.phar"
# fi
php box.phar build ../box2/bin/box build
./dev-bin/phar-test.php
# Download test deps
php composer.phar update php composer.phar update
./vendor/bin/phpunit ./vendor/bin/phpunit