Skip to content

Commit

Permalink
Support laravel 7 (#25)
Browse files Browse the repository at this point in the history
* Support laravel 7 & drop 5.6 & 5.7

* Fix IE 11 support

* Fix style ci

* Fix travis ci
  • Loading branch information
amaelftah authored Mar 4, 2020
1 parent 6134233 commit 6a37b9e
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 21 deletions.
22 changes: 6 additions & 16 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,6 @@ language: php

matrix:
include:
- php: 7.1
env: LARAVEL='5.6.*' TESTBENCH='3.6.*' COMPOSER_FLAGS='--prefer-stable'
- php: 7.2
env: LARAVEL='5.6.*' TESTBENCH='3.6.*' COMPOSER_FLAGS='--prefer-stable'
- php: 7.3
env: LARAVEL='5.6.*' TESTBENCH='3.6.*' COMPOSER_FLAGS='--prefer-stable'
- php: 7.4snapshot
env: LARAVEL='5.6.*' TESTBENCH='3.6.*' COMPOSER_FLAGS='--prefer-stable'
- php: 7.1
env: LARAVEL='5.7.*' TESTBENCH='3.7.*' COMPOSER_FLAGS='--prefer-stable'
- php: 7.2
env: LARAVEL='5.7.*' TESTBENCH='3.7.*' COMPOSER_FLAGS='--prefer-stable'
- php: 7.3
env: LARAVEL='5.7.*' TESTBENCH='3.7.*' COMPOSER_FLAGS='--prefer-stable'
- php: 7.4snapshot
env: LARAVEL='5.7.*' TESTBENCH='3.7.*' COMPOSER_FLAGS='--prefer-stable'
- php: 7.1
env: LARAVEL='5.8.*' TESTBENCH='3.8.*' COMPOSER_FLAGS='--prefer-lowest'
- php: 7.1
Expand Down Expand Up @@ -46,6 +30,12 @@ matrix:
env: LARAVEL='6.*' TESTBENCH='4.*' COMPOSER_FLAGS='--prefer-lowest'
- php: 7.4snapshot
env: LARAVEL='6.*' TESTBENCH='4.*' COMPOSER_FLAGS='--prefer-stable'
- php: 7.2
env: LARAVEL='7.*' TESTBENCH='5.*' COMPOSER_FLAGS='--prefer-stable'
- php: 7.3
env: LARAVEL='7.*' TESTBENCH='5.*' COMPOSER_FLAGS='--prefer-stable'
- php: 7.4snapshot
env: LARAVEL='7.*' TESTBENCH='5.*' COMPOSER_FLAGS='--prefer-stable'
fast_finish: true
allow_failures:
- php: 7.4snapshot
Expand Down
6 changes: 3 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@
}
],
"require": {
"php": "^7.0",
"laravel/framework": "~5.5.0|~5.6.0|~5.7.0|~5.8.0|~6.0"
"php": "^7.1",
"laravel/framework": "~5.8.0|~6.0|~7.0"
},
"require-dev": {
"orchestra/testbench": "^3.5|~4.0"
"orchestra/testbench": "^3.5|~4.0|~5.0"
},
"autoload": {
"psr-4": {
Expand Down
2 changes: 1 addition & 1 deletion resources/views/trixassets.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ function laravelTrixConfig (event) {
var style = document.createElement('style');
style.type = 'text/css';
for (var tag of laravelTrixInstanceStyles) {
for (var tag in laravelTrixInstanceStyles) {
style.innerHTML += tag.textContent + ' ';
}
Expand Down
2 changes: 1 addition & 1 deletion tests/TestCase.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ class TestCase extends BaseTestCase
/**
* Setup the test environment.
*/
protected function setUp() :void
protected function setUp(): void
{
parent::setUp();

Expand Down

0 comments on commit 6a37b9e

Please sign in to comment.