Skip to content

Commit 2d07e72

Browse files
author
Tortue Torche
committed
Remove Laravel 5.0 support and update tests to be compatible with Laravel 5.2
1 parent 8b5db3b commit 2d07e72

File tree

4 files changed

+15
-17
lines changed

4 files changed

+15
-17
lines changed

.travis.yml

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

33
php:
4-
- 5.4
54
- 5.5
65
- 5.6
76
- 7.0
87
- hhvm
98

109
matrix:
1110
allow_failures:
12-
- php: 5.4 # Allow PHP 5.4 failures because Laravel >= 5.1 requires PHP >= 5.5
1311
- php: hhvm
14-
- php: 7.0
1512

1613
sudo: false
1714

1815
env:
19-
- LARAVEL_VERSION="~5.0.0" TESTBENCH_VERSION="~3.0.0"
2016
- LARAVEL_VERSION="~5.1.0" TESTBENCH_VERSION="~3.1.0"
2117
- LARAVEL_VERSION="~5.2.0" TESTBENCH_VERSION="~3.2.0"
2218

2319
before_install:
24-
- sed -i s/~5.0.0\|\|~5.1.0\|\|~5.2.0/${LARAVEL_VERSION}/ composer.json
25-
- sed -i s/~3.0.0\|\|~3.1.0\|\|~3.2.0/${TESTBENCH_VERSION}/ composer.json
20+
- sed -i s/~5.1.0\|\|~5.2.0/${LARAVEL_VERSION}/ composer.json
21+
- sed -i s/~3.1.0\|\|~3.2.0/${TESTBENCH_VERSION}/ composer.json
2622
- composer update # Use update since we'll be changing the composer.json
2723

2824
script: vendor/bin/phpunit tests

README.md

Lines changed: 4 additions & 3 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.0)](http://travis-ci.org/efficiently/jquery-laravel)
1+
# jquery-laravel [![Build Status](https://travis-ci.org/efficiently/jquery-laravel.png?branch=2.1)](http://travis-ci.org/efficiently/jquery-laravel)
22

3-
jQuery! For Laravel 5! So great.
3+
jQuery! For Laravel 5.1 & 5.2! So great.
44

55
This package provides:
66

@@ -18,13 +18,14 @@ 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.0**](http://laravel.com/docs/5.0) supports see [jQuery-Laravel 2.0 branch](https://github.com/efficiently/jquery-laravel/tree/2.0)
2122
For [**Laravel 4.1 or 4.2**](http://laravel.com/docs/4.2) supports see [jQuery-Laravel 1.0 branch](https://github.com/efficiently/jquery-laravel/tree/1.0)
2223

2324
## Prerequisites
2425

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

27-
This package is **only** compatible with **PHP >= 5.4** and **Laravel >= 5.0** framework.
28+
This package version is **only** compatible with **PHP >= 5.5** and **Laravel >= 5.1** framework.
2829

2930
## Installation
3031

composer.json

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
{
22
"name": "efficiently/jquery-laravel",
3-
"description": "This package provides jQuery and the jQuery-ujs driver for your Laravel 5.x application.",
3+
"description": "This package provides jQuery and the jQuery-ujs driver for your Laravel >= 5.1 application.",
44
"keywords": [
55
"jquery",
66
"laravel",
7-
"laravel 5",
7+
"laravel 5.1",
8+
"laravel 5.2",
89
"larasset",
910
"assets",
1011
"asset pipeline",
@@ -22,14 +23,14 @@
2223
}
2324
],
2425
"require": {
25-
"php": ">=5.4.0",
26-
"illuminate/support": "~5.0.0||~5.1.0||~5.2.0",
27-
"laravelcollective/html": "~5.0.0||~5.1.0||~5.2.0"
26+
"php": ">=5.5.0",
27+
"illuminate/support": "~5.1.0||~5.2.0",
28+
"laravelcollective/html": "~5.1.0||~5.2.0"
2829
},
2930
"require-dev": {
3031
"phpunit/phpunit": "~4.5",
3132
"mockery/mockery": "0.9.*",
32-
"orchestra/testbench": "~3.0.0||~3.1.0||~3.2.0",
33+
"orchestra/testbench": "~3.1.0||~3.2.0",
3334
"anahkiasen/former": "~4.0.0"
3435
},
3536
"autoload": {

tests/fixtures/jql/Http/Controllers/Controller.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<?php namespace Jql\Http\Controllers;
22

3-
use Illuminate\Foundation\Bus\DispatchesCommands;
3+
use Illuminate\Foundation\Bus\DispatchesJobs;
44
use Illuminate\Routing\Controller as BaseController;
55
use Illuminate\Foundation\Validation\ValidatesRequests;
66

77
abstract class Controller extends BaseController
88
{
9-
use DispatchesCommands, ValidatesRequests;
9+
use DispatchesJobs, ValidatesRequests;
1010
use \Efficiently\JqueryLaravel\ControllerAdditions;
1111

1212
/**

0 commit comments

Comments
 (0)