diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index bfab8f1..0000000
--- a/.travis.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-language: php
-
-env:
-  global:
-    - COMPOSER_ROOT_VERSION="1.0.x-dev"
-
-matrix:
-  include:
-    - php: 5.6
-      env: DB=MYSQL PHPCS_TEST=1 PHPUNIT_TEST=1
-    - php: 7.0
-      env: DB=PGSQL PHPUNIT_TEST=1
-    - php: 7.1
-      env: DB=MYSQL PHPUNIT_COVERAGE_TEST=1
-
-before_script:
-  - phpenv rehash
-  - phpenv config-rm xdebug.ini
-
-  - composer validate
-  - composer require --no-update silverstripe/recipe-cms:4.4.x-dev
-  - if [[ $DB == PGSQL ]]; then composer require --no-update silverstripe/postgresql:2.1.x-dev; fi
-  - composer install --prefer-dist --no-interaction --no-progress --no-suggest --optimize-autoloader --verbose --profile
-
-script:
-  - if [[ $PHPUNIT_TEST ]]; then vendor/bin/phpunit; fi
-  - if [[ $PHPUNIT_COVERAGE_TEST ]]; then phpdbg -qrr vendor/bin/phpunit --coverage-clover=coverage.xml; fi
-  - if [[ $PHPCS_TEST ]]; then vendor/bin/phpcs src/ tests/ ; fi
-
-after_success:
-  - if [[ $PHPUNIT_COVERAGE_TEST ]]; then bash <(curl -s https://codecov.io/bash) -f coverage.xml; fi
diff --git a/phpcs.xml.dist b/phpcs.xml.dist
index 9979fd7..fbf5558 100644
--- a/phpcs.xml.dist
+++ b/phpcs.xml.dist
@@ -2,9 +2,15 @@
 <ruleset name="SilverStripe">
     <description>CodeSniffer ruleset for SilverStripe coding conventions.</description>
 
-    <!-- base rules are PSR-12 -->
-    <rule ref="PSR12" >
+    <file>src</file>
+    <file>tests</file>
+
+    <!-- base rules are PSR-2 -->
+    <rule ref="PSR2">
         <!-- Current exclusions -->
-        <exclude name="PSR1.Methods.CamelCapsMethodName.NotCamelCaps" />
+        <exclude name="PSR1.Methods.CamelCapsMethodName" />
+        <exclude name="PSR2.Classes.PropertyDeclaration" />
+        <exclude name="Generic.Files.LineLength.TooLong" />
     </rule>
 </ruleset>
+
diff --git a/src/Services/SAMLConfiguration.php b/src/Services/SAMLConfiguration.php
index 2e5b387..8eebb3d 100644
--- a/src/Services/SAMLConfiguration.php
+++ b/src/Services/SAMLConfiguration.php
@@ -77,7 +77,7 @@ class SAMLConfiguration
      * @var bool Decide if GUID should be exposed as an attribute mappable using `GUID` as the claim. This is a feature
      * that is found in other SAML libraries but in an ideal world should not be utilised in favour of the IdP offering
      * the nameid data as another "more stable" attribute.
-     * 
+     *
      * Note that this data will be effected by:
      *  - The expect_binary_nameid configuration value
      *  - The extension point `updateGuid` on SAMLController