chore: restore excluded PHPCS rules

justlevine · justlevine · commit b71c36584262 · 2025-02-08T20:33:33.000+02:00
diff --git a/phpcs.xml.dist b/phpcs.xml.dist
@@ -5,8 +5,8 @@
 	<!-- What to scan: include any root-level PHP files, and the /src folder -->
 	<file>./access-functions.php</file>
 	<file>./activation.php</file>
-	<file>./deactivation.php</file>
 	<file>./constants.php</file>
+	<file>./deactivation.php</file>
 	<file>./wp-graphql.php</file>
 	<file>./src</file>
 	<exclude-pattern>./phpstan/*</exclude-pattern>
@@ -65,7 +65,6 @@
 		<exclude name="WordPress.WP.Capabilities.Undetermined" />
 
 		<!-- This would be a breaking change to fix-->
-		<exclude name="WordPress.NamingConventions.ValidFunctionName.MethodNameInvalid" />
 		<exclude name="Generic.CodeAnalysis.UnusedFunctionParameter" />
 	</rule>
 
@@ -157,7 +156,6 @@
 		<exclude name="SlevomatCodingStandard.TypeHints.ParameterTypeHint.UselessAnnotation" />
 
 		<!-- Should probably be added back. -->
-		<exclude name="SlevomatCodingStandard.TypeHints.NullableTypeForNullDefaultValue.NullabilityTypeMissing" />
 		<exclude name="SlevomatCodingStandard.TypeHints.DeclareStrictTypes.DeclareStrictTypesMissing" />
 	</rule>
 
diff --git a/src/Data/Connection/AbstractConnectionResolver.php b/src/Data/Connection/AbstractConnectionResolver.php
@@ -462,7 +462,7 @@ public function should_execute() {
 	 *
 	 * @return int|mixed
 	 */
-	public function get_offset_for_cursor( string $cursor = null ) { // phpcs:ignore PHPCompatibility.FunctionDeclarations.RemovedImplicitlyNullableParam.Deprecated -- This is a breaking change to fix.
+	public function get_offset_for_cursor( string $cursor = null ) { // phpcs:ignore PHPCompatibility.FunctionDeclarations.RemovedImplicitlyNullableParam.Deprecated,SlevomatCodingStandard.TypeHints.NullableTypeForNullDefaultValue -- This is a breaking change to fix.
 		$offset = false;
 
 		// We avoid using ArrayConnection::cursorToOffset() because it assumes an `int` offset.
diff --git a/src/Data/Loader/AbstractDataLoader.php b/src/Data/Loader/AbstractDataLoader.php
@@ -504,5 +504,5 @@ protected function get_model( $entry, $key ) {
 	 *
 	 * @return array<int|string,mixed>
 	 */
-	abstract protected function loadKeys( array $keys );
+	abstract protected function loadKeys( array $keys ); // phpcs:ignore WordPress.NamingConventions.ValidFunctionName.MethodNameInvalid -- @todo deprecate for `::load_keys()`
 }

Original file line number	Diff line number	Diff line change
`@@ -462,7 +462,7 @@ public function should_execute() {`
`462`	`462`	`*`
`463`	`463`	`* @return int\|mixed`
`464`	`464`	`*/`
`465`		`- public function get_offset_for_cursor( string $cursor = null ) { // phpcs:ignore PHPCompatibility.FunctionDeclarations.RemovedImplicitlyNullableParam.Deprecated -- This is a breaking change to fix.`
	`465`	`+ public function get_offset_for_cursor( string $cursor = null ) { // phpcs:ignore PHPCompatibility.FunctionDeclarations.RemovedImplicitlyNullableParam.Deprecated,SlevomatCodingStandard.TypeHints.NullableTypeForNullDefaultValue -- This is a breaking change to fix.`
`466`	`466`	`$offset = false;`
`467`	`467`
`468`	`468`	// We avoid using ArrayConnection::cursorToOffset() because it assumes an `int` offset.
Original file line number	Diff line number	Diff line change
`@@ -504,5 +504,5 @@ protected function get_model( $entry, $key ) {`
`504`	`504`	`*`
`505`	`505`	`* @return array<int\|string,mixed>`
`506`	`506`	`*/`
`507`		`- abstract protected function loadKeys( array $keys );`
	`507`	+ abstract protected function loadKeys( array $keys ); // phpcs:ignore WordPress.NamingConventions.ValidFunctionName.MethodNameInvalid -- @todo deprecate for `::load_keys()`
`508`	`508`	`}`