Skip to content

Commit

Permalink
Prepare for 2.1.1
Browse files Browse the repository at this point in the history
  • Loading branch information
oschwald committed Dec 3, 2014
1 parent 64f2262 commit 01f58d7
Show file tree
Hide file tree
Showing 5 changed files with 36 additions and 8 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
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)
------------------

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ print($record->location->longitude . "\n"); // -93.2323

```

### Anonymoous-IP Example ###
### Anonymous IP Example ###

```php
<?php
Expand Down
2 changes: 1 addition & 1 deletion box.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@
"in": "vendor"
}
],

"directories": ["compat", "src/"],
"git-version": "git-version",
"shebang": "",
"stub": true
}
16 changes: 16 additions & 0 deletions dev-bin/phar-test.php
Original file line number Diff line number Diff line change
@@ -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);
18 changes: 12 additions & 6 deletions dev-bin/release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,18 @@ fi
php composer.phar self-update
php composer.phar update --no-dev

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

# We currently use a custom version of Box due to
# https://github.com/box-project/box2/issues/88. There are PRs from Greg with
# 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

../box2/bin/box build
./dev-bin/phar-test.php

# Download test deps
php composer.phar update

./vendor/bin/phpunit
Expand Down

0 comments on commit 01f58d7

Please sign in to comment.