Skip to content

Commit 3e92493

Browse files
committed
Experimental support for Laravel 5.4 and add jQuery 3.1.1 library.
1 parent dd8bd6b commit 3e92493

File tree

9 files changed

+10902
-11
lines changed

9 files changed

+10902
-11
lines changed

.travis.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,23 +4,25 @@ php:
44
- 5.5
55
- 5.6
66
- 7.0
7+
- 7.1
78
- hhvm
89

910
matrix:
1011
allow_failures:
11-
- php: hhvm
12-
- php: 5.5 # Laravel 5.3 doesn't support PHP 5.5
12+
- php: hhvm # Laravel >= 5.3 drops HHVM support
13+
- php: 5.5 # Laravel >= 5.3 doesn't support PHP 5.5
1314

1415
sudo: false
1516

1617
env:
1718
- LARAVEL_VERSION="~5.1.0" TESTBENCH_VERSION="~3.1.0"
1819
- LARAVEL_VERSION="~5.2.0" TESTBENCH_VERSION="~3.2.0"
1920
- LARAVEL_VERSION="~5.3.0" TESTBENCH_VERSION="~3.3.0"
21+
- LARAVEL_VERSION="~5.4.0" TESTBENCH_VERSION="~3.4.0"
2022

2123
before_install:
22-
- sed -i s/~5.1.0\|\|~5.2.0\|\|~5.3.0/${LARAVEL_VERSION}/ composer.json
23-
- sed -i s/~3.1.0\|\|~3.2.0\|\|~3.3.0/${TESTBENCH_VERSION}/ composer.json
24+
- sed -i s/~5.1.0\|\|~5.2.0\|\|~5.3.0\|\|~5.4.0/${LARAVEL_VERSION}/ composer.json
25+
- sed -i s/~3.1.0\|\|~3.2.0\|\|~3.3.0\|\|~3.4.0/${TESTBENCH_VERSION}/ composer.json
2426
- composer update # Use update since we'll be changing the composer.json
2527

2628
script: vendor/bin/phpunit tests

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# jquery-laravel [![Build Status](https://travis-ci.org/efficiently/jquery-laravel.png?branch=2.2)](http://travis-ci.org/efficiently/jquery-laravel)
22

3-
jQuery! For Laravel 5.1, 5.2 and 5.3! So great.
3+
jQuery! For Laravel 5.1, 5.2, 5.3 and 5.4! So great.
44

55
This package provides:
66

composer.json

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
"laravel 5.1",
88
"laravel 5.2",
99
"laravel 5.3",
10+
"laravel 5.4",
1011
"larasset",
1112
"assets",
1213
"asset pipeline",
@@ -25,13 +26,13 @@
2526
],
2627
"require": {
2728
"php": ">=5.5.0",
28-
"illuminate/support": "~5.1.0||~5.2.0||~5.3.0",
29-
"laravelcollective/html": "~5.1.0||~5.2.0||~5.3.0"
29+
"illuminate/support": "~5.1.0||~5.2.0||~5.3.0||~5.4.0",
30+
"laravelcollective/html": "~5.1.0||~5.2.0||~5.3.0||~5.4.0"
3031
},
3132
"require-dev": {
32-
"phpunit/phpunit": "~4.5",
33+
"phpunit/phpunit": "~4.5||~5.7",
3334
"mockery/mockery": "0.9.*",
34-
"orchestra/testbench": "~3.1.0||~3.2.0||~3.3.0",
35+
"orchestra/testbench": "~3.1.0||~3.2.0||~3.3.0||~3.4.0",
3536
"anahkiasen/former": "~4.0.0"
3637
},
3738
"autoload": {

0 commit comments

Comments
 (0)