Skip to content

Commit 22f87fd

Browse files
authored
Merge pull request #14 from recoilphp/php-8
Update to work with PHP 8.
2 parents 538bae4 + 8e59472 commit 22f87fd

3 files changed

Lines changed: 1005 additions & 574 deletions

File tree

.github/workflows/ci.yml

Lines changed: 16 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2,31 +2,29 @@ name: CI
22
on:
33
push:
44
branches:
5-
- '*'
5+
- "*"
66
pull_request:
77
schedule:
8-
- cron: 0 14 * * 0
8+
- cron: 0 14 * * 0
99
jobs:
1010
ci:
1111
name: PHP v${{ matrix.php }}
1212
runs-on: ubuntu-latest
1313
strategy:
1414
fail-fast: false
1515
matrix:
16-
php: ['7.2', '7.3', '7.4']
16+
php: ["7.4", "8.0", "8.1"]
1717
steps:
18-
- name: Set up PHP
19-
uses: shivammathur/setup-php@master
20-
with:
21-
php-version: ${{ matrix.php }}
22-
coverage: xdebug
23-
- name: Check PHP version
24-
run: php -v
25-
- name: Checkout
26-
uses: actions/checkout@v1
27-
- name: Make
28-
run: make ci
29-
- name: Upload Coverage Reports
30-
if: success()
31-
run: |
32-
[[ -z "${{ secrets.CODECOV_TOKEN }}" ]] || bash <(curl -s https://codecov.io/bash) -t "${{ secrets.CODECOV_TOKEN }}" -B "${{ github.ref }}"
18+
- name: Set up PHP
19+
uses: shivammathur/setup-php@master
20+
with:
21+
php-version: ${{ matrix.php }}
22+
coverage: xdebug
23+
- name: Check PHP version
24+
run: php -v
25+
- name: Checkout
26+
uses: actions/checkout@v1
27+
- name: Make
28+
run: make ci
29+
- name: Upload coverage report
30+
uses: codecov/codecov-action@v2

composer.json

Lines changed: 73 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -1,54 +1,79 @@
11
{
2-
"name": "recoil/react",
3-
"description": "Integrate Recoil with ReactPHP.",
4-
"require": {
5-
"php": "^7.2",
6-
"react/event-loop": "^1.0 || ^0.5 || ^0.4",
7-
"react/promise": "^2",
8-
"recoil/api": "^1",
9-
"recoil/kernel": "^1.0.2"
2+
"name": "recoil/react",
3+
"description": "Integrate Recoil with ReactPHP.",
4+
"require": {
5+
"php": ">=7.4",
6+
"react/event-loop": "^1.0 || ^0.5 || ^0.4",
7+
"react/promise": "^2",
8+
"recoil/api": "^1.0.2",
9+
"recoil/kernel": "^1"
10+
},
11+
"require-dev": {
12+
"eloquent/phony": "^5",
13+
"friendsofphp/php-cs-fixer": "^2",
14+
"hamcrest/hamcrest-php": "^2",
15+
"peridot-php/leo": "dev-php-8 as 1.999.999",
16+
"peridot-php/peridot": "dev-php-8 as 1.999.999",
17+
"peridot-php/peridot-code-coverage-reporters": "dev-php-8 as 2.999.999",
18+
"recoil/dev": "^0.4"
19+
},
20+
"repositories": [
21+
{
22+
"type": "vcs",
23+
"url": "https://github.com/recoilphp/leo"
1024
},
11-
"require-dev": {
12-
"eloquent/phony": "^3.2",
13-
"friendsofphp/php-cs-fixer": "^2",
14-
"hamcrest/hamcrest-php": "^2",
15-
"peridot-php/leo": "^1",
16-
"peridot-php/peridot-code-coverage-reporters": "^2",
17-
"peridot-php/peridot": "^1",
18-
"recoil/dev": "^0.4"
25+
{
26+
"type": "vcs",
27+
"url": "https://github.com/recoilphp/peridot"
1928
},
20-
"autoload": { "psr-4": { "Recoil\\React\\": "src" } },
21-
"autoload-dev": {
22-
"psr-4": { "Recoil\\React\\": "test/src" },
23-
"files": ["test/src/compatibility.php"]
29+
{
30+
"type": "vcs",
31+
"url": "https://github.com/recoilphp/peridot-code-coverage-reporters"
32+
}
33+
],
34+
"autoload": {
35+
"psr-4": {
36+
"Recoil\\React\\": "src"
37+
}
38+
},
39+
"autoload-dev": {
40+
"psr-4": {
41+
"Recoil\\React\\": "test/src"
42+
},
43+
"files": [
44+
"test/src/compatibility.php"
45+
]
46+
},
47+
"keywords": [
48+
"async",
49+
"asynchronous",
50+
"continuation",
51+
"coroutine",
52+
"event",
53+
"generator",
54+
"green",
55+
"multitasking",
56+
"promise",
57+
"react",
58+
"react",
59+
"thread"
60+
],
61+
"homepage": "https://github.com/recoilphp/react",
62+
"license": "MIT",
63+
"authors": [
64+
{
65+
"name": "James Harris",
66+
"email": "james.harris@icecave.com.au",
67+
"homepage": "https://github.com/jmalloc"
68+
}
69+
],
70+
"config": {
71+
"sort-packages": true,
72+
"platform": {
73+
"php": "7.4"
2474
},
25-
"keywords": [
26-
"async",
27-
"asynchronous",
28-
"continuation",
29-
"coroutine",
30-
"event",
31-
"generator",
32-
"green",
33-
"multitasking",
34-
"promise",
35-
"react",
36-
"react",
37-
"thread"
38-
],
39-
"homepage": "https://github.com/recoilphp/react",
40-
"license": "MIT",
41-
"authors": [
42-
{
43-
"name": "James Harris",
44-
"email": "james.harris@icecave.com.au",
45-
"homepage": "https://github.com/jmalloc"
46-
}
47-
],
48-
"config": {
49-
"sort-packages": true,
50-
"platform": {
51-
"php": "7.2"
52-
}
75+
"allow-plugins": {
76+
"recoil/dev": true
5377
}
78+
}
5479
}

0 commit comments

Comments
 (0)