Skip to content
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

Jump to bottom

Develop #855

Merged
merged 6 commits into from
Apr 17, 2017
Merged

Develop #855

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f92cde6
Fixed broken Filter::XSSFilter() unit tests
Apr 16, 2017
73c9262
should fix travis error
Apr 16, 2017
66128b5
PHPUnit version on travis
Apr 17, 2017
878a2ac
try to make code analyzer happy :)
Apr 17, 2017
9d61065
retry to fix the test for null
Apr 17, 2017
9f434d9
Merge pull request #854 from Kristuff/develop
panique Apr 17, 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
Prev Previous commit
Next Next commit
PHPUnit version on travis
  • Loading branch information
kristuff committed Apr 17, 2017
commit 66128b56137625c8f9e758ea3a8347429d7d9db8
2 changes: 1 addition & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ before_script:
- cd tests

# run unit tests, create result file
script: phpunit --configuration phpunit.xml --coverage-text --coverage-clover=coverage.clover
script: ../vendor/bin/phpunit --configuration phpunit.xml --coverage-text --coverage-clover=coverage.clover

# gets tools from Scrutinizer, uploads unit tests results to Scrutinizer (?)
after_script:
Expand Down
2 changes: 1 addition & 1 deletion composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"php": ">=5.5.0",
"phpmailer/phpmailer": "~5.2",
"gregwar/captcha": "~1.1",
"phpunit/phpunit": "~4.8"
"phpunit/phpunit": "4.8.*|5.7.*"
},
"autoload": {
"psr-4": { "": ["application/core/", "application/model/"] }
Expand Down