diff --git a/phpcs.xml.dist b/phpcs.xml.dist
index cb2fc02dc..29cedd6c9 100644
--- a/phpcs.xml.dist
+++ b/phpcs.xml.dist
@@ -18,7 +18,7 @@
 		<exclude name="Generic.Files.LineLength.TooLong" />
 		<exclude name="PEAR.Functions.ValidDefaultValue.NotAtEnd" />
 	</rule>
-	<rule phpcbf-only="true" ref="Squiz.Strings.ConcatenationSpacing">
+	<rule ref="Squiz.Strings.ConcatenationSpacing">
 		<properties>
 			<property name="spacing" value="1" />
 			<property name="ignoreNewlines" value="true"/>
diff --git a/src/Forms/GridField/GridFieldDetailForm_ItemRequest.php b/src/Forms/GridField/GridFieldDetailForm_ItemRequest.php
index 3f16fd4cd..25b82225d 100644
--- a/src/Forms/GridField/GridFieldDetailForm_ItemRequest.php
+++ b/src/Forms/GridField/GridFieldDetailForm_ItemRequest.php
@@ -112,7 +112,7 @@ class GridFieldDetailForm_ItemRequest extends RequestHandler
     {
         if (!$this->record->canView()) {
             $this->httpError(403, _t(
-                __CLASS__.'.ViewPermissionsFailure',
+                __CLASS__ . '.ViewPermissionsFailure',
                 'It seems you don\'t have the necessary permissions to view {ObjectTitle}',
                 '',
                 ['ObjectTitle' => $this->record->singular_name()]
@@ -195,7 +195,7 @@ class GridFieldDetailForm_ItemRequest extends RequestHandler
         if (!$this->record->canView()) {
             $controller = $this->getToplevelController();
             return $controller->httpError(403, _t(
-                __CLASS__.'.ViewPermissionsFailure',
+                __CLASS__ . '.ViewPermissionsFailure',
                 'It seems you don\'t have the necessary permissions to view {ObjectTitle}',
                 '',
                 ['ObjectTitle' => $this->record->singular_name()]
@@ -500,7 +500,7 @@ class GridFieldDetailForm_ItemRequest extends RequestHandler
         // Check permission
         if (!$this->record->canEdit()) {
             $this->httpError(403, _t(
-                __CLASS__.'.EditPermissionsFailure',
+                __CLASS__ . '.EditPermissionsFailure',
                 'It seems you don\'t have the necessary permissions to edit {ObjectTitle}',
                 '',
                 ['ObjectTitle' => $this->record->singular_name()]
diff --git a/src/Security/PasswordExpirationMiddleware.php b/src/Security/PasswordExpirationMiddleware.php
index 050673000..22752a56b 100644
--- a/src/Security/PasswordExpirationMiddleware.php
+++ b/src/Security/PasswordExpirationMiddleware.php
@@ -25,13 +25,13 @@ class PasswordExpirationMiddleware implements HTTPMiddleware
     /**
      * Session key for persisting URL of the password change form
      */
-    const SESSION_KEY_REDIRECT = __CLASS__.'.change password redirect';
+    const SESSION_KEY_REDIRECT = __CLASS__ . '.change password redirect';
 
     /**
      * Session key for persisting a flag allowing to process the current request
      * without performing password expiration check
      */
-    const SESSION_KEY_ALLOW_CURRENT_REQUEST = __CLASS__.'.allow current request';
+    const SESSION_KEY_ALLOW_CURRENT_REQUEST = __CLASS__ . '.allow current request';
 
     /**
      * List of URL patterns allowed for users to visit where