tonyair/silverstripe-userforms
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-userforms.git synced 2024-10-22 17:05:42 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #961 from dhensby/pulls/5.5/lint-fix

Browse Source 
Linting fixes
This commit is contained in:
Robbie Averill 2020-05-11 12:44:31 -07:00 committed by GitHub
commit 26004d464a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -38,7 +38,7 @@ before_script:
script: script:
- if [[ $PHPUNIT_TEST ]]; then vendor/bin/phpunit; fi - if [[ $PHPUNIT_TEST ]]; then vendor/bin/phpunit; fi
- if [[ $PHPUNIT_COVERAGE_TEST ]]; then phpdbg -qrr vendor/bin/phpunit --coverage-clover=coverage.xml -vvv; fi - if [[ $PHPUNIT_COVERAGE_TEST ]]; then phpdbg -qrr vendor/bin/phpunit --coverage-clover=coverage.xml -vvv; fi
- if [[ $PHPCS_TEST ]]; then vendor/bin/phpcs code/ tests/; fi - if [[ $PHPCS_TEST ]]; then composer run-script lint; fi
- if [[ $NPM_TEST ]]; then git diff-files --quiet -w --relative=client; fi - if [[ $NPM_TEST ]]; then git diff-files --quiet -w --relative=client; fi
- if [[ $NPM_TEST ]]; then git diff -w --no-color --relative=client; fi - if [[ $NPM_TEST ]]; then git diff -w --no-color --relative=client; fi
- if [[ $NPM_TEST ]]; then yarn run lint; fi - if [[ $NPM_TEST ]]; then yarn run lint; fi

5
code/Task/RecoverUploadLocationsHelper.php
View File

@ -134,7 +134,7 @@ class RecoverUploadLocationsHelper
$errorsCount = 0; $errorsCount = 0;
// Loop over the files to process // Loop over the files to process
foreach($this->chunk() as $uploadRecord) { foreach ($this->chunk() as $uploadRecord) {
++$processedCount; ++$processedCount;
$fileId = $uploadRecord['UploadedFileID']; $fileId = $uploadRecord['UploadedFileID'];
@ -247,7 +247,8 @@ class RecoverUploadLocationsHelper
if ($this->filesVersioned) { if ($this->filesVersioned) {
$draftVersion = Versioned::get_versionnumber_by_stage(File::class, Versioned::DRAFT, $fileId); $draftVersion = Versioned::get_versionnumber_by_stage(File::class, Versioned::DRAFT, $fileId);
$liveVersion = Versioned::get_versionnumber_by_stage(File::class, Versioned::LIVE, $fileId);; $liveVersion = Versioned::get_versionnumber_by_stage(File::class, Versioned::LIVE, $fileId);
;
if ($draftVersion && $draftVersion != $liveVersion) { if ($draftVersion && $draftVersion != $liveVersion) {
$draft = Versioned::get_version(File::class, $fileId, $draftVersion); $draft = Versioned::get_version(File::class, $fileId, $draftVersion);

4
composer.json
View File

@ -49,6 +49,10 @@
"colymba/gridfield-bulk-editing-tools": "Allows for bulk management of form submissions", "colymba/gridfield-bulk-editing-tools": "Allows for bulk management of form submissions",
"silverstripe/gridfieldqueuedexport": "Export large submission as CSV through queued jobs in the background" "silverstripe/gridfieldqueuedexport": "Export large submission as CSV through queued jobs in the background"
}, },
"scripts": {
"lint": "phpcs code/ tests/",
"lint-clean": "phpcbf code/ tests/"
},
"extra": { "extra": {
"expose": [ "expose": [
"client/dist", "client/dist",