Skip to content

Test on laravel 5.5 #90

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 25, 2017
Merged

Test on laravel 5.5 #90

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
37e4384
Test on laravel 5.5
GrahamCampbell Aug 23, 2017
c014c4a
Fix tests for Laravel 5.5
srmklive Aug 23, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
composer.lock
phpunit.xml
vendor
/.idea
6 changes: 5 additions & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ matrix:
env: LARAVEL_VERSION=5.3.*
- php: 7.0
env: LARAVEL_VERSION=5.4.*
- php: 7.0
env: LARAVEL_VERSION=5.5.*
- php: 7.1
env: LARAVEL_VERSION=5.1.*
- php: 7.1
Expand All @@ -36,6 +38,8 @@ matrix:
env: LARAVEL_VERSION=5.3.*
- php: 7.1
env: LARAVEL_VERSION=5.4.*
- php: 7.1
env: LARAVEL_VERSION=5.5.*
- php: hhvm
env: LARAVEL_VERSION=5.1.*
dist: trusty
Expand All @@ -57,4 +61,4 @@ before_install:
install:
- travis_retry composer install --no-suggest --prefer-dist -n -o

script: vendor/bin/phpunit
script: vendor/bin/phpunit
4 changes: 2 additions & 2 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@
"mrclay/minify": "^2.2"
},
"require-dev": {
"graham-campbell/testbench": "^3.1",
"graham-campbell/testbench": "^3.1|^4.0",
"mockery/mockery": "^0.9.4",
"phpunit/phpunit": "^4.8|^5.0"
"phpunit/phpunit": "^4.8|^5.0|^6.0"
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Don't pull in phpunit 6. It won't work.

Copy link
Contributor

@srmklive srmklive Aug 24, 2017 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If i pull in phpunit 6, the tests only fail on hhvm for Laravel 5.5. Do we need to support hhvm for 5.5?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we need to support hhvm for 5.5?

I'd say no. :)

},
"autoload": {
"psr-4": {
Expand Down
12 changes: 0 additions & 12 deletions tests/Functional/AbstractFunctionalTestCase.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,18 +21,6 @@
*/
abstract class AbstractFunctionalTestCase extends AbstractTestCase
{
/**
* @before
*/
public function setUpStorage()
{
$files = glob(storage_path('framework/views/*'));

foreach ($files as $file) {
@unlink($file);
}
}

/**
* Normalise eol characters in a string.
*
Expand Down