Skip to content

Commit 3fa8680

Browse files
authored
Php8 fork (#1)
* bump versions for php 7.4 + 8 support * run phpspec in github actions
1 parent b39735b commit 3fa8680

File tree

2 files changed

+43
-24
lines changed

2 files changed

+43
-24
lines changed

.github/workflows/ci.yaml

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,11 @@ jobs:
1212

1313
strategy:
1414
matrix:
15-
include:
16-
- php-version: '7.1'
17-
composer-options: '--prefer-stable'
18-
- php-version: '7.1'
19-
composer-options: '--prefer-lowest --prefer-stable'
20-
- php-version: '7.2'
21-
composer-options: '--prefer-stable'
22-
- php-version: '7.3'
23-
composer-options: '--prefer-stable'
15+
php-version:
16+
- '7.4'
17+
- '8.0'
18+
- '8.1'
19+
- '8.2'
2420

2521
steps:
2622
- name: 'Check out'
@@ -46,11 +42,5 @@ jobs:
4642
- name: 'Install dependencies'
4743
run: 'composer update --no-progress $COMPOSER_OPTIONS'
4844

49-
- name: 'Install PHPUnit'
50-
run: 'vendor/bin/simple-phpunit install'
51-
5245
- name: 'Run PhpSpec'
5346
run: 'vendor/bin/phpspec run'
54-
55-
- name: 'Run PHPUnit'
56-
run: 'SYMFONY_DEPRECATIONS_HELPER=weak vendor/bin/simple-phpunit'

composer.json

Lines changed: 38 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,23 +12,22 @@
1212
}
1313
],
1414
"require": {
15-
"php": "^7.1",
15+
"php": "^7.4 || ^8.0",
1616
"php-http/client-common": "^1.0 || ^2.0",
1717
"php-http/client-implementation": "^1.0",
1818
"php-http/httplug": "^1.0 || ^2.0",
1919
"php-http/message": "^1.0",
2020
"php-http/message-factory": "^1.0",
21-
"php-xapi/exception": "^0.1 || ^0.2",
22-
"php-xapi/model": "^1.0 || ^2.0 || ^3.0",
23-
"php-xapi/serializer": "^2.0",
24-
"php-xapi/serializer-implementation": "^2.0",
25-
"php-xapi/symfony-serializer": "^2.0",
21+
"php-xapi/exception": "^1.0",
22+
"php-xapi/model": "^4.0",
23+
"php-xapi/serializer": "^4.0",
24+
"php-xapi/symfony-serializer": "^3.0",
2625
"psr/http-message": "^1.0"
2726
},
2827
"require-dev": {
29-
"phpspec/phpspec": "^2.4",
28+
"phpspec/phpspec": "^6.0 || ^7.0",
3029
"php-http/mock-client": "^1.2",
31-
"php-xapi/test-fixtures": "^1.0",
30+
"php-xapi/test-fixtures": "^2.0",
3231
"symfony/phpunit-bridge": "^5.2"
3332
},
3433
"minimum-stability": "dev",
@@ -54,5 +53,35 @@
5453
"branch-alias": {
5554
"dev-master": "0.7.x-dev"
5655
}
57-
}
56+
},
57+
"config": {
58+
"allow-plugins": {
59+
"php-http/discovery": false
60+
}
61+
},
62+
"repositories": [
63+
{
64+
"type": "git",
65+
"url": "https://github.com/erickr/php-xapi-exception.git"
66+
},
67+
{
68+
"type": "git",
69+
"url": "https://github.com/erickr/php-xapi-model.git"
70+
},
71+
{
72+
"type": "git",
73+
"url": "https://github.com/erickr/php-xapi-json-test-fixtures.git"
74+
}, {
75+
"type": "git",
76+
"url": "https://github.com/erickr/php-xapi-test-fixtures.git"
77+
},
78+
{
79+
"type": "git",
80+
"url": "https://github.com/erickr/php-xapi-serializer.git"
81+
},
82+
{
83+
"type": "git",
84+
"url": "https://github.com/erickr/php-xapi-symfony-serializer.git"
85+
}
86+
]
5887
}

0 commit comments

Comments
 (0)