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

Linting fixes

.travis.yml

@@ -38,7 +38,7 @@ before_script:
 script:
   - 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 [[ $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 -w --no-color --relative=client; fi
   - if [[ $NPM_TEST ]]; then yarn run lint; fi

code/Task/RecoverUploadLocationsHelper.php

@@ -247,7 +247,8 @@ class RecoverUploadLocationsHelper
 
         if ($this->filesVersioned) {
             $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) {
                 $draft = Versioned::get_version(File::class, $fileId, $draftVersion);

composer.json

@@ -49,6 +49,10 @@
         "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"
     },
+    "scripts": {
+        "lint": "phpcs code/ tests/",
+        "lint-clean": "phpcbf code/ tests/"
+    },
     "extra": {
         "expose": [
             "client/dist",