Skip to content

Commit 70c3ebe

Browse files
SurfooSurfoo
committed
update matrix
1 parent a8f2d5a commit 70c3ebe

File tree

6 files changed

+115
-86
lines changed

6 files changed

+115
-86
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,28 +10,24 @@ jobs:
1010
strategy:
1111
fail-fast: false
1212
matrix:
13-
php: [ '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4' ]
13+
php: [ '8.2', '8.3', '8.4', '8.5' ]
1414
strategy: [ 'highest' ]
1515
sf_version: ['']
1616
include:
17-
- php: 7.3
18-
sf_version: '4.*'
19-
- php: 7.4
20-
strategy: 'lowest'
21-
- php: 8.0
22-
sf_version: '6.*'
23-
- php: 8.1
24-
sf_version: '6.*'
2517
- php: 8.2
2618
sf_version: '6.*'
2719
- php: 8.3
2820
sf_version: '7.*'
2921
- php: 8.4
3022
sf_version: '7.*'
23+
- php: 8.5
24+
sf_version: '7.*'
25+
- php: 8.5
26+
sf_version: '8.*'
3127

3228
steps:
3329
- name: Checkout code
34-
uses: actions/checkout@v3
30+
uses: actions/checkout@v6
3531

3632
- name: Generate locales
3733
run: sudo apt-get update && sudo apt-get install tzdata locales -y && sudo locale-gen sv_SE && sudo locale-gen sv_SE.UTF-8 && sudo locale-gen en_US && sudo locale-gen en_US.UTF-8
@@ -43,7 +39,7 @@ jobs:
4339
coverage: none
4440

4541
- name: Download dependencies
46-
uses: ramsey/composer-install@v2
42+
uses: ramsey/composer-install@v4
4743
env:
4844
SYMFONY_REQUIRE: ${{ matrix.sf_version }}
4945
with:

‎.github/workflows/stale.yml‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
name: Mark stale issues and pull requests
2+
3+
on:
4+
schedule:
5+
- cron: '0 0 * * *'
6+
workflow_dispatch:
7+
8+
jobs:
9+
stale:
10+
runs-on: ubuntu-latest
11+
permissions:
12+
issues: write
13+
pull-requests: write
14+
15+
steps:
16+
- uses: actions/stale@v9
17+
with:
18+
stale-issue-message: 'This issue has been automatically marked as stale because it has not had recent activity. It will be closed in 14 days if no further activity occurs.'
19+
close-issue-message: 'This issue has been automatically closed due to inactivity. Feel free to reopen it if it is still relevant.'
20+
stale-pr-message: 'This pull request has been automatically marked as stale because it has not had recent activity. It will be closed in 14 days if no further activity occurs.'
21+
close-pr-message: 'This pull request has been automatically closed due to inactivity. Feel free to reopen it if it is still relevant.'
22+
days-before-stale: 60
23+
days-before-close: 14
24+
stale-issue-label: 'stale'
25+
stale-pr-label: 'stale'
26+
exempt-issue-labels: 'pinned,security,bug'
27+
exempt-pr-labels: 'pinned,security'

‎.gitignore‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
1-
.idea
21
vendor/
32
composer.lock
4-
composer.phar
5-
phpunit.xml
6-
php-cs-fixer.phar
73
.phpunit.result.cache

‎composer.json‎

