Merge branch 'master' into update/add-syntax-error-sniff

Author: tomjn

.travis.yml

@@ -24,7 +24,7 @@ script:
   - ./bin/unit-tests
 
   # Run integration test.
-  - if [[ "$INTEGRATION_TEST" == "1" ]]; then ./bin/integration-test; fi
+  - ./bin/integration-test
 
 # Rather than a `matrix` property, we use build stages. This allows early
 # build failure for basic linting and sniffing issues.

ruleset_test.php

@@ -27,7 +27,6 @@
 		24  => 1,
 		40  => 1,
 		43  => 1,
-		45  => 1,
 		48  => 1,
 		49  => 1,
 		53  => 1,
@@ -61,6 +60,7 @@
 		28  => 1,
 		36  => 1,
 		44  => 1,
+		45  => 1,
 		65  => 1,
 		70  => 1,
 		85  => 1,