diff --git a/build/.phan/config.php b/build/.phan/config.php
index dc914883f0148..1b7e0a4073d5a 100644
--- a/build/.phan/config.php
+++ b/build/.phan/config.php
@@ -54,48 +54,66 @@
 		'apps/comments/composer',
 		'apps/comments/tests',
 		'apps/dav/composer',
+		'apps/dav/templates',
 		'apps/dav/tests',
 		'apps/encryption/composer',
+		'apps/encryption/templates/',
 		'apps/encryption/tests',
 		'apps/federatedfilesharing/composer',
+		'apps/federatedfilesharing/templates/',
 		'apps/federatedfilesharing/tests',
 		'apps/federation/composer',
+		'apps/federation/templates/',
 		'apps/federation/tests',
 		'apps/files/composer',
+		'apps/files/templates/',
 		'apps/files/tests',
 		'apps/files_external/3rdparty',
 		'apps/files_external/composer',
+		'apps/files_external/templates/',
 		'apps/files_external/tests',
 		'apps/files_sharing/composer',
+		'apps/files_sharing/templates/',
 		'apps/files_sharing/tests',
 		'apps/files_trashbin/composer',
+		'apps/files_trashbin/templates/',
 		'apps/files_trashbin/tests',
 		'apps/files_versions/composer',
 		'apps/files_versions/tests',
 		'apps/lookup_server_connector/composer',
 		'apps/lookup_server_connector/tests',
 		'apps/oauth2/composer',
+		'apps/oauth2/templates/',
 		'apps/oauth2/tests',
 		'apps/provisioning_api/composer',
 		'apps/provisioning_api/tests',
 		'apps/sharebymail/composer',
+		'apps/sharebymail/templates/',
 		'apps/sharebymail/tests',
 		'apps/systemtags/composer',
+		'apps/systemtags/templates',
 		'apps/systemtags/tests',
 		'apps/testing/composer',
 		'apps/testing/tests',
 		'apps/theming/composer',
+		'apps/theming/templates/',
 		'apps/theming/tests',
 		'apps/twofactor_backupcodes/composer',
+		'apps/twofactor_backupcodes/templates/',
 		'apps/twofactor_backupcodes/tests',
 		'apps/updatenotification/composer',
+		'apps/updatenotification/templates/',
 		'apps/updatenotification/tests',
 		'apps/user_ldap/composer',
+		'apps/user_ldap/templates/',
 		'apps/user_ldap/tests',
 		'apps/workflowengine/composer',
+		'apps/workflowengine/templates/',
 		'apps/workflowengine/tests',
 		'build/.phan/',
+		'core/templates',
 		'lib/composer',
+		'settings/templates',
 	],
 
 	// A file list that defines files that will be excluded
@@ -135,7 +153,7 @@
 	// it before upgrading your version of PHP to a
 	// new version that has backward compatibility
 	// breaks.
-	'backward_compatibility_checks' => false,
+	'backward_compatibility_checks' => true,
 
 	// Run a quick version of checks that takes less
 	// time at the cost of not running as thorough
@@ -144,12 +162,34 @@
 	// to fix in your code base.
 	'quick_mode' => false,
 
+	// If true, check to make sure the return type declared
+	// in the doc-block (if any) matches the return type
+	// declared in the method signature. This process is
+	// slow.
+	'check_docblock_signature_return_type_match' => true,
+
 	// If true, check to make sure the return type declared
 	// in the doc-block (if any) matches the return type
 	// declared in the method signature. This process is
 	// slow.
 	'check_docblock_signature_param_type_match' => true,
 
+	// (*Requires check_docblock_signature_param_type_match to be true*)
+	// If true, make narrowed types from phpdoc params override
+	// the real types from the signature, when real types exist.
+	// (E.g. allows specifying desired lists of subclasses,
+	//  or to indicate a preference for non-nullable types over nullable types)
+	// Affects analysis of the body of the method and the param types passed in by callers.
+	'prefer_narrowed_phpdoc_param_type' => true,
+
+	// (*Requires check_docblock_signature_return_type_match to be true*)
+	// If true, make narrowed types from phpdoc returns override
+	// the real types from the signature, when real types exist.
+	// (E.g. allows specifying desired lists of subclasses,
+	//  or to indicate a preference for non-nullable types over nullable types)
+	// Affects analysis of return statements in the body of the method and the return types passed in by callers.
+	'prefer_narrowed_phpdoc_return_type' => true,
+
 	// If enabled, check all methods that override a
 	// parent method to make sure its signature is
 	// compatible with the parent's. This check
@@ -187,7 +227,7 @@
 
 	// If enabled, scalars (int, float, bool, true, false, string, null)
 	// are treated as if they can cast to each other.
-	'scalar_implicit_cast' => true,
+	'scalar_implicit_cast' => false,
 
 	// If this has entries, scalars (int, float, bool, true, false, string, null)
 	// are allowed to perform the casts listed.
@@ -201,7 +241,7 @@
 	// scope will be ignored. This is useful for projects
 	// with complicated cross-file globals that you have no
 	// hope of fixing.
-	'ignore_undeclared_variables_in_global_scope' => true,
+	'ignore_undeclared_variables_in_global_scope' => false,
 
 	// Add any issue types (such as 'PhanUndeclaredMethod')
 	// to this black-list to inhibit them from being reported.