Lines changed: 68 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -1,61 +1,71 @@
11
{
2-
"name" : "league/geotools",
3-
"type" : "library",
4-
"description" : "Geo-related tools PHP 7.3+ library",
5-
"keywords" : ["geotools", "geometry", "geocoder", "geocoding", "geoip", "bounds", "distance", "batch", "async", "geohash", "geolocation", "latlong", "latitude", "longitude"],
6-
"license" : "MIT",
7-
8-
"authors" : [{
9-
"name" : "Antoine Corcy",
10-
"email" : "contact@sbin.dk",
11-
"homepage" : "http://sbin.dk",
12-
"role" : "Developer"
13-
}],
14-
15-
"support" : {
16-
"issues" : "https://github.com/thephpleague/geotools/issues",
17-
"source" : "https://github.com/thephpleague/geotools"
18-
},
19-
20-
"replace" : {
21-
"toin0u/geotools" : "*"
22-
},
23-
24-
"require" : {
25-
"php" : "^7.3 || ^7.4 || ^8.0",
26-
"psr/cache" : "^1.0 || ^2.0 || ^3.0",
27-
"willdurand/geocoder" : "^4.5 || ^5.0",
28-
"react/promise" : "^2.8 || ^3.0",
29-
"symfony/console" : "^4.4 || ^5.0 || ^6.0 || ^7.0",
30-
"symfony/property-access" : "^4.4 || ^5.0 || ^6.0 || ^7.0",
31-
"symfony/serializer" : "^4.4 || ^5.0 || ^6.0 || ^7.0",
32-
"react/event-loop" : "^1.0",
33-
"php-http/discovery" : "^1.0",
34-
"ext-bcmath": "*",
35-
"ext-json": "*"
36-
},
37-
38-
"require-dev" : {
39-
"phpunit/phpunit" : "^9.5",
40-
"cache/array-adapter" : "^1.0"
41-
},
42-
43-
"autoload" : {
44-
"psr-4" : {
45-
"League\\Geotools\\" : "src"
46-
}
47-
},
48-
49-
"autoload-dev" : {
50-
"psr-4" : {
51-
"League\\Geotools\\Tests\\" : "tests"
52-
}
53-
},
54-
55-
"bin" : ["bin/geotools"],
56-
"config": {
57-
"allow-plugins": {
58-
"php-http/discovery": true
59-
}
2+
"name": "league/geotools",
3+
"type": "library",
4+
"description": "Geo-related tools PHP 8.2+ library",
5+
"keywords": [
6+
"geotools",
7+
"geometry",
8+
"geocoder",
9+
"geocoding",
10+
"geoip",
11+
"bounds",
12+
"distance",
13+
"batch",
14+
"async",
15+
"geohash",
16+
"geolocation",
17+
"latlong",
18+
"latitude",
19+
"longitude"
20+
],
21+
"license": "MIT",
22+
"authors": [
23+
{
24+
"name": "Antoine Corcy",
25+
"email": "contact@sbin.dk",
26+
"homepage": "http://sbin.dk",
27+
"role": "Developer"
6028
}
29+
],
30+
"support": {
31+
"issues": "https://github.com/thephpleague/geotools/issues",
32+
"source": "https://github.com/thephpleague/geotools"
33+
},
34+
"replace": {
35+
"toin0u/geotools": "*"
36+
},
37+
"require": {
38+
"php": "^8.2",
39+
"psr/cache": "^3.0",
40+
"willdurand/geocoder": "^4.5 || ^5.0",
41+
"react/promise": "^2.8 || ^3.0",
42+
"symfony/console": "^7.0 || ^8.0",
43+
"symfony/property-access": "^7.0 || ^8.0",
44+
"symfony/serializer": "^7.0 || ^8.0",
45+
"react/event-loop": "^1.0",
46+
"php-http/discovery": "^1.0",
47+
"ext-bcmath": "*",
48+
"ext-json": "*"
49+
},
50+
"require-dev": {
51+
"phpunit/phpunit": "^11.0"
52+
},
53+
"autoload": {
54+
"psr-4": {
55+
"League\\Geotools\\": "src"
56+
}
57+
},
58+
"autoload-dev": {
59+
"psr-4": {
60+
"League\\Geotools\\Tests\\": "tests"
61+
}
62+
},
63+
"bin": [
64+
"bin/geotools"
65+
],
66+
"config": {
67+
"allow-plugins": {
68+
"php-http/discovery": true
69+
}
70+
}
6171
}

‎phpunit.xml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="tests/bootstrap.php" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/11.5/phpunit.xsd">
3+
<testsuites>
4+
<testsuite name="units">
5+
<directory>tests</directory>
6+
</testsuite>
7+
</testsuites>
8+
<source>
9+
<include>
10+
<directory>src</directory>
11+
</include>
12+
</source>
13+
</phpunit>

‎phpunit.xml.dist‎

Lines changed: 0 additions & 13 deletions
This file was deleted.

0 commit comments

Comments
 (0)