diff --git a/composer.json b/composer.json
index 68cefb9..16e1add 100644
--- a/composer.json
+++ b/composer.json
@@ -13,7 +13,9 @@
         "squizlabs/php_codesniffer": "3.*",
         "wp-coding-standards/wpcs": "*",
         "yoast/phpunit-polyfills": "^2.0",
-        "dealerdirect/phpcodesniffer-composer-installer": "^1.0.0"
+        "dealerdirect/phpcodesniffer-composer-installer": "^1.0.0",
+        "sirbrillig/phpcs-variable-analysis": "^2.11",
+        "phpcsstandards/phpcsextra": "^1.1.0"
     },
     "config": {
         "allow-plugins": true
@@ -36,6 +38,9 @@
             "composer install",
             "bin/install-wp-tests.sh activitypub-test root activitypub-test test-db latest true",
             "vendor/bin/phpunit"
+        ],
+        "lint": [
+            "vendor/bin/phpcs"
         ]
     }
 }
diff --git a/phpcs.xml b/phpcs.xml
index 07a9a39..ad12dbd 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -23,4 +23,50 @@
 	<rule ref="WordPress-Extra" />
 	<rule ref="WordPress.WP.I18n"/>
 	<config name="text_domain" value="activitypub,default"/>
+	<arg value="ps"/>
+	<arg name="parallel" value="20"/>
+	<rule ref="VariableAnalysis"/>
+	<rule ref="VariableAnalysis.CodeAnalysis.VariableAnalysis.UndefinedVariable">
+		<type>error</type>
+	</rule>
+	<rule ref="VariableAnalysis.CodeAnalysis.VariableAnalysis">
+		<properties>
+			<property name="allowUnusedCaughtExceptions" value="true"/>
+		</properties>
+	</rule>
+	<rule ref="WordPress"/>
+	<rule ref="WordPress.WP.I18n.NoHtmlWrappedStrings">
+		<type>error</type>
+	</rule>
+	<rule ref="Generic.CodeAnalysis.UnusedFunctionParameter"/>
+	<rule ref="Generic.Arrays.DisallowShortArraySyntax">
+	  <severity>0</severity>
+	</rule>
+	<rule ref="Universal.Arrays.DisallowShortArraySyntax">
+	  <severity>0</severity>
+	</rule>
+	<rule ref="Squiz.Commenting">
+		<severity>0</severity>
+	</rule>
+	<rule ref="Generic.Commenting">
+		<severity>0</severity>
+	</rule>
+	<rule ref="WordPress.Files.FileName">
+		<severity>0</severity>
+	</rule>
+	<rule ref="WordPress.DB.PreparedSQL.NotPrepared">
+		<severity>0</severity>
+	</rule>
+	<rule ref="WordPress.WP.CapitalPDangit">
+		<severity>0</severity>
+	</rule>
+	<rule ref="WordPress.Arrays.ArrayDeclarationSpacing.AssociativeArrayFound">
+		<severity>0</severity>
+	</rule>
+	<rule ref="WordPress.PHP.YodaConditions.NotYoda">
+		<type>warning</type>
+	</rule>
+	<rule ref="WordPress.Arrays.ArrayDeclarationSpacing">
+		<exclude-pattern>**/*.asset.php</exclude-pattern>
+	</rule>
 </ruleset>