TPS
/
ORIENT
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix Travis CI file scope (#4408) 

Original PR (#4394) was picking up changes from other branches as well as from `master`. This change should limit the scope of files to just the changed files in this PR.
This commit is contained in:
Ben Thomson 2019-06-24 13:47:47 +08:00 committed by GitHub
parent 6fb6e5f71c
commit 95b9a8a9fd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.travis.yml
View File

@ -44,8 +44,10 @@ jobs:
- stage: code quality
if: type = pull_request
php: 7.1
script: ./vendor/bin/phpcs --colors -nq --report="full" --extensions="php" $(git diff-tree --no-commit-id --name-only -r ${TRAVIS_COMMIT_RANGE/.../..})
script:
- git config remote.origin.fetch "+refs/heads/*:refs/remotes/origin/*" && git fetch
- ./vendor/bin/phpcs --colors -nq --report="full" --extensions="php" $(git diff --name-only HEAD origin/$TRAVIS_BRANCH)
- stage: code quality
if: type = push AND (branch = develop OR branch = master)
php: 7.1
script: ./vendor/bin/phpcs --colors -nq --report="full" --extensions="php" $(git diff-tree --no-commit-id --name-only -r $TRAVIS_COMMIT)
script: ./vendor/bin/phpcs --colors -nq --report="full" --extensions="php" $(git diff --name-only $TRAVIS_COMMIT)

3
modules/backend/models/ExportModel.php
View File

@ -193,8 +193,7 @@ abstract class ExportModel extends Model
foreach ($data as $value) {
if (is_array($value)) {
$newData[] = 'Array';
}
else {
} else {
$newData[] = str_replace($delimeter, '\\'.$delimeter, $value);
}
}