Skip to content

Commit

Permalink
New system release
Browse files Browse the repository at this point in the history
Merge branch 'release/2.1.10'
  • Loading branch information
maso committed Dec 7, 2017
2 parents 35f227f + 0801fc3 commit 86a7af0
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 6 deletions.
3 changes: 3 additions & 0 deletions .coveralls.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
service_name: travis-ci
coverage_clover: tests/clover.xml
json_path: tests/coveralls-upload.json
24 changes: 20 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,22 +1,38 @@
language: php
php:
- '5.6'
- '7.0'
- '7.1'

services:
- mysql

git:
depth: 1

mysql:
database: test
username: root
encoding: utf8

before_install:
- sudo apt-get update > /dev/null

- mysql -e 'CREATE DATABASE IF NOT EXISTS test;'

install:
- composer install
# Install composer packages, will also trigger dump-autoload
- travis_retry composer install --no-interaction
# Install coveralls.phar
- wget -c -nc --retry-connrefused --tries=0 https://github.com/satooshi/php-coveralls/releases/download/v1.0.1/coveralls.phar
- chmod +x coveralls.phar
- php coveralls.phar --version

script:
- cd tests
- php run.php
- php coverage-checker.php clover.xml 50
- cd ..

after_success:
# Submit coverage report to Coveralls servers, see .coveralls.yml
- travis_retry php coveralls.phar -v
# Submit coverage report to codecov.io
- bash <(curl -s https://codecov.io/bash)
4 changes: 2 additions & 2 deletions src/User/Form/User.php
Original file line number Diff line number Diff line change
Expand Up @@ -115,8 +115,8 @@ public function initFields ($extra = array())
function save ($commit = true)
{
if (! $this->isValid()) {
throw new Pluf_Exception(
__('Cannot save the model from an invalid form.'));
throw new Pluf_Exception_Form(
__('Cannot save the model from an invalid form.'), $this);
}
$this->user_data->setFromFormData($this->cleaned_data);
$user_active = Pluf::f('user_signup_active', false);
Expand Down

0 comments on commit 86a7af0

Please sign in to comment.