Permalink
Browse files

Fix and update composer dependencies

Ref #2484
  • Loading branch information...
LeoColomb committed Jan 13, 2019
1 parent 5bffcc5 commit f652cae2c319e146b9e26bd315123483b3ca2211
Showing with 3,460 additions and 404 deletions.
  1. +4 βˆ’4 composer.json
  2. +17 βˆ’17 composer.lock
  3. +1 βˆ’0 includes/vendor/build-script/yourls-build.sh
  4. +18 βˆ’18 includes/vendor/composer/installed.json
  5. +5 βˆ’8 includes/vendor/geoip2/geoip2/README.md
  6. +0 βˆ’27 includes/vendor/geoip2/geoip2/src/Compat/JsonSerializable.php
  7. +62 βˆ’60 includes/vendor/geoip2/geoip2/src/Database/Reader.php
  8. +1 βˆ’2 includes/vendor/geoip2/geoip2/src/Exception/HttpException.php
  9. +1 βˆ’1 includes/vendor/geoip2/geoip2/src/Exception/InvalidRequestException.php
  10. +16 βˆ’11 includes/vendor/geoip2/geoip2/src/Model/AbstractModel.php
  11. +7 βˆ’11 includes/vendor/geoip2/geoip2/src/Model/AnonymousIp.php
  12. +3 βˆ’4 includes/vendor/geoip2/geoip2/src/Model/Asn.php
  13. +16 βˆ’19 includes/vendor/geoip2/geoip2/src/Model/City.php
  14. +2 βˆ’2 includes/vendor/geoip2/geoip2/src/Model/ConnectionType.php
  15. +4 βˆ’6 includes/vendor/geoip2/geoip2/src/Model/Country.php
  16. +2 βˆ’2 includes/vendor/geoip2/geoip2/src/Model/Domain.php
  17. +0 βˆ’9 includes/vendor/geoip2/geoip2/src/Model/Enterprise.php
  18. +0 βˆ’9 includes/vendor/geoip2/geoip2/src/Model/Insights.php
  19. +3 βˆ’6 includes/vendor/geoip2/geoip2/src/Model/Isp.php
  20. +6 βˆ’6 includes/vendor/geoip2/geoip2/src/ProviderInterface.php
  21. +17 βˆ’8 includes/vendor/geoip2/geoip2/src/Record/AbstractPlaceRecord.php
  22. +10 βˆ’9 includes/vendor/geoip2/geoip2/src/Record/AbstractRecord.php
  23. +1 βˆ’4 includes/vendor/geoip2/geoip2/src/Record/City.php
  24. +4 βˆ’7 includes/vendor/geoip2/geoip2/src/Record/Continent.php
  25. +11 βˆ’11 includes/vendor/geoip2/geoip2/src/Record/Country.php
  26. +5 βˆ’12 includes/vendor/geoip2/geoip2/src/Record/Location.php
  27. +1 βˆ’1 includes/vendor/geoip2/geoip2/src/Record/MaxMind.php
  28. +2 βˆ’3 includes/vendor/geoip2/geoip2/src/Record/Postal.php
  29. +8 βˆ’9 includes/vendor/geoip2/geoip2/src/Record/RepresentedCountry.php
  30. +6 βˆ’11 includes/vendor/geoip2/geoip2/src/Record/Subdivision.php
  31. +32 βˆ’25 includes/vendor/geoip2/geoip2/src/Record/Traits.php
  32. +79 βˆ’82 includes/vendor/geoip2/geoip2/src/WebService/Client.php
  33. +19 βˆ’0 includes/vendor/symfony/polyfill-mbstring/LICENSE
  34. +800 βˆ’0 includes/vendor/symfony/polyfill-mbstring/Mbstring.php
  35. +1,096 βˆ’0 includes/vendor/symfony/polyfill-mbstring/Resources/unidata/lowerCase.php
  36. +5 βˆ’0 includes/vendor/symfony/polyfill-mbstring/Resources/unidata/titleCaseRegexp.php
  37. +1,104 βˆ’0 includes/vendor/symfony/polyfill-mbstring/Resources/unidata/upperCase.php
  38. +58 βˆ’0 includes/vendor/symfony/polyfill-mbstring/bootstrap.php
  39. +34 βˆ’0 includes/vendor/symfony/polyfill-mbstring/composer.json
@@ -22,10 +22,10 @@
"ozh/phpass": "1.2.0",
"rmccue/Requests" : "1.7",
"pomo/pomo" : "1.4.1",
"geoip2/geoip2" : "2.5.0",
"geoip2/geoip2" : "2.9.0",
"aura/sql": "~2.",
"jakeasmith/http_build_url": "1.0.1",
"symfony/polyfill-mbstring": "1.5.0"
"symfony/polyfill-mbstring": "1.10.0"
},
"config": {
"vendor-dir": "includes/vendor"
@@ -39,7 +39,7 @@
"ext-mbstring": "For best performance",
"ext-curl": "Required for API usage"
},
"script": {
"post-update-cmd": "./includes/vendor/build-script/yourls-build.sh includes/vendor"
"scripts": {
"post-update-cmd": "bash ./includes/vendor/build-script/yourls-build.sh ./includes/vendor"
}
}

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.
@@ -25,6 +25,7 @@
PRESERVE_IN_VENDOR=(
'composer'
'build-script'
'symfony'
)

