Skip to content

Commit

Permalink
Merge pull request #10 from ARCANEDEV/develop
Browse files Browse the repository at this point in the history
Updating the package for Laravel 5.5
  • Loading branch information
arcanedev-maroc authored Sep 6, 2017
2 parents 04bb205 + ab85823 commit a0e1dee
Show file tree
Hide file tree
Showing 7 changed files with 23 additions and 16 deletions.
2 changes: 1 addition & 1 deletion .scrutinizer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ checks:
tools:
external_code_coverage:
timeout: 600
runs: 3
runs: 2
php_code_sniffer:
enabled: true
config:
Expand Down
3 changes: 1 addition & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ language: php
sudo: false

php:
- 5.6
- 7.0
- 7.1
- nightly
Expand All @@ -13,7 +12,7 @@ matrix:
- php: nightly

env:
- TESTBENCH_VERSION=3.4.*
- TESTBENCH_VERSION=3.5.*

before_script:
- travis_retry composer self-update
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ Feel free to check out the [releases](https://github.com/ARCANEDEV/GeoIP/release

* Well tested with maximum code quality.
* Easy setup & configuration.
* Laravel `5.1 | 5.2 | 5.3 | 5.4` are supported.
* Laravel `5.1 | 5.2 | 5.3 | 5.4 | 5.5` are supported.
* Well documented & IDE Friendly.
* Made with :heart: & :coffee:.

Expand All @@ -38,7 +38,7 @@ If you discover any security related issues, please email arcanedev-maroc@gmail.

Any ideas are welcome. Feel free to submit any issues or pull requests, please check the [contribution guidelines](CONTRIBUTING.md).

[badge_laravel]: https://img.shields.io/badge/For-Laravel%205.x-orange.svg?style=flat-square
[badge_laravel]: https://img.shields.io/badge/Laravel-5.1%20to%205.5-orange.svg?style=flat-square
[badge_license]: https://img.shields.io/packagist/l/arcanedev/geo-ip.svg?style=flat-square

[badge_build]: https://img.shields.io/travis/ARCANEDEV/GeoIP.svg?style=flat-square
Expand Down
2 changes: 1 addition & 1 deletion _docs/0-Home.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ GeoIP package for Laravel.

* Well tested with maximum code quality.
* Easy setup & configuration.
* Laravel `5.1 | 5.2 | 5.3 | 5.4` are supported.
* Laravel `5.1 | 5.2 | 5.3 | 5.4 | 5.5` are supported.
* Well documented & IDE Friendly.
* Made with :heart: & :coffee:.

Expand Down
5 changes: 4 additions & 1 deletion _docs/1-Installation-and-Setup.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,25 @@

The GeoIP package has a few system requirements:

- PHP >= 5.6.4
- PHP >= 7.0

## Version Compatibility

| GeoIP | Laravel |
|:------------------------------|:---------------------------------------------------------------------------------------|
| ![GeoIP v2.0.x][geo_ip_2_0_x] | ![Laravel v5.1][laravel_5_1] ![Laravel v5.2][laravel_5_2] ![Laravel v5.3][laravel_5_3] |
| ![GeoIP v2.1.x][geo_ip_2_1_x] | ![Laravel v5.4][laravel_5_4] |
| ![GeoIP v2.2.x][geo_ip_2_2_x] | ![Laravel v5.5][laravel_5_5] |

[laravel_5_1]: https://img.shields.io/badge/v5.1-supported-brightgreen.svg?style=flat-square "Laravel v5.1"
[laravel_5_2]: https://img.shields.io/badge/v5.2-supported-brightgreen.svg?style=flat-square "Laravel v5.2"
[laravel_5_3]: https://img.shields.io/badge/v5.3-supported-brightgreen.svg?style=flat-square "Laravel v5.3"
[laravel_5_4]: https://img.shields.io/badge/v5.4-supported-brightgreen.svg?style=flat-square "Laravel v5.4"
[laravel_5_5]: https://img.shields.io/badge/v5.5-supported-brightgreen.svg?style=flat-square "Laravel v5.5"

[geo_ip_2_0_x]: https://img.shields.io/badge/version-2.0.*-blue.svg?style=flat-square "GeoIP v2.0.*"
[geo_ip_2_1_x]: https://img.shields.io/badge/version-2.1.*-blue.svg?style=flat-square "GeoIP v2.1.*"
[geo_ip_2_2_x]: https://img.shields.io/badge/version-2.2.*-blue.svg?style=flat-square "GeoIP v2.2.*"

## Composer

Expand Down
2 changes: 1 addition & 1 deletion _docs/3-Usage.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# 4. Usage
# 3. Usage

Coming Soon...
21 changes: 13 additions & 8 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,14 @@
}
],
"require": {
"php": ">=5.6.4",
"arcanedev/support": "~4.0",
"php": ">=7.0",
"arcanedev/support": "~4.2",
"guzzlehttp/guzzle": "~6.0"
},
"require-dev": {
"phpunit/phpcov": "~3.0",
"phpunit/phpunit": "~5.0",
"geoip2/geoip2": "~2.0"
"phpunit/phpcov": "~4.0",
"phpunit/phpunit": "~6.0",
"geoip2/geoip2": "~2.6"
},
"autoload": {
"psr-4": {
Expand All @@ -33,14 +33,19 @@
}
},
"extra": {
"branch-alias": {
"dev-master": "2.1-dev"
"laravel": {
"providers": [
"Arcanedev\\GeoIP\\GeoIPServiceProvider"
],
"aliases": {
"GeoIP": "Arcanedev\\GeoIP\\Facades\\GeoIP"
}
}
},
"suggest": {
"geoip2/geoip2": "Required if you're going to use the MaxMind database or web service."
},
"scripts": {
"testbench": "composer require --dev \"orchestra/testbench=~3.4.0\""
"testbench": "composer require --dev \"orchestra/testbench=~3.5.0\""
}
}

0 comments on commit a0e1dee

Please sign in to comment.