Skip to content

Commit 915e303

Browse files
alexmerlinalexmerlin
authored
Merge pull request #47 from dotkernel/issue-46
Issue #46: Remove PHP 8.1 and add PHP 8.4 & 8.5 support
2 parents cb5a5c3 + 213953a commit 915e303

8 files changed

Lines changed: 23 additions & 23 deletions

File tree

‎.github/workflows/codecov.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ jobs:
1818
- "8.2"
1919
- "8.3"
2020
- "8.4"
21+
- "8.5"
2122

2223
steps:
2324
- name: Checkout

‎.github/workflows/static-analysis.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ jobs:
1818
- "8.2"
1919
- "8.3"
2020
- "8.4"
21+
- "8.5"
2122

2223
steps:
2324
- name: Checkout

‎README.md‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Documentation is available at: https://docs.dotkernel.org/dot-geoip/.
1111
## Badges
1212

1313
![OSS Lifecycle](https://img.shields.io/osslifecycle/dotkernel/dot-geoip)
14-
![PHP from Packagist (specify version)](https://img.shields.io/packagist/php-v/dotkernel/dot-geoip/3.9.0)
14+
![PHP from Packagist (specify version)](https://img.shields.io/packagist/php-v/dotkernel/dot-geoip/3.10.0)
1515

1616
[![GitHub issues](https://img.shields.io/github/issues/dotkernel/dot-geoip)](https://github.com/dotkernel/dot-geoip/issues)
1717
[![GitHub forks](https://img.shields.io/github/forks/dotkernel/dot-geoip)](https://github.com/dotkernel/dot-geoip/network)
@@ -31,7 +31,7 @@ composer require dotkernel/dot-geoip
3131
```
3232

3333
If your application didn't already use it, the above command also installed [dotkernel/dot-cli](https://github.com/dotkernel/dot-cli).
34-
In this case, see it's [README](https://github.com/dotkernel/dot-cli/blob/3.0/README.md) file on how to use it.
34+
In this case, see its [README](https://github.com/dotkernel/dot-cli/blob/3.0/README.md) file on how to use it.
3535

3636
Copy config file `vendor/dotkernel/dot-geoip/config/autoload/geoip.global.php` into your application's `config/autoload` directory.
3737

@@ -49,15 +49,15 @@ Dot\GeoIP\Command\GeoIpCommand::getDefaultName() => Dot\GeoIP\Command\GeoIpComma
4949

5050
## Manage GeoLite2 database
5151

52-
You can download/update a specific GeoLite2 database, by running the following command:
52+
You can download/update a specific GeoLite2 database by running the following command:
5353

5454
```shell
5555
php ./bin/cli.php geoip:synchronize -d {DATABASE}
5656
```
5757

5858
Where _{DATABASE}_ takes one of the following values: `asn`, `city`, `country`.
5959

60-
You can download/update all GeoLite2 databases at once, by running the following command:
60+
You can download/update all GeoLite2 databases at once by running the following command:
6161

6262
```shell
6363
php ./bin/cli.php geoip:synchronize
@@ -115,16 +115,16 @@ class ExampleService
115115
try {
116116
// You can use any of the below methods:
117117

118-
// Get CountryData which includes isEuMember, isoCode and name
118+
// Get CountryData, which includes isEuMember, isoCode and name
119119
return $this->locationService->getCountry($ipAddress);
120120

121-
// Get ContinentData which includes code and name
121+
// Get ContinentData, which includes code and name
122122
return $this->locationService->getContinent($ipAddress);
123123

124-
// Get OrganizationData which includes asn and name
124+
// Get OrganizationData, which includes asn and name
125125
return $this->locationService->getOrganization($ipAddress);
126126

127-
// Get LocationData which includes all of the above + estimated coordinates + timezone
127+
// Get LocationData, which includes all the above + estimated coordinates and timezone
128128
return $this->locationService->getLocation($ipAddress);
129129
} catch (Throwable $exception) {
130130
// handle errors

‎SECURITY.md‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,10 @@
22

33
## Supported Versions
44

5-
6-
| Version | Supported | PHP Version |
7-
|---------|--------------------|------------------------------------------------------------------------------------------------------------------------|
8-
| 3.x | :white_check_mark: | ![PHP from Packagist (specify version)](https://img.shields.io/packagist/php-v/dotkernel/dot-geoip/3.6.0) |
9-
| <= 2.x | :x: | |
10-
5+
| Version | Supported | PHP Version |
6+
|---------|--------------------|------------------------------------------------------------------------------------------------------------|
7+
| 3.x | :white_check_mark: | ![PHP from Packagist (specify version)](https://img.shields.io/packagist/php-v/dotkernel/dot-geoip/3.10.0) |
8+
| <= 2.x | :x: | |
119

1210
## Reporting Potential Security Issues
1311

‎composer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
}
2323
},
2424
"require": {
25-
"php": "~8.2.0 || ~8.3.0 || ~8.4.0",
25+
"php": "~8.2.0 || ~8.3.0 || ~8.4.0 || ~8.5.0",
2626
"dotkernel/dot-cli": "^3.5",
2727
"geoip2/geoip2": "^3.0",
2828
"guzzlehttp/guzzle": "^7.8",

‎docs/book/v3/manage-geolite2-database.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
# Manage GeoLite2 database
22

3-
You can download/update a specific GeoLite2 database, by running the following command:
3+
You can download/update a specific GeoLite2 database by running the following command:
44

55
```shell
66
php ./bin/cli.php geoip:synchronize -d {DATABASE}
77
```
88

99
Where _{DATABASE}_ takes one of the following values: `asn`, `city`, `country`.
1010

11-
You can download/update all GeoLite2 databases at once, by running the following command:
11+
You can download/update all GeoLite2 databases at once by running the following command:
1212

1313
```shell
1414
php ./bin/cli.php geoip:synchronize

‎docs/book/v3/overview.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@ Dotkernel component to provide geographical details about an IP address.
77
## Badges
88

99
![OSS Lifecycle](https://img.shields.io/osslifecycle/dotkernel/dot-geoip)
10-
![PHP from Packagist (specify version)](https://img.shields.io/packagist/php-v/dotkernel/dot-geoip/3.9.0)
10+
![PHP from Packagist (specify version)](https://img.shields.io/packagist/php-v/dotkernel/dot-geoip/3.10.0)
1111

1212
[![GitHub issues](https://img.shields.io/github/issues/dotkernel/dot-geoip)](https://github.com/dotkernel/dot-geoip/issues)
1313
[![GitHub forks](https://img.shields.io/github/forks/dotkernel/dot-geoip)](https://github.com/dotkernel/dot-geoip/network)
1414
[![GitHub stars](https://img.shields.io/github/stars/dotkernel/dot-geoip)](https://github.com/dotkernel/dot-geoip/stargazers)
1515
[![GitHub license](https://img.shields.io/github/license/dotkernel/dot-geoip)](https://github.com/dotkernel/dot-geoip/blob/3.0/LICENSE)
1616

1717
[![Build Static](https://github.com/dotkernel/dot-geoip/actions/workflows/continuous-integration.yml/badge.svg?branch=3.0)](https://github.com/dotkernel/dot-geoip/actions/workflows/continuous-integration.yml)
18-
[![codecov](https://codecov.io/gh/dotkernel/dot-geoip/graph/badge.svg?token=HZKFRQWDSV)](https://codecov.io/gh/dotkernel/dot-geoip)
18+
[![codecov](https://codecov.io/gh/dotkernel/dot-geoip/graph/badge.svg?token=K473P7MDZ4)](https://codecov.io/gh/dotkernel/dot-geoip)
1919
[![PHPStan](https://github.com/dotkernel/dot-geoip/actions/workflows/static-analysis.yml/badge.svg?branch=3.0)](https://github.com/dotkernel/dot-geoip/actions/workflows/static-analysis.yml)

‎docs/book/v3/usage.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,15 +35,15 @@ class ExampleService
3535
*/
3636
public function myMethod(string $ipAddress): object
3737
{
38-
return $this->locationService->getCountry($ipAddress); // Returns instance of Dot\GeoIP\Data\CountryData
38+
return $this->locationService->getCountry($ipAddress); // Returns an instance of Dot\GeoIP\Data\CountryData
3939

4040
return $this->locationService->getCity($ipAddress); // Return instance of Dot\GeoIP\Data\CityData
4141

42-
return $this->locationService->getContinent($ipAddress) // Returns instance of Dot\GeoIP\Data\ContinentData
42+
return $this->locationService->getContinent($ipAddress) // Returns an instance of Dot\GeoIP\Data\ContinentData
4343

44-
return $this->locationService->getOrganization($ipAddress) // Returns instance of Dot\GeoIP\Data\OrganizationData
44+
return $this->locationService->getOrganization($ipAddress) // Returns an instance of Dot\GeoIP\Data\OrganizationData
4545

46-
return $this->locationService->getLocation($ipAddress) // Returns instance of Dot\GeoIP\Data\LocationData
46+
return $this->locationService->getLocation($ipAddress) // Returns an instance of Dot\GeoIP\Data\LocationData
4747
}
4848
}
4949
```

0 commit comments

Comments
 (0)