2 Commits

Author SHA1 Message Date
Gregory Oschwald
543a8c07d0 Prepare for 0.6.2 2014-05-08 15:29:50 -07:00
Gregory Oschwald
0ce625f29a Fix phar with new versions of Guzzle 2014-05-08 15:28:16 -07:00
6 changed files with 4 additions and 13 deletions

1
.gitignore vendored
View File

@@ -4,7 +4,6 @@ _site
composer.lock
composer.phar
phpunit.xml
geoip2.phar
geoip2-php.sublime-*
vendor/
*.sw?

View File

@@ -10,12 +10,12 @@ php:
before_install:
- composer self-update
- composer install --dev -n --prefer-source
- if [ "5.5" == $TRAVIS_PHP_VERSION ]; then pyrus install pear/PHP_CodeSniffer; fi
- if [ "hhvm" != "$(phpenv version-name)" ]; then pyrus install pear/PHP_CodeSniffer; fi
- phpenv rehash
script:
- mkdir -p build/logs
- if [ "5.5" == $TRAVIS_PHP_VERSION ]; then phpcs --standard=PSR2 src/; fi
- if [ "hhvm" != "$(phpenv version-name)" ]; then phpcs --standard=PSR2 src/; fi
- phpunit -c phpunit.xml.dist
after_script:

View File

@@ -1,13 +1,6 @@
CHANGELOG
=========
0.6.3 (2014-05-12)
------------------
* With the previous Phar builds, some users received `phar error: invalid url
or non-existent phar` errors. The correct alias is now used for the Phar,
and this should no longer be an issue.
0.6.2 (2014-05-08)
------------------

View File

@@ -82,7 +82,7 @@ classes for the different parts of the data such as the city in which the
IP address is located.
If the record is not found, a `\GeoIp2\Exception\AddressNotFoundException`
is thrown. If the database is invalid or corrupt, a
is returned. If the database is invalid or corrupt, a
`\MaxMind\Db\InvalidDatabaseException` will be thrown.
See the API documentation for more details.

View File

@@ -1,5 +1,4 @@
{
"alias": "geoip2.phar",
"main": "phar-stub.php",
"output": "geoip2.phar",
"compactors": [

View File

@@ -1,6 +1,6 @@
<?php
require_once 'phar://geoip2.phar/vendor/autoload.php';
require_once 'vendor/autoload.php';
// The following was taken from Guzzle (MIT license)