# Files & dirs to keep in each library directory
@@ -117,30 +117,30 @@
},
{
"name": "geoip2/geoip2",
"version": "v2.5.0",
"version_normalized": "2.5.0.0",
"version": "v2.9.0",
"version_normalized": "2.9.0.0",
"source": {
"type": "git",
"url": "https://github.com/maxmind/GeoIP2-php.git",
"reference": "87602e1c9f5014291b06e126847123360cb6c2db"
"reference": "a807fbf65212eef5d8d2db1a1b31082b53633d77"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/maxmind/GeoIP2-php/zipball/87602e1c9f5014291b06e126847123360cb6c2db",
"reference": "87602e1c9f5014291b06e126847123360cb6c2db",
"url": "https://api.github.com/repos/maxmind/GeoIP2-php/zipball/a807fbf65212eef5d8d2db1a1b31082b53633d77",
"reference": "a807fbf65212eef5d8d2db1a1b31082b53633d77",
"shasum": ""
},
"require": {
"maxmind-db/reader": "~1.0",
"maxmind/web-service-common": "~0.3",
"php": ">=5.3.1"
"maxmind/web-service-common": "~0.5",
"php": ">=5.4"
},
"require-dev": {
"apigen/apigen": "^4.1",
"phpunit/phpunit": "4.2.*",
"squizlabs/php_codesniffer": "2.*"
"friendsofphp/php-cs-fixer": "2.*",
"phpunit/phpunit": "4.*",
"squizlabs/php_codesniffer": "3.*"
},
"time": "2017-05-08T20:05:30+00:00",
"time": "2018-04-10T15:32:59+00:00",
"type": "library",
"installation-source": "dist",
"autoload": {
@@ -508,17 +508,17 @@
},
{
"name": "symfony/polyfill-mbstring",
"version": "v1.5.0",
"version_normalized": "1.5.0.0",
"version": "v1.10.0",
"version_normalized": "1.10.0.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-mbstring.git",
"reference": "7c8fae0ac1d216eb54349e6a8baa57d515fe8803"
"reference": "c79c051f5b3a46be09205c73b80b346e4153e494"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/7c8fae0ac1d216eb54349e6a8baa57d515fe8803",
"reference": "7c8fae0ac1d216eb54349e6a8baa57d515fe8803",
"url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/c79c051f5b3a46be09205c73b80b346e4153e494",
"reference": "c79c051f5b3a46be09205c73b80b346e4153e494",
"shasum": ""
},
"require": {
@@ -527,11 +527,11 @@
"suggest": {
"ext-mbstring": "For best performance"
},
"time": "2017-06-14T15:44:48+00:00",
"time": "2018-09-21T13:07:52+00:00",
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.5-dev"
"dev-master": "1.9-dev"
}
},
"installation-source": "dist",
@@ -257,7 +257,7 @@ print($record->ipAddress . "\n"); // '128.101.101.101'
### Usage ###

To use this API, you must create a new `\GeoIp2\WebService\Client`
object with your `$userId` and `$licenseKey`, then you call the method
object with your `$accountId` and `$licenseKey`, then you call the method
corresponding to a specific end point, passing it the IP address you want to
look up.

@@ -277,7 +277,7 @@ require_once 'vendor/autoload.php';
use GeoIp2\WebService\Client;
// This creates a Client object that can be reused across requests.
// Replace "42" with your user ID and "license_key" with your license
// Replace "42" with your account ID and "license_key" with your license
// key.
$client = new Client(42, 'abcdef123456');
@@ -376,14 +376,11 @@ to the client API, please see

## Requirements ##

This code requires PHP 5.3 or greater. Older versions of PHP are not
supported. This library works and is tested with HHVM.
This library requires PHP 5.4 or greater. This library works and is tested
with HHVM.

This library also relies on the [MaxMind DB Reader](https://github.com/maxmind/MaxMind-DB-Reader-php).

If you are using PHP 5.3 with an autoloader besides Composer, you must load
`JsonSerializable.php` in the `compat` directory.

## Contributing ##

Patches and pull requests are encouraged. All code should follow the PSR-2
@@ -398,7 +395,7 @@ The GeoIP2 PHP API uses [Semantic Versioning](http://semver.org/).

## Copyright and License ##

This software is Copyright (c) 2013-2016 by MaxMind, Inc.
This software is Copyright (c) 2013-2018 by MaxMind, Inc.

This is free software, licensed under the Apache License, Version 2.0.

This file was deleted.

Oops, something went wrong.
Oops, something went wrong.

0 comments on commit f652cae

Please sign in to comment.