Skip to content

Commit fdbffb9

Browse files
Merge pull request #16 from eimkua1/php-8-support
PHP 8.0 support
2 parents 9c635ac + 5134aa7 commit fdbffb9

17 files changed

+894
-377
lines changed

.github/workflows/continuous-integration.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,4 +30,6 @@ jobs:
3030
- name: ${{ matrix.name }}
3131
uses: laminas/laminas-continuous-integration-action@v1
3232
with:
33-
job: ${{ matrix.job }}
33+
job: ${{ matrix.job }}
34+
env:
35+
COMPOSER_AUTH: "{\"github-oauth\":{\"github.com\":\"${{ secrets.GITHUB_TOKEN }}\"}}"

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,5 @@
33
/coveralls-upload.json
44
/phpunit.xml
55
/vendor/
6+
/.phpunit.result.cache
7+
/.phpcs-cache

composer.json

Lines changed: 25 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,31 @@
2626
"module": "Laminas\\ApiTools\\Rest"
2727
}
2828
},
29+
"repositories": [
30+
{
31+
"type": "vcs",
32+
"url": "https://github.com/eimkua1/api-tools-api-problem.git"
33+
},
34+
{
35+
"type": "vcs",
36+
"url": "https://github.com/eimkua1/api-tools-content-negotiation.git"
37+
},
38+
{
39+
"type": "vcs",
40+
"url": "https://github.com/eimkua1/api-tools-mvc-auth.git"
41+
},
42+
{
43+
"type": "vcs",
44+
"url": "https://github.com/eimkua1/api-tools-oauth2.git"
45+
}
46+
],
2947
"require": {
30-
"php": "^7.3",
31-
"laminas-api-tools/api-tools-api-problem": "^1.2.2",
32-
"laminas-api-tools/api-tools-content-negotiation": "^1.2.1",
48+
"php": "^7.3 || ~8.0.0",
49+
"laminas-api-tools/api-tools-api-problem": "^1.4.0",
50+
"laminas-api-tools/api-tools-content-negotiation": "^1.5.0",
3351
"laminas-api-tools/api-tools-hal": "^1.4",
34-
"laminas-api-tools/api-tools-mvc-auth": "^1.4",
35-
"laminas/laminas-eventmanager": "^3.3",
52+
"laminas-api-tools/api-tools-mvc-auth": "^1.6",
53+
"laminas/laminas-eventmanager": "^3.2",
3654
"laminas/laminas-mvc": "^2.7.14 || ^3.0.2",
3755
"laminas/laminas-paginator": "^2.7",
3856
"laminas/laminas-stdlib": "^2.7.8 || ^3.3",
@@ -47,7 +65,8 @@
4765
"laminas/laminas-uri": "^2.5.2",
4866
"laminas/laminas-validator": "^2.8.1",
4967
"laminas/laminas-view": "^2.11.3",
50-
"phpunit/phpunit": "^7.5.15"
68+
"phpspec/prophecy-phpunit": "^2.0",
69+
"phpunit/phpunit": "^9.3"
5170
},
5271
"autoload": {
5372
"psr-4": {

0 commit comments

Comments
 (0)