Skip to content

Commit a96ed6a

Browse files
authored
Merge pull request #94 from squatto/laravel-8-support
Laravel 8 support
2 parents fbf480b + f3c2ba2 commit a96ed6a

File tree

4 files changed

+1604
-587
lines changed

4 files changed

+1604
-587
lines changed

Diff for: .travis.yml

+26-8
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,41 @@
11
language: php
2-
php:
3-
- '7.2'
4-
- '7.3'
2+
3+
matrix:
4+
include:
5+
- php: 7.2
6+
env: CORCEL='^4.0'
7+
- php: 7.3
8+
env: CORCEL='^4.0'
9+
- php: 7.3
10+
env: CORCEL='^5.0'
11+
- php: 7.4
12+
env: CORCEL='^4.0'
13+
- php: 7.4
14+
env: CORCEL='^5.0'
15+
516
dist: trusty
6-
sudo: required
17+
718
addons:
819
apt:
920
packages:
1021
- unzip
1122
- mysql-server-5.6
1223
- mysql-client-core-5.6
1324
- mysql-client-5.6
14-
before_install:
25+
26+
before_script:
1527
- unzip tests/config/database.sql.zip -d tests/config/
1628
- mysql -u root -e "create database corcel_acf;"
1729
- mysql -u root corcel_acf < tests/config/database.sql
18-
before_script:
30+
31+
before_install:
32+
- rm composer.lock
1933
- composer self-update
20-
- composer install
34+
- composer require jgrossi/corcel:$CORCEL --no-interaction --no-update
35+
36+
install:
37+
- composer install --prefer-dist --no-interaction --no-suggest
38+
2139
script:
2240
- mkdir -p build/logs
23-
- ./vendor/bin/phpunit
41+
- ./vendor/bin/phpunit

Diff for: composer.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@
1212
],
1313
"require": {
1414
"php": ">=7.2",
15-
"jgrossi/corcel": "^4.0"
15+
"jgrossi/corcel": "^4.0|^5.0"
1616
},
1717
"require-dev": {
18-
"phpunit/phpunit": "^8.0"
18+
"phpunit/phpunit": "^8.4|^9.0"
1919
},
2020
"autoload": {
2121
"psr-4": {

0 commit comments

Comments
 (0)