Skip to content

Commit

Permalink
Experimental support for Laravel 5.5
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
tortuetorche committed Dec 13, 2017
1 parent 3e92493 commit 3650bf8
Show file tree
Hide file tree
Showing 9 changed files with 12,055 additions and 635 deletions.
9 changes: 5 additions & 4 deletions .travis.yml
Expand Up @@ -5,12 +5,12 @@ php:
- 5.6
- 7.0
- 7.1
- hhvm
- 7.2

matrix:
allow_failures:
- php: hhvm # Laravel >= 5.3 drops HHVM support
- php: 5.5 # Laravel >= 5.3 doesn't support PHP 5.5
- php: 7.2

sudo: false

Expand All @@ -19,10 +19,11 @@ env:
- LARAVEL_VERSION="~5.2.0" TESTBENCH_VERSION="~3.2.0"
- LARAVEL_VERSION="~5.3.0" TESTBENCH_VERSION="~3.3.0"
- LARAVEL_VERSION="~5.4.0" TESTBENCH_VERSION="~3.4.0"
- LARAVEL_VERSION="~5.5.0" TESTBENCH_VERSION="~3.5.0"

before_install:
- sed -i s/~5.1.0\|\|~5.2.0\|\|~5.3.0\|\|~5.4.0/${LARAVEL_VERSION}/ composer.json
- sed -i s/~3.1.0\|\|~3.2.0\|\|~3.3.0\|\|~3.4.0/${TESTBENCH_VERSION}/ composer.json
- sed -i s/~5.1.0\|\|~5.2.0\|\|~5.3.0\|\|~5.4.0\|\|~5.5.0/${LARAVEL_VERSION}/ composer.json
- sed -i s/~3.1.0\|\|~3.2.0\|\|~3.3.0\|\|~3.4.0\|\|~3.5.0/${TESTBENCH_VERSION}/ composer.json
- composer update # Use update since we'll be changing the composer.json

script: vendor/bin/phpunit tests
2 changes: 1 addition & 1 deletion README.md
@@ -1,6 +1,6 @@
# jquery-laravel [![Build Status](https://travis-ci.org/efficiently/jquery-laravel.png?branch=2.2)](http://travis-ci.org/efficiently/jquery-laravel)

jQuery! For Laravel 5.1, 5.2, 5.3 and 5.4! So great.
jQuery! For Laravel 5.1, 5.2, 5.3, 5.4 and 5.5! So great.

This package provides:

Expand Down
18 changes: 12 additions & 6 deletions composer.json
Expand Up @@ -8,6 +8,7 @@
"laravel 5.2",
"laravel 5.3",
"laravel 5.4",
"laravel 5.5",
"larasset",
"assets",
"asset pipeline",
Expand All @@ -26,14 +27,14 @@
],
"require": {
"php": ">=5.5.0",
"illuminate/support": "~5.1.0||~5.2.0||~5.3.0||~5.4.0",
"laravelcollective/html": "~5.1.0||~5.2.0||~5.3.0||~5.4.0"
"illuminate/support": "~5.1.0||~5.2.0||~5.3.0||~5.4.0||~5.5.0",
"laravelcollective/html": "~5.1.0||~5.2.0||~5.3.0||~5.4.0||~5.5.0"
},
"require-dev": {
"phpunit/phpunit": "~4.5||~5.7",
"mockery/mockery": "0.9.*",
"orchestra/testbench": "~3.1.0||~3.2.0||~3.3.0||~3.4.0",
"anahkiasen/former": "~4.0.0"
"phpunit/phpunit": "~4.5||~5.7||~6.0",
"mockery/mockery": "~0.9.0||~1.0",
"orchestra/testbench": "~3.1.0||~3.2.0||~3.3.0||~3.4.0||~3.5.0",
"anahkiasen/former": "~4.0.0||~4.1.0"
},
"autoload": {
"files": [
Expand All @@ -54,6 +55,11 @@
"config": {
"preferred-install": "dist"
},
"laravel": {
"providers": [
"Efficiently\\JqueryLaravel\\JqueryLaravelServiceProvider"
]
},
"prefer-stable": true,
"minimum-stability": "dev"
}

0 comments on commit 3650bf8

Please sign in to comment.