Skip to content

Commit 0ce22ea

Browse files
committed
Experimental support for Laravel 6, 7 and 8 & PHP 7.2, 7.3, 7.4 and 8.0!
Add latest jQuery 3.5.1 Drop support for Laravel 5.5, 5.6 and 5.7 (please, use the 2.4 branch instead) Drop support for PHP 7.0 and 7.1 (please, use the 2.4 branch instead)
1 parent ad01151 commit 0ce22ea

File tree

9 files changed

+10925
-84
lines changed

9 files changed

+10925
-84
lines changed

.travis.yml

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,27 @@
11
language: php
22

33
php:
4-
- 7.0
5-
- 7.1
64
- 7.2
5+
- 7.3
6+
- 7.4
7+
- 8.0snapshot
78

89
matrix:
10+
fast_finish: true
911
allow_failures:
10-
- php: 7.0 # Laravel >= 5.6 doesn't support PHP 7.0
11-
12-
sudo: false
12+
# Laravel >= 8.0 doesn't support PHP 7.2
13+
- php: 7.2
14+
env: LARAVEL_VERSION="~8.0" TESTBENCH_VERSION="~6.0"
1315

1416
env:
15-
- LARAVEL_VERSION="~5.5.0" TESTBENCH_VERSION="~3.5.0"
16-
- LARAVEL_VERSION="~5.6.0" TESTBENCH_VERSION="~3.6.0"
17-
- LARAVEL_VERSION="~5.7.0" TESTBENCH_VERSION="~3.7.0"
17+
- LARAVEL_VERSION="~6.0" TESTBENCH_VERSION="~4.0"
18+
- LARAVEL_VERSION="~7.0" TESTBENCH_VERSION="~5.0"
19+
- LARAVEL_VERSION="~8.0" TESTBENCH_VERSION="~6.0"
1820

1921
before_install:
20-
- sed -i s/~5.5.0\|\|~5.6.0\|\|~5.7.0/${LARAVEL_VERSION}/ composer.json
21-
- sed -i s/~3.5.0\|\|~3.6.0\|\|~3.7.0/${TESTBENCH_VERSION}/ composer.json
22-
- composer update # Use update since we'll be changing the composer.json
22+
- sed -i s/~6.0\|\|~7.0\|\|~8.0/${LARAVEL_VERSION}/ composer.json
23+
- sed -i s/~4.0\|\|~5.0\|\|~6.0/${TESTBENCH_VERSION}/ composer.json
24+
- travis_retry composer self-update
25+
- travis_retry composer update --no-interaction --prefer-dist
2326

2427
script: vendor/bin/phpunit tests

README.md

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

3-
jQuery! For Laravel 5.5, 5.6 and 5.7! So great.
3+
jQuery! For Laravel 6, 7 and 8! So great.
44

55
This package provides:
66

@@ -18,6 +18,8 @@ minor version bump = minor-level updates to jQuery
1818
major version bump = major-level updates to jQuery and updates to Laravel/Larasset which may be backwards-incompatible
1919
```
2020

21+
For [Laravel 5.5, 5.6 or 5.7](http://laravel.com/docs/5.7) supports see [jQuery-Laravel **2.4 branch**](https://github.com/efficiently/jquery-laravel/tree/2.4)
22+
2123
For [Laravel 5.1, 5.2, 5.3 or 5.4](http://laravel.com/docs/5.4) supports see [jQuery-Laravel **2.3 branch**](https://github.com/efficiently/jquery-laravel/tree/2.3)
2224

2325
For [Laravel 5.1 or 5.2](http://laravel.com/docs/5.2) supports see [jQuery-Laravel **2.1 branch**](https://github.com/efficiently/jquery-laravel/tree/2.1)
@@ -30,51 +32,11 @@ For [Laravel 4.1 or 4.2](http://laravel.com/docs/4.2) supports see [jQuery-Larav
3032

3133
You must [install Node.js](http://nodejs.org) on your computer (development environment).
3234

33-
This package version is **only** compatible with **PHP >= 7.0** and **Laravel >= 5.5** framework.
35+
This package version is **only** compatible with **PHP >= 7.2** and **Laravel >= 6** framework.
3436

3537
## Installation
3638

37-
Read the wiki [Installation Instructions](https://github.com/efficiently/jquery-laravel/wiki/Installation-Instructions) page, if you don't want to use the Larasset package
38-
39-
Or, if you want to use the [Larasset](https://github.com/efficiently/larasset) package which include `jquery-laravel` by default:
40-
41-
1. Just make a new app
42-
43-
```sh
44-
composer create-project laravel/laravel your-project-name --prefer-dist
45-
```
46-
47-
1. Go inside your new app path
48-
49-
```sh
50-
cd your-project-name
51-
```
52-
53-
2. Then install Larasset package
54-
55-
Click [here](https://github.com/efficiently/larasset/blob/1.3/README.md#installation) to follow the installation instructions of this package.
56-
57-
NOTE: The `jquery.js` and `jquery-ujs.js` files will be added to the asset pipeline and available for you to use.
58-
If they're not already in `resources/js/app.js` by default, add these lines:
59-
60-
```js
61-
//= require jquery
62-
//= require jquery_ujs
63-
```
64-
65-
If you want to use jQuery 2, you can require `jquery2` instead:
66-
67-
```js
68-
//= require jquery2
69-
//= require jquery_ujs
70-
```
71-
72-
And if you want to use jQuery 3, you can require `jquery3`:
73-
74-
```js
75-
//= require jquery3
76-
//= require jquery_ujs
77-
```
39+
Read the wiki [Installation Instructions](https://github.com/efficiently/jquery-laravel/wiki/Installation-Instructions) page.
7840

7941
## Contributing
8042

composer.json

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
{
22
"name": "efficiently/jquery-laravel",
3-
"description": "This package provides jQuery and the jQuery-ujs driver for your Laravel >= 5.5 application.",
3+
"description": "This package provides jQuery and the jQuery-ujs driver for your Laravel >= 6 application.",
44
"keywords": [
55
"jquery",
66
"laravel",
7-
"laravel 5.5",
8-
"laravel 5.6",
9-
"laravel 5.7",
7+
"laravel 6",
8+
"laravel 7",
9+
"laravel 8",
1010
"larasset",
1111
"assets",
1212
"asset pipeline",
@@ -24,15 +24,16 @@
2424
}
2525
],
2626
"require": {
27-
"php": ">=7.0.0",
28-
"illuminate/support": "~5.5.0||~5.6.0||~5.7.0",
29-
"laravelcollective/html": "~5.5.0||~5.6.0||~5.7.0"
27+
"php": "^7.2||^8.0",
28+
"illuminate/support": "~6.0||~7.0||~8.0",
29+
"laravelcollective/html": "~6.0||~7.0||~8.0",
30+
"laravel/helpers": "^1.4"
3031
},
3132
"require-dev": {
32-
"phpunit/phpunit": "~6.0||~7.0",
33-
"mockery/mockery": "~1.0",
34-
"orchestra/testbench": "~3.5.0||~3.6.0||~3.7.0",
35-
"anahkiasen/former": "~4.1.0"
33+
"phpunit/phpunit": "^8.2.3||~9.0",
34+
"mockery/mockery": "~1.3.3||^1.4.2",
35+
"orchestra/testbench": "~4.0||~5.0||~6.0",
36+
"anahkiasen/former": "~4.5.0"
3637
},
3738
"autoload": {
3839
"files": [

0 commit comments

Comments
 (0)