Skip to content

Commit 67a628b

Browse files
qunabuMateusz Wojczal
and
Mateusz Wojczal
authored
feature/php82 (#190)
* feature/php82 * allow-plugins * SafeDirFix --------- Co-authored-by: Mateusz Wojczal <[email protected]>
1 parent 7ba722a commit 67a628b

File tree

5 files changed

+54
-46
lines changed

5 files changed

+54
-46
lines changed

.github/workflows/swagger.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
swagger-gh-pages:
1111
runs-on: ubuntu-latest
1212
container:
13-
image: escolalms/php:7.4
13+
image: escolalms/php:8.2
1414

1515
steps:
1616
- name: Instantiate package

.github/workflows/test-cc.yml

+4-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
phpunit-code-coverage:
1414
runs-on: ubuntu-latest
1515
container:
16-
image: escolalms/php:7.4
16+
image: escolalms/php:8.2
1717

1818
services:
1919
mysql:
@@ -63,6 +63,9 @@ jobs:
6363
curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
6464
chmod +x ./cc-test-reporter
6565
66+
- name: SafeDirFix
67+
run: git config --global safe.directory '*'
68+
6669
- name: Convert
6770
run: ./cc-test-reporter format-coverage coverage.xml -t clover -o codeclimate.0.json
6871

.github/workflows/test.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,10 @@ jobs:
4242
- name: Run tests
4343
run: vendor/bin/phpunit
4444

45-
php74-laravel-latest-phpunit-mysql:
45+
php82-laravel-latest-phpunit-mysql:
4646
runs-on: ubuntu-latest
4747
container:
48-
image: escolalms/php:7.4
48+
image: escolalms/php:8.2
4949

5050
services:
5151
mysql:
@@ -81,10 +81,10 @@ jobs:
8181
- name: Run tests
8282
run: vendor/bin/phpunit
8383

84-
php74-laravel-latest-phpunit-postgres:
84+
php82-laravel-latest-phpunit-postgres:
8585
runs-on: ubuntu-latest
8686
container:
87-
image: escolalms/php:7.4
87+
image: escolalms/php:8.2
8888

8989
services:
9090
postgres:

composer.json

+44-39
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,47 @@
11
{
2-
"name": "escolalms/headless-h5p",
3-
"description": "Headless H5P Laravel REST API",
4-
"type": "package",
5-
"require": {
6-
"php": ">=7.4",
7-
"laravel/framework": "^8|^9",
8-
"h5p/h5p-core": "1.24.*|dev-master",
9-
"h5p/h5p-editor": "1.24.*|dev-master",
10-
"escolalms/core": "^1",
11-
"escolalms/auth": "^0",
12-
"escolalms/settings": "^0"
13-
},
14-
"require-dev": {
15-
"phpunit/phpunit": "^9.0",
16-
"orchestra/testbench": "^6.0",
17-
"laravel/legacy-factories": "^1.0.4",
18-
"guzzlehttp/guzzle": "^7"
19-
},
20-
"autoload": {
21-
"psr-4": {
22-
"EscolaLms\\HeadlessH5P\\": "src",
23-
"EscolaLms\\HeadlessH5P\\Tests\\": "tests",
24-
"EscolaLms\\HeadlessH5P\\Database\\Factories\\": "database/factories",
25-
"EscolaLms\\HeadlessH5P\\Database\\Seeders\\": "database/seeders"
26-
}
27-
},
28-
"license": "MIT",
29-
"authors": [
30-
{
31-
"name": "Mateusz Wojczal",
32-
"email": "[email protected]"
33-
}
34-
],
35-
"extra": {
36-
"laravel": {
37-
"providers": [
38-
"EscolaLms\\HeadlessH5P\\HeadlessH5PServiceProvider"
39-
]
40-
}
2+
"name": "escolalms/headless-h5p",
3+
"description": "Headless H5P Laravel REST API",
4+
"type": "package",
5+
"require": {
6+
"php": ">=7.4",
7+
"laravel/framework": "^8|^9",
8+
"h5p/h5p-core": "1.24.*|dev-master",
9+
"h5p/h5p-editor": "1.24.*|dev-master",
10+
"escolalms/core": "^1",
11+
"escolalms/auth": "^0",
12+
"escolalms/settings": "^0"
13+
},
14+
"require-dev": {
15+
"phpunit/phpunit": "^9.0",
16+
"orchestra/testbench": "^6.0",
17+
"laravel/legacy-factories": "^1.0.4",
18+
"guzzlehttp/guzzle": "^7"
19+
},
20+
"autoload": {
21+
"psr-4": {
22+
"EscolaLms\\HeadlessH5P\\": "src",
23+
"EscolaLms\\HeadlessH5P\\Tests\\": "tests",
24+
"EscolaLms\\HeadlessH5P\\Database\\Factories\\": "database/factories",
25+
"EscolaLms\\HeadlessH5P\\Database\\Seeders\\": "database/seeders"
4126
}
27+
},
28+
"license": "MIT",
29+
"authors": [
30+
{
31+
"name": "Mateusz Wojczal",
32+
"email": "[email protected]"
33+
}
34+
],
35+
"extra": {
36+
"laravel": {
37+
"providers": [
38+
"EscolaLms\\HeadlessH5P\\HeadlessH5PServiceProvider"
39+
]
40+
}
41+
},
42+
"config": {
43+
"allow-plugins": {
44+
"php-http/discovery": true
45+
}
46+
}
4247
}

env/docker-compose.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ networks:
66

77
services:
88
escola_lms_app74:
9-
image: escolalms/php:7.4
9+
image: escolalms/php:8.2
1010
command: bash -c "php-fpm -F"
1111
volumes:
1212
- ./../:/var/www/html

0 commit comments

Comments
 (0)