Skip to content

Commit 3650bf8

Browse files
committed
Experimental support for Laravel 5.5
* Add jQuery 3.2.1 library (jquery3.2.js) * Update Rails UJS library * Add Rails UJS with File Upload support (rails-ujs-file-upload.js), see rails/jquery-ujs#499 * Add Rails UJS without jQuery dependancy (rails-ujs-no-jquery.js), see rails/rails#25208 * Add Laravel 5.5 providers directive * Add PHP 7.2 in Travis CI builds * Remove HHVM support from Travis CI builds
1 parent 3e92493 commit 3650bf8

9 files changed

+12055
-635
lines changed

.travis.yml

+5-4
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ php:
55
- 5.6
66
- 7.0
77
- 7.1
8-
- hhvm
8+
- 7.2
99

1010
matrix:
1111
allow_failures:
12-
- php: hhvm # Laravel >= 5.3 drops HHVM support
1312
- php: 5.5 # Laravel >= 5.3 doesn't support PHP 5.5
13+
- php: 7.2
1414

1515
sudo: false
1616

@@ -19,10 +19,11 @@ env:
1919
- LARAVEL_VERSION="~5.2.0" TESTBENCH_VERSION="~3.2.0"
2020
- LARAVEL_VERSION="~5.3.0" TESTBENCH_VERSION="~3.3.0"
2121
- LARAVEL_VERSION="~5.4.0" TESTBENCH_VERSION="~3.4.0"
22+
- LARAVEL_VERSION="~5.5.0" TESTBENCH_VERSION="~3.5.0"
2223

2324
before_install:
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
25+
- sed -i s/~5.1.0\|\|~5.2.0\|\|~5.3.0\|\|~5.4.0\|\|~5.5.0/${LARAVEL_VERSION}/ composer.json
26+
- sed -i s/~3.1.0\|\|~3.2.0\|\|~3.3.0\|\|~3.4.0\|\|~3.5.0/${TESTBENCH_VERSION}/ composer.json
2627
- composer update # Use update since we'll be changing the composer.json
2728

2829
script: vendor/bin/phpunit tests

README.md

+1-1
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, 5.3 and 5.4! So great.
3+
jQuery! For Laravel 5.1, 5.2, 5.3, 5.4 and 5.5! So great.
44

55
This package provides:
66

composer.json

+12-6
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
"laravel 5.2",
99
"laravel 5.3",
1010
"laravel 5.4",
11+
"laravel 5.5",
1112
"larasset",
1213
"assets",
1314
"asset pipeline",
@@ -26,14 +27,14 @@
2627
],
2728
"require": {
2829
"php": ">=5.5.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"
30+
"illuminate/support": "~5.1.0||~5.2.0||~5.3.0||~5.4.0||~5.5.0",
31+
"laravelcollective/html": "~5.1.0||~5.2.0||~5.3.0||~5.4.0||~5.5.0"
3132
},
3233
"require-dev": {
33-
"phpunit/phpunit": "~4.5||~5.7",
34-
"mockery/mockery": "0.9.*",
35-
"orchestra/testbench": "~3.1.0||~3.2.0||~3.3.0||~3.4.0",
36-
"anahkiasen/former": "~4.0.0"
34+
"phpunit/phpunit": "~4.5||~5.7||~6.0",
35+
"mockery/mockery": "~0.9.0||~1.0",
36+
"orchestra/testbench": "~3.1.0||~3.2.0||~3.3.0||~3.4.0||~3.5.0",
37+
"anahkiasen/former": "~4.0.0||~4.1.0"
3738
},
3839
"autoload": {
3940
"files": [
@@ -54,6 +55,11 @@
5455
"config": {
5556
"preferred-install": "dist"
5657
},
58+
"laravel": {
59+
"providers": [
60+
"Efficiently\\JqueryLaravel\\JqueryLaravelServiceProvider"
61+
]
62+
},
5763
"prefer-stable": true,
5864
"minimum-stability": "dev"
5965
}

0 commit comments

Comments
 (0)