Skip to content

Commit e6261a7

Browse files
committed
Fix tests for Laravel 5.5
1 parent 37e4384 commit e6261a7

File tree

4 files changed

+9
-20
lines changed

4 files changed

+9
-20
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
composer.lock
22
phpunit.xml
33
vendor
4+
/.idea

.travis.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,19 +40,19 @@ matrix:
4040
env: LARAVEL_VERSION=5.4.*
4141
- php: 7.1
4242
env: LARAVEL_VERSION=5.5.*
43-
- php: hhvm
43+
- php: hhvm-3.21
4444
env: LARAVEL_VERSION=5.1.*
4545
dist: trusty
46-
- php: hhvm
46+
- php: hhvm-3.21
4747
env: LARAVEL_VERSION=5.2.*
4848
dist: trusty
49-
- php: hhvm
49+
- php: hhvm-3.21
5050
env: LARAVEL_VERSION=5.3.*
5151
dist: trusty
52-
- php: hhvm
52+
- php: hhvm-3.21
5353
env: LARAVEL_VERSION=5.4.*
5454
dist: trusty
55-
- php: hhvm
55+
- php: hhvm-3.21
5656
env: LARAVEL_VERSION=5.5.*
5757
dist: trusty
5858

@@ -64,4 +64,4 @@ before_install:
6464
install:
6565
- travis_retry composer install --no-suggest --prefer-dist -n -o
6666

67-
script: vendor/bin/phpunit
67+
script: vendor/bin/phpunit

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@
2424
"mrclay/minify": "^2.2"
2525
},
2626
"require-dev": {
27-
"graham-campbell/testbench": "^3.1",
27+
"graham-campbell/testbench": "^3.1|^4.0",
2828
"mockery/mockery": "^0.9.4",
29-
"phpunit/phpunit": "^4.8|^5.0"
29+
"phpunit/phpunit": "^4.8|^5.0|^6.0"
3030
},
3131
"autoload": {
3232
"psr-4": {

tests/Functional/AbstractFunctionalTestCase.php

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -21,18 +21,6 @@
2121
*/
2222
abstract class AbstractFunctionalTestCase extends AbstractTestCase
2323
{
24-
/**
25-
* @before
26-
*/
27-
public function setUpStorage()
28-
{
29-
$files = glob(storage_path('framework/views/*'));
30-
31-
foreach ($files as $file) {
32-
@unlink($file);
33-
}
34-
}
35-
3624
/**
3725
* Normalise eol characters in a string.
3826
*

0 commit comments

Comments
 (